Merge branch 'master' into signal-dev
authorMinep <zelong56@gmail.com>
Wed, 15 Jun 2022 20:55:55 +0000 (21:55 +0100)
committerMinep <zelong56@gmail.com>
Wed, 15 Jun 2022 20:55:55 +0000 (21:55 +0100)
1  2 
lunaix-os/includes/lunaix/process.h
lunaix-os/includes/lunaix/syscall.h
lunaix-os/kernel/sched.c

index e429060ab5f785b9ffdcec9f12c6cb534bfc48aa,32b74dff5397e2fe29ce13eab3ef89ea3191f317..28cb76b97a797089cdceacac9a3323c373c0760a
@@@ -40,19 -30,17 +40,21 @@@ struct proc_inf
  {
      pid_t pid;
      struct proc_info* parent;
 -    isr_param intr_ctx;
 +    isr_param intr_ctx; // size=76
 +    uintptr_t ustack_top;
      struct llist_header siblings;
      struct llist_header children;
+     struct llist_header grp_member;
      struct proc_mm mm;
      void* page_table;
      time_t created;
      uint8_t state;
      int32_t exit_code;
      int32_t k_status;
 +    sigset_t sig_pending;
 +    sigset_t sig_mask;
 +    void* sig_handler[_SIG_NUM];
+     pid_t pgid;
      struct lx_timer* timer;
  };
  
Simple merge
Simple merge