refactor: full rewrite of signal feature

[lunaix-os.git] / lunaix-os / includes / lunaix / process.h

diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h
index 1eacf127a28e31ea567a42f12b8b680e69533f8a..a8ac5d84c19e85aa48aa15341c07c7957a361526 100644 (file)
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -6,6 +6,7 @@
 #include <lunaix/ds/waitq.h>
 #include <lunaix/fs.h>
 #include <lunaix/mm/mm.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>
 #include <lunaix/signal.h>
 #include <lunaix/timer.h>
 #include <lunaix/types.h>


@@ -14,22 +15,37 @@
 // 虽然内核不是进程，但为了区分，这里使用Pid=-1来指代内核。这主要是方便物理页所有权检查。
 #define KERNEL_PID -1
 
 // 虽然内核不是进程，但为了区分，这里使用Pid=-1来指代内核。这主要是方便物理页所有权检查。
 #define KERNEL_PID -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_READY 0
 #define PS_RUNNING 1
 #define PS_TERMNAT 2
 #define PS_DESTROY 4

-#define PS_BLOCKED 8
-#define PS_CREATED 16
+#define PS_PAUSED 8
+#define PS_BLOCKED 16
+#define PS_CREATED 32

 
 

-#define PROC_TERMINATED(state) (state & 0x6)
+#define PS_GrBP (PS_PAUSED | PS_BLOCKED)
+#define PS_GrDT (PS_TERMNAT | PS_DESTROY)

 
 

-#define PROC_FINPAUSE 1
+#define PROC_TERMINATED(state) ((state)&PS_GrDT)
+#define PROC_HANGED(state) ((state)&PS_BLOCKED)
+#define PROC_RUNNABLE(state) ((state)&PS_PAUSED)

 
 

-struct proc_mm
-{
-    heap_context_t u_heap;
-    struct llist_header regions;
-};
+#define PROC_FINPAUSE 1

 
 struct proc_sigstate
 {
 
 struct proc_sigstate
 {


@@ -37,10 +53,28 @@ struct proc_sigstate
     char fxstate[512] __attribute__((aligned(16)));
 };
 
     char fxstate[512] __attribute__((aligned(16)));
 };
 

+struct sigact
+{
+    struct sigact* prev;
+    sigset_t sa_mask;
+    void* sa_actor;
+    void* sa_handler;
+    pid_t sender;
+};
+
+struct sighail
+{
+    sigset_t sig_pending;
+    sigset_t sig_mask;
+    struct sigact* inprogress;
+    struct sigact signals[_SIG_NUM];
+};
+

 struct proc_sig
 {
 struct proc_sig
 {

-    void* signal_handler;

     int sig_num;
     int sig_num;

+    void* sigact;
+    void* sighand;

     struct proc_sigstate prev_context;
 } __attribute__((packed));
 
     struct proc_sigstate prev_context;
 } __attribute__((packed));
 


@@ -57,9 +91,9 @@ struct proc_info
     pid_t pid;                // offset = 0
     struct proc_info* parent; // offset = 4
     isr_param intr_ctx;       // offset = 8
     pid_t pid;                // offset = 0
     struct proc_info* parent; // offset = 4
     isr_param intr_ctx;       // offset = 8

-    uintptr_t ustack_top;     // offset = 84
-    void* page_table;         // offset = 88
-    void* fxstate;            // offset = 92
+    ptr_t ustack_top;         // offset = 84 -> 56 -> 60
+    ptr_t page_table;         // offset = 88 -> 60 -> 64
+    void* fxstate;            // offset = 92 -> 64 -> 68

 
     /* ---- critical section end ---- */
 
 
     /* ---- critical section end ---- */
 


@@ -78,14 +112,11 @@ struct proc_info
 
     struct proc_mm mm;
     time_t created;
 
     struct proc_mm mm;
     time_t created;

-    uint8_t state;
+    u8_t state;

     int32_t exit_code;
     int32_t k_status;
     int32_t exit_code;
     int32_t k_status;

-    sigset_t sig_pending;
-    sigset_t sig_mask;
-    sigset_t sig_inprogress;

     int flags;
     int flags;

-    void* sig_handler[_SIG_NUM];
+    struct sighail sigctx;

     struct v_fdtable* fdtable;
     struct v_dnode* cwd;
     pid_t pgid;
     struct v_fdtable* fdtable;
     struct v_dnode* cwd;
     pid_t pgid;


@@ -99,6 +130,18 @@ block_current()
     __current->state = PS_BLOCKED;
 }
 
     __current->state = PS_BLOCKED;
 }
 

+static inline void
+pause_current()
+{
+    __current->state = PS_PAUSED;
+}
+
+static inline void
+resume_current()
+{
+    __current->state = PS_RUNNING;
+}
+

 /**
  * @brief 分配并初始化一个进程控制块
  *
 /**
  * @brief 分配并初始化一个进程控制块
  *


@@ -127,7 +170,7 @@ pid_t
 destroy_process(pid_t pid);
 
 void
 destroy_process(pid_t pid);
 
 void

-setup_proc_mem(struct proc_info* proc, uintptr_t kstack_from);
+setup_proc_mem(struct proc_info* proc, ptr_t kstack_from);

 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）
 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）


@@ -156,4 +199,7 @@ orphaned_proc(pid_t pid);
 struct proc_info*
 get_process(pid_t pid);
 
 struct proc_info*
 get_process(pid_t pid);
 

+void
+proc_setsignal(struct proc_info* proc, int signum);
+

 #endif /* __LUNAIX_PROCESS_H */
 #endif /* __LUNAIX_PROCESS_H */