From: Minep <zelong56@gmail.com>
Date: Wed, 15 Jun 2022 20:55:55 +0000 (+0100)
Subject: Merge branch 'master' into signal-dev
X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/commitdiff_plain/509574b18a3373030cd0d7b979499499ff06dd9b?ds=sidebyside

Merge branch 'master' into signal-dev
---

509574b18a3373030cd0d7b979499499ff06dd9b
diff --cc lunaix-os/includes/lunaix/process.h
index e429060,32b74df..28cb76b
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@@ -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;
  };