Second Extended Filesystem (ext2) and other improvements (#33)

[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 f4a526ffeb580708209b86cfe6d62f222cfc06d0..faca28491a1719c8eeacdc268b2d2e579e7ef95d 100644 (file)
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -12,7 +12,7 @@
 #include <lunaix/timer.h>
 #include <lunaix/types.h>
 #include <lunaix/spike.h>
 #include <lunaix/timer.h>
 #include <lunaix/types.h>
 #include <lunaix/spike.h>

-#include <lunaix/pcontext.h>
+#include <lunaix/hart_state.h>

 #include <stdint.h>
 
 
 #include <stdint.h>
 
 


@@ -50,17 +50,23 @@
 #define proc_runnable(proc) (!(proc)->state || !(((proc)->state) & ~PS_Rn))
 
 
 #define proc_runnable(proc) (!(proc)->state || !(((proc)->state) & ~PS_Rn))
 
 

-#define TH_DETACHED 0b0001
+#define TH_DETACHED         0b00000001
+#define TH_STALLED          0b00000010

 
 #define thread_detached(th) ((th)->flags & TH_DETACHED)
 #define detach_thread(th) ((th)->flags |= TH_DETACHED)
 
 
 #define thread_detached(th) ((th)->flags & TH_DETACHED)
 #define detach_thread(th) ((th)->flags |= TH_DETACHED)
 

+#define thread_flags_set(th, flag)      ((th)->flags |= (flag))
+#define thread_flags_clear(th, flag)    ((th)->flags &= ~(flag))
+#define thread_flags_test(th, flag)     ((th)->flags & (flag))
+#define thread_flags_test_all(th, flag) (((th)->flags & (flag)) == (flag))
+

 struct proc_sig
 {
     int sig_num;
     void* sigact;
     void* sighand;
 struct proc_sig
 {
     int sig_num;
     void* sigact;
     void* sighand;

-    isr_param* saved_ictx;
+    struct hart_state* saved_hstate;

 } __attribute__((packed));
 
 
 } __attribute__((packed));
 
 


@@ -72,16 +78,44 @@ struct haybed {
     time_t alarm_time;
 };
 
     time_t alarm_time;
 };
 

+struct thread_stats
+{
+    // number of times the thread entering kernel space involuntarily
+    unsigned long entry_count_invol;
+    // number of times the thread entering kernel space voluntarily
+    unsigned long entry_count_vol;
+    
+    // number of times the thread is preempted in kerenl space
+    unsigned long kpreempt_count;
+
+    // timestamp of last time kernel entry
+    time_t last_entry;
+    // timestamp of last time kernel reentry
+    time_t last_reentry;
+
+    // timestamp of last time kernel leave
+    time_t last_leave;
+    // timestamp of last time the thread is resumed
+    time_t last_resume;
+    
+    union {
+        struct {
+            bool at_user;
+        };
+        int flags;
+    };
+};
+

 struct thread
 {
     /*
         Any change to *critical section*, including layout, size
 struct thread
 {
     /*
         Any change to *critical section*, including layout, size

-        must be reflected in arch/i386/interrupt.S.inc to avoid
+        must be reflected in arch/x86/interrupt.S.inc to avoid

         disaster!
      */
     struct
     {
         disaster!
      */
     struct
     {

-        isr_param* intr_ctx;
+        struct hart_state* hstate;

         ptr_t ustack_top;
     };                              // *critical section
 
         ptr_t ustack_top;
     };                              // *critical section
 


@@ -99,6 +133,8 @@ struct thread
         struct mm_region* ustack;   // process local user stack (NULL for kernel thread)
     };
 
         struct mm_region* ustack;   // process local user stack (NULL for kernel thread)
     };
 

+    struct thread_stats stats;
+

     struct haybed sleep;
 
     struct proc_info* process;
     struct haybed sleep;
 
     struct proc_info* process;


@@ -133,7 +169,7 @@ struct proc_info
     };
 
     struct proc_mm* mm;
     };
 
     struct proc_mm* mm;

-    struct sigregister* sigreg;
+    struct sigregistry* sigreg;

     struct v_fdtable* fdtable;
     struct v_dnode* cwd;
     struct {
     struct v_fdtable* fdtable;
     struct v_dnode* cwd;
     struct {


@@ -182,6 +218,13 @@ vmregions(struct proc_info* proc)
     return proc ? &proc->mm->regions : NULL;
 }
 
     return proc ? &proc->mm->regions : NULL;
 }
 

+
+static inline unsigned int
+procvm_asid(struct proc_mm* mm)
+{
+    return mm->proc->pid;
+}
+

 static inline void
 block_current_thread()
 {
 static inline void
 block_current_thread()
 {


@@ -344,7 +387,7 @@ thread_release_mem(struct thread* thread);
 static inline struct sigact*
 active_signal(struct thread* thread) {
     struct sigctx* sigctx = &thread->sigctx;
 static inline struct sigact*
 active_signal(struct thread* thread) {
     struct sigctx* sigctx = &thread->sigctx;

-    struct sigregister* sigreg = thread->process->sigreg;
+    struct sigregistry* sigreg = thread->process->sigreg;

     return sigreg->signals[sigctx->sig_active];
 } 
 
     return sigreg->signals[sigctx->sig_active];
 } 
 


@@ -374,5 +417,47 @@ proc_setsignal(struct proc_info* proc, signum_t signum);
 void
 thread_setsignal(struct thread* thread, signum_t signum);
 
 void
 thread_setsignal(struct thread* thread, signum_t signum);
 

+void
+thread_stats_update(bool inbound, bool voluntary);
+
+static inline void
+thread_stats_update_entering(bool voluntary)
+{
+    thread_stats_update(true, voluntary);
+}
+
+static inline void
+thread_stats_update_leaving()
+{
+    thread_stats_update(false, true);
+}
+
+static inline void
+thread_stats_update_kpreempt()
+{
+    current_thread->stats.kpreempt_count++;
+}
+
+static inline void
+thread_stats_reset_kpreempt()
+{
+    current_thread->stats.kpreempt_count = 0;
+}
+
+static inline ticks_t
+thread_stats_kernel_elapse(struct thread* thread)
+{
+    return clock_systime() - thread->stats.last_reentry;
+}
+
+static inline ticks_t
+thread_stats_user_elapse(struct thread* thread)
+{
+    struct thread_stats* stats;
+    stats = &thread->stats;
+
+    return stats->last_entry - stats->last_leave;
+}
+

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