X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2803826a2373620dbfce8a5bff1e6a01dd594953..bb793d5c6918efee6a86de442463a7c9aaa4ecdd:/lunaix-os/includes/lunaix/process.h?ds=sidebyside

diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h
index 2cd4330..1453e71 100644
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -3,7 +3,10 @@
 
 #include <arch/x86/interrupts.h>
 #include <lunaix/clock.h>
+#include <lunaix/ds/waitq.h>
+#include <lunaix/fs.h>
 #include <lunaix/mm/mm.h>
+#include <lunaix/mm/region.h>
 #include <lunaix/signal.h>
 #include <lunaix/timer.h>
 #include <lunaix/types.h>
@@ -12,37 +15,66 @@
 // 虽然内核不是进程，但为了区分，这里使用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 PROC_TERMMASK 0x6
-
-#define PROC_FINPAUSE 1
+/*
+    |C|Bk|De|Tn|Pu|Rn|
+         \----/
+            Dt
+
+    Group Dt: whether this process is terminated.
+
+    Rn: Running
+    Tn: Terminated
+    De: Destoryed
+    Pu: Paused
+    Bk: Blocked
+    C : Created
+*/
+
+#define PS_READY 0
+#define PS_RUNNING 1
+#define PS_TERMNAT 2
+#define PS_DESTROY 4
+#define PS_PAUSED 8
+#define PS_BLOCKED 16
+#define PS_CREATED 32
+
+#define PS_GrBP (PS_PAUSED | PS_BLOCKED)
+#define PS_GrDT (PS_TERMNAT | PS_DESTROY)
+
+#define proc_terminated(proc) (((proc)->state) & PS_GrDT)
+#define proc_hanged(proc) (((proc)->state) & PS_BLOCKED)
+#define proc_runnable(proc) (((proc)->state) & PS_PAUSED)
+
+struct sigact
+{
+    struct sigact* prev;
+    sigset_t sa_mask;
+    void* sa_actor;
+    void* sa_handler;
+    pid_t sender;
+};
 
-struct proc_mm
+struct sighail
 {
-    heap_context_t u_heap;
-    struct mm_region regions;
+    sigset_t sig_pending;
+    sigset_t sig_mask;
+    struct sigact* inprogress;
+    struct sigact signals[_SIG_NUM];
 };
 
 struct proc_sig
 {
-    void* signal_handler;
     int sig_num;
-    isr_param prev_context;
-};
-
-#define PROC_SIG_SIZE sizeof(struct proc_sig) // size=84
+    void* sigact;
+    void* sighand;
+    isr_param* saved_ictx;
+} __attribute__((packed));
 
 struct proc_info
 {
     /*
         Any change to *critical section*, including layout, size
-        must be reflected in kernel/asm/x86/interrupt.S to avoid
+        must be reflected in arch/x86/interrupt.S.inc to avoid
         disaster!
      */
 
@@ -50,30 +82,56 @@ struct proc_info
 
     pid_t pid;
     struct proc_info* parent;
-    isr_param intr_ctx; // size=76
-    uintptr_t ustack_top;
-    void* page_table;
+    isr_param* intr_ctx;
+    ptr_t ustack_top;
+    ptr_t page_table;
 
     /* ---- critical section end ---- */
 
+    struct llist_header tasks;
     struct llist_header siblings;
     struct llist_header children;
     struct llist_header grp_member;
+    waitq_t waitqueue;
+
+    struct
+    {
+        struct llist_header sleepers;
+        time_t wakeup_time;
+        time_t alarm_time;
+    } sleep;
+
     struct proc_mm mm;
     time_t created;
-    uint8_t state;
+    u8_t state;
     int32_t exit_code;
     int32_t k_status;
-    sigset_t sig_pending;
-    sigset_t sig_mask;
-    int flags;
-    void* sig_handler[_SIG_NUM];
+    struct sighail sigctx;
+    struct v_fdtable* fdtable;
+    struct v_dnode* cwd;
     pid_t pgid;
-    struct lx_timer* timer;
 };
 
 extern volatile struct proc_info* __current;
 
+static inline void
+block_current()
+{
+    __current->state = PS_BLOCKED;
+}
+
+static inline void
+pause_current()
+{
+    __current->state = PS_PAUSED;
+}
+
+static inline void
+resume_current()
+{
+    __current->state = PS_RUNNING;
+}
+
 /**
  * @brief 分配并初始化一个进程控制块
  *
@@ -102,7 +160,7 @@ pid_t
 destroy_process(pid_t pid);
 
 void
-setup_proc_mem(struct proc_info* proc, uintptr_t kstack_from);
+copy_kernel_stack(struct proc_info* proc, ptr_t kstack_from);
 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）
@@ -131,4 +189,10 @@ orphaned_proc(pid_t pid);
 struct proc_info*
 get_process(pid_t pid);
 
+void
+proc_setsignal(struct proc_info* proc, int signum);
+
+void
+proc_clear_signal(struct proc_info* proc);
+
 #endif /* __LUNAIX_PROCESS_H */