update state dump

[lttv.git] / ltt / branches / poly / lttv / lttv / state.h

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index f349993764418b732f67f5b82b5c848feb844f47..3b9dda4afa67921d5d2fe42a4afe4efbd4847928 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -51,6 +51,61 @@
 /* Priority of state hooks */
 #define LTTV_PRIO_STATE 25
 
+#define LTTV_STATE_SAVE_INTERVAL 50000
+
+/* Facilities Quarks */
+
+extern GQuark
+    LTT_FACILITY_KERNEL,
+    LTT_FACILITY_KERNEL_ARCH,
+    LTT_FACILITY_PROCESS,
+    LTT_FACILITY_FS,
+               LTT_FACILITY_STATEDUMP,
+               LTT_FACILITY_USER_GENERIC;
+
+/* Events Quarks */
+
+extern GQuark 
+    LTT_EVENT_SYSCALL_ENTRY,
+    LTT_EVENT_SYSCALL_EXIT,
+    LTT_EVENT_TRAP_ENTRY,
+    LTT_EVENT_TRAP_EXIT,
+    LTT_EVENT_IRQ_ENTRY,
+    LTT_EVENT_IRQ_EXIT,
+    LTT_EVENT_SOFT_IRQ_ENTRY,
+    LTT_EVENT_SOFT_IRQ_EXIT,
+    LTT_EVENT_SCHEDCHANGE,
+    LTT_EVENT_FORK,
+    LTT_EVENT_KERNEL_THREAD,
+    LTT_EVENT_EXIT,
+    LTT_EVENT_FREE,
+    LTT_EVENT_EXEC,
+               LTT_EVENT_ENUM_PROCESS_STATE,
+               LTT_EVENT_FUNCTION_ENTRY,
+               LTT_EVENT_FUNCTION_EXIT;
+
+/* Fields Quarks */
+
+extern GQuark 
+    LTT_FIELD_SYSCALL_ID,
+    LTT_FIELD_TRAP_ID,
+    LTT_FIELD_IRQ_ID,
+    LTT_FIELD_SOFT_IRQ_ID,
+    LTT_FIELD_OUT,
+    LTT_FIELD_IN,
+    LTT_FIELD_OUT_STATE,
+    LTT_FIELD_PARENT_PID,
+    LTT_FIELD_CHILD_PID,
+    LTT_FIELD_PID,
+    LTT_FIELD_FILENAME,
+    LTT_FIELD_NAME,
+    LTT_FIELD_TYPE,
+    LTT_FIELD_MODE,
+    LTT_FIELD_SUBMODE,
+    LTT_FIELD_STATUS,
+               LTT_FIELD_THIS_FN,
+               LTT_FIELD_CALL_SITE;
+
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
 
@@ -100,6 +155,7 @@ extern LttvExecutionMode
   LTTV_STATE_SYSCALL,
   LTTV_STATE_TRAP,
   LTTV_STATE_IRQ,
+  LTTV_STATE_SOFT_IRQ,
   LTTV_STATE_MODE_UNKNOWN;
 
 
@@ -128,18 +184,24 @@ extern LttvProcessStatus
   LTTV_STATE_EXIT,
   LTTV_STATE_ZOMBIE,
   LTTV_STATE_WAIT,
-  LTTV_STATE_RUN;
+  LTTV_STATE_RUN,
+  LTTV_STATE_DEAD;
+
+typedef GQuark LttvProcessType;
 
+extern LttvProcessType
+  LTTV_STATE_USER_THREAD,
+       LTTV_STATE_KERNEL_THREAD;
 
 typedef struct _LttvExecutionState {
   LttvExecutionMode t;
   LttvExecutionSubmode n;
   LttTime entry;
   LttTime change;
+       LttTime cum_cpu_time;
   LttvProcessStatus s;
 } LttvExecutionState;
 
-
 typedef struct _LttvProcessState {
   guint pid;
   guint ppid;
@@ -149,20 +211,32 @@ typedef struct _LttvProcessState {
   GQuark pid_time;
   GArray *execution_stack;         /* Array of LttvExecutionState */
   LttvExecutionState *state;       /* Top of interrupt stack */
-  GQuark last_cpu;                /* Last CPU where process was scheduled */
-  guint last_cpu_index;            /* index in the trace for cpu tracefile */
+      /* WARNING : each time the execution_stack size is modified, the state
+       * must be reget : g_array_set_size can have to move the array.
+       * (Mathieu) */
+  guint cpu;                /* CPU where process is scheduled (being either in
+                               the active or inactive runqueue)*/
+//  guint  last_tracefile_index;    /* index in the trace for cpu tracefile */
+       LttvTracefileState      *usertrace;             /* Associated usertrace */
   /* opened file descriptors, address map?... */
+  GArray *user_stack;                                  /* User space function call stack */
+       guint64 current_function;
+       LttvProcessType type;                           /* kernel thread or user space ? */
 } LttvProcessState;
 
+#define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for
+                     a PID != 0 will search on any cpu automatically. */
+
 LttvProcessState *
-lttv_state_find_process(LttvTracefileState *tfs, guint pid);
+lttv_state_find_process(LttvTraceState *ts, guint cpu, guint pid);
 
 LttvProcessState *
-lttv_state_find_process_or_create(LttvTracefileState *tfs, guint pid);
+lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
+    LttTime *timestamp);
 
 LttvProcessState *
-lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent, 
-    guint pid);
+lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, 
+    guint cpu, guint pid, GQuark name, const LttTime *timestamp);
 
 void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp);
 
@@ -199,13 +273,20 @@ struct _LttvTraceState {
 
   GHashTable *processes;  /* LttvProcessState objects indexed by pid and
                              last_cpu */
+       GHashTable *usertraces; /* GPtrArray objects indexed by pid, containing
+                                                                                                                pointers to LttvTracefileState objects. */
   guint nb_event, save_interval;
   /* Block/char devices, locks, memory pages... */
   GQuark *eventtype_names;
   GQuark *syscall_names;
+       guint  nb_syscalls;
   GQuark *trap_names;
   GQuark *irq_names;
+  GQuark *soft_irq_names;
   LttTime *max_time_state_recomputed_in_seek;
+
+  /* Array of per cpu running process */
+  LttvProcessState **running_process;
 };
 
 struct _LttvTraceStateClass {
@@ -225,6 +306,8 @@ void lttv_state_restore(LttvTraceState *self, LttvAttribute *container);
 void lttv_state_state_saved_free(LttvTraceState *self, 
     LttvAttribute *container);
 
+int lttv_state_pop_state_cleanup(LttvProcessState *process,
+               LttvTracefileState *tfs);
 
 #define LTTV_TRACEFILE_STATE_TYPE  (lttv_tracefile_state_get_type ())
 #define LTTV_TRACEFILE_STATE(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), LTTV_TRACEFILE_STATE_TYPE, LttvTracefileState))
@@ -236,9 +319,10 @@ void lttv_state_state_saved_free(LttvTraceState *self,
 struct _LttvTracefileState {
   LttvTracefileContext parent;
 
-  LttvProcessState *process;
-  GQuark cpu_name;
-  guint saved_position;
+  //LttvProcessState *process;
+  GQuark tracefile_name;
+       guint cpu;      /* Current cpu of the tracefile */
+//  guint saved_position;
 };
 
 struct _LttvTracefileStateClass {