X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/94a87fe25c5ec021daf16edd64058ed6a37aba7d..88d981e8325ea91ca6ca21cdba3c73308fe84541:/lunaix-os/includes/lunaix/process.h

diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h
index e429060..d35bfe7 100644
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -12,19 +12,21 @@
 // 虽然内核不是进程，但为了区分，这里使用Pid=-1来指代内核。这主要是方便物理页所有权检查。
 #define KERNEL_PID -1
 
-#define PROC_STOPPED 0
-#define PROC_RUNNING 1
-#define PROC_TERMNAT 2
-#define PROC_DESTROY 4
-#define PROC_BLOCKED 8
-#define PROC_CREATED 16
+#define PS_STOPPED 0
+#define PS_RUNNING 1
+#define PS_TERMNAT 2
+#define PS_DESTROY 4
+#define PS_BLOCKED 8
+#define PS_CREATED 16
 
-#define PROC_TERMMASK 0x6
+#define PROC_TERMINATED(state) (state & 0x6)
+
+#define PROC_FINPAUSE 1
 
 struct proc_mm
 {
     heap_context_t u_heap;
-    struct mm_region* regions;
+    struct mm_region regions;
 };
 
 struct proc_sig
@@ -38,31 +40,63 @@ struct proc_sig
 
 struct proc_info
 {
+    /*
+        Any change to *critical section*, including layout, size
+        must be reflected in kernel/asm/x86/interrupt.S to avoid
+        disaster!
+     */
+
+    /* ---- critical section start ---- */
+
     pid_t pid;
     struct proc_info* parent;
     isr_param intr_ctx; // size=76
     uintptr_t ustack_top;
+    void* page_table;
+
+    /* ---- critical section end ---- */
+
     struct llist_header siblings;
     struct llist_header children;
+    struct llist_header grp_member;
+
+    struct
+    {
+        struct llist_header sleepers;
+        time_t wakeup_time;
+        time_t alarm_time;
+    } sleep;
+
     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;
+    sigset_t sig_inprogress;
+    int flags;
     void* sig_handler[_SIG_NUM];
-    struct lx_timer* timer;
+    pid_t pgid;
 };
 
 extern volatile struct proc_info* __current;
 
-pid_t
-alloc_pid();
+/**
+ * @brief 分配并初始化一个进程控制块
+ *
+ * @return struct proc_info*
+ */
+struct proc_info*
+alloc_process();
 
+/**
+ * @brief 初始化进程用户空间
+ *
+ * @param pcb
+ */
 void
-init_proc(struct proc_info* pcb);
+init_proc_user_space(struct proc_info* pcb);
 
 /**
  * @brief 向系统发布一个进程，使其可以被调度。
@@ -70,7 +104,7 @@ init_proc(struct proc_info* pcb);
  * @param process
  */
 void
-push_process(struct proc_info* process);
+commit_process(struct proc_info* process);
 
 pid_t
 destroy_process(pid_t pid);