refactor: striped more arch-related code from the kernel code base

[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 e429060ab5f785b9ffdcec9f12c6cb534bfc48aa..c3ac9a5312c6e65536ed4644c2aecb8635359a5f 100644 (file)
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -1,9 +1,12 @@
 #ifndef __LUNAIX_PROCESS_H
 #define __LUNAIX_PROCESS_H
 
 #ifndef __LUNAIX_PROCESS_H
 #define __LUNAIX_PROCESS_H
 

-#include <arch/x86/interrupts.h>
+#include <sys/interrupts.h>

 #include <lunaix/clock.h>
 #include <lunaix/clock.h>

+#include <lunaix/ds/waitq.h>
+#include <lunaix/fs.h>

 #include <lunaix/mm/mm.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>


@@ -12,57 +15,138 @@
 // 虽然内核不是进程，但为了区分，这里使用Pid=-1来指代内核。这主要是方便物理页所有权检查。
 #define KERNEL_PID -1
 
 // 虽然内核不是进程，但为了区分，这里使用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
+/*
+    |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
 {
 };
 
 struct proc_sig
 {

-    void* signal_handler;

     int sig_num;
     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
 {
 
 struct proc_info
 {

+    /*
+        Any change to *critical section*, including layout, size
+        must be reflected in arch/i386/interrupt.S.inc to avoid
+        disaster!
+     */
+
+    /* ---- critical section start ---- */
+

     pid_t pid;
     struct proc_info* parent;
     pid_t pid;
     struct proc_info* parent;

-    isr_param intr_ctx; // size=76
-    uintptr_t ustack_top;
+    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 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;
     struct proc_mm mm;

-    void* page_table;

     time_t created;
     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;
-    void* sig_handler[_SIG_NUM];
-    struct lx_timer* timer;
+    struct sighail sigctx;
+    struct v_fdtable* fdtable;
+    struct v_dnode* cwd;
+    pid_t pgid;

 };
 
 extern volatile struct proc_info* __current;
 
 };
 
 extern volatile struct proc_info* __current;
 

-pid_t
-alloc_pid();
+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 分配并初始化一个进程控制块
+ *
+ * @return struct proc_info*
+ */
+struct proc_info*
+alloc_process();
+
+/**
+ * @brief 初始化进程用户空间
+ *
+ * @param pcb
+ */

 void
 void

-init_proc(struct proc_info* pcb);
+init_proc_user_space(struct proc_info* pcb);

 
 /**
  * @brief 向系统发布一个进程，使其可以被调度。
 
 /**
  * @brief 向系统发布一个进程，使其可以被调度。


@@ -70,13 +154,13 @@ init_proc(struct proc_info* pcb);
  * @param process
  */
 void
  * @param process
  */
 void

-push_process(struct proc_info* process);
+commit_process(struct proc_info* process);

 
 pid_t
 destroy_process(pid_t pid);
 
 void
 
 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) 实现）
 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）


@@ -105,4 +189,16 @@ 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);
+
+void
+proc_clear_signal(struct proc_info* proc);
+
+// enable interrupt upon transfer
+#define TRANSFER_IE 1
+
+void
+proc_init_transfer(struct proc_info* proc, ptr_t stop, ptr_t target, int flags);
+

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