X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/86a9cfeadbbe180abf6c8bd8c64c86957fdacfeb..cd103ea1b3ff029cfc458b3913975b5600915341:/lunaix-os/includes/lunaix/process.h

diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h
index 76ecacc..0b743d3 100644
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -1,12 +1,13 @@
 #ifndef __LUNAIX_PROCESS_H
 #define __LUNAIX_PROCESS_H
 
-#include <stdint.h>
 #include <arch/x86/interrupts.h>
-#include <lunaix/mm/mm.h>
-#include <lunaix/types.h>
 #include <lunaix/clock.h>
+#include <lunaix/mm/mm.h>
+#include <lunaix/signal.h>
 #include <lunaix/timer.h>
+#include <lunaix/types.h>
+#include <stdint.h>
 
 // 虽然内核不是进程，但为了区分，这里使用Pid=-1来指代内核。这主要是方便物理页所有权检查。
 #define KERNEL_PID -1
@@ -20,65 +21,90 @@
 
 #define PROC_TERMMASK 0x6
 
-
-struct proc_mm {
+struct proc_mm
+{
     heap_context_t u_heap;
     struct mm_region* regions;
 };
 
-struct proc_info {
+struct proc_sig
+{
+    void* signal_handler;
+    int sig_num;
+    isr_param prev_context;
+};
+
+#define PROC_SIG_SIZE sizeof(struct proc_sig) // size=84
+
+struct proc_info
+{
     pid_t pid;
     struct proc_info* parent;
-    isr_param intr_ctx;
+    isr_param intr_ctx; // size=76
+    uintptr_t ustack_top;
+    void* page_table;
     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;
 };
 
 extern volatile struct proc_info* __current;
 
+pid_t
+alloc_pid();
 
-pid_t alloc_pid();
-
-void init_proc(struct proc_info *pcb);
+void
+init_proc(struct proc_info* pcb);
 
 /**
  * @brief 向系统发布一个进程，使其可以被调度。
- * 
- * @param process 
+ *
+ * @param process
  */
-void push_process(struct proc_info* process);
+void
+push_process(struct proc_info* process);
 
-pid_t destroy_process(pid_t pid);
+pid_t
+destroy_process(pid_t pid);
 
-void setup_proc_mem(struct proc_info* proc, uintptr_t kstack_from);
+void
+setup_proc_mem(struct proc_info* proc, uintptr_t kstack_from);
 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）
- * 
+ *
  */
-pid_t dup_proc();
+pid_t
+dup_proc();
 
 /**
  * @brief 创建新进程（LunaixOS的类 CreateProcess (Windows) 实现）
- * 
+ *
  */
-void new_proc();
+void
+new_proc();
 
 /**
  * @brief 终止（退出）当前进程
- * 
+ *
  */
-void terminate_proc(int exit_code);
+void
+terminate_proc(int exit_code);
 
-int orphaned_proc(pid_t pid);
+int
+orphaned_proc(pid_t pid);
 
-struct proc_info* get_process(pid_t pid);
+struct proc_info*
+get_process(pid_t pid);
 
 #endif /* __LUNAIX_PROCESS_H */