X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=b4fa430ffdb7107ef42a438a6aa6b41c0da89578;hb=302efbadc93944574ea9955d8c72a56b0ac9a1dc;hp=c37fb032eb210e04e0a20c9bcafe88202f59050f;hpb=348c6ba830cba63cc5486e2cea042c8a70cf1fb2;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index c37fb032..b4fa430f 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -57,7 +57,10 @@
 
 extern GQuark
     LTT_FACILITY_KERNEL,
-    LTT_FACILITY_PROCESS;
+    LTT_FACILITY_KERNEL_ARCH,
+    LTT_FACILITY_PROCESS,
+    LTT_FACILITY_FS,
+		LTT_FACILITY_STATEDUMP;
 
 /* Events Quarks */
 
@@ -68,10 +71,15 @@ extern GQuark
     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_FREE,
+    LTT_EVENT_EXEC,
+		LTT_EVENT_ENUM_PROCESS_STATE;
 
 /* Fields Quarks */
 
@@ -79,14 +87,18 @@ 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;
-
-extern GQuark LTT_EVENT_SYSCALL_ENTRY;
+    LTT_FIELD_PID,
+    LTT_FIELD_FILENAME,
+    LTT_FIELD_NAME,
+    LTT_FIELD_MODE,
+    LTT_FIELD_SUBMODE,
+    LTT_FIELD_STATUS;
 
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
@@ -137,6 +149,7 @@ extern LttvExecutionMode
   LTTV_STATE_SYSCALL,
   LTTV_STATE_TRAP,
   LTTV_STATE_IRQ,
+  LTTV_STATE_SOFT_IRQ,
   LTTV_STATE_MODE_UNKNOWN;
 
 
@@ -165,7 +178,8 @@ extern LttvProcessStatus
   LTTV_STATE_EXIT,
   LTTV_STATE_ZOMBIE,
   LTTV_STATE_WAIT,
-  LTTV_STATE_RUN;
+  LTTV_STATE_RUN,
+  LTTV_STATE_DEAD;
 
 
 typedef struct _LttvExecutionState {
@@ -176,7 +190,6 @@ typedef struct _LttvExecutionState {
   LttvProcessStatus s;
 } LttvExecutionState;
 
-
 typedef struct _LttvProcessState {
   guint pid;
   guint ppid;
@@ -191,8 +204,12 @@ typedef struct _LttvProcessState {
        * (Mathieu) */
   guint cpu;                /* CPU where process is scheduled (being either in
                                the active or inactive runqueue)*/
+	gboolean kernel_thread;		/* Is this thread a kernel_thread ? */
 //  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;
 } LttvProcessState;
 
 #define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for
@@ -206,8 +223,8 @@ lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
     LttTime *timestamp);
 
 LttvProcessState *
-lttv_state_create_process(LttvTraceState *ts, LttvProcessState *parent, 
-    guint cpu, guint pid, const LttTime *timestamp);
+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);
 
@@ -244,17 +261,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 {
@@ -287,6 +307,7 @@ struct _LttvTracefileState {
 
   //LttvProcessState *process;
   GQuark tracefile_name;
+	guint cpu;	/* Current cpu of the tracefile */
 //  guint saved_position;
 };