Merge branch 'vfs-dev'

[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 589bfaa7348d529cae2a72972931ed86b4136563..18cddb94f6d29e4ad947e495af8c329dd74972ab 100644 (file)
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -3,6 +3,7 @@
 
 #include <arch/x86/interrupts.h>
 #include <lunaix/clock.h>
+#include <lunaix/fs.h>
 #include <lunaix/mm/mm.h>
 #include <lunaix/signal.h>
 #include <lunaix/timer.h>
@@ -12,17 +13,16 @@
 // 虽然内核不是进程，但为了区分，这里使用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
-#define PROC_FALRMSET (1 << 1)
 
 struct proc_mm
 {
@@ -60,6 +60,14 @@ struct proc_info
     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;
     time_t created;
     uint8_t state;
@@ -70,8 +78,9 @@ struct proc_info
     sigset_t sig_inprogress;
     int flags;
     void* sig_handler[_SIG_NUM];
+    struct v_fdtable* fdtable;
+    struct v_dnode* cwd;
     pid_t pgid;
-    struct lx_timer* timer;
 };
 
 extern volatile struct proc_info* __current;