update style

[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 85ff18943c589b6abdf00ef901ac537835776d72..7a7f89c31c64a72072d98036457d793f681136ed 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -60,8 +60,8 @@ extern GQuark
     LTT_FACILITY_KERNEL_ARCH,
     LTT_FACILITY_PROCESS,
     LTT_FACILITY_FS,
-               LTT_FACILITY_STATEDUMP,
-               LTT_FACILITY_USER_GENERIC;
+    LTT_FACILITY_STATEDUMP,
+    LTT_FACILITY_USER_GENERIC;
 
 /* Events Quarks */
 
@@ -80,9 +80,10 @@ extern GQuark
     LTT_EVENT_EXIT,
     LTT_EVENT_FREE,
     LTT_EVENT_EXEC,
-               LTT_EVENT_ENUM_PROCESS_STATE,
-               LTT_EVENT_FUNCTION_ENTRY,
-               LTT_EVENT_FUNCTION_EXIT;
+    LTT_EVENT_ENUM_PROCESS_STATE,
+    LTT_EVENT_FUNCTION_ENTRY,
+    LTT_EVENT_FUNCTION_EXIT,
+    LTT_EVENT_THREAD_BRAND;
 
 /* Fields Quarks */
 
@@ -99,11 +100,12 @@ extern GQuark
     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;
+    LTT_FIELD_THIS_FN,
+    LTT_FIELD_CALL_SITE;
 
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
@@ -178,6 +180,7 @@ typedef GQuark LttvProcessStatus;
 
 extern LttvProcessStatus
   LTTV_STATE_UNNAMED,
+  LTTV_STATE_UNBRANDED,
   LTTV_STATE_WAIT_FORK,
   LTTV_STATE_WAIT_CPU,
   LTTV_STATE_EXIT,
@@ -186,13 +189,18 @@ extern LttvProcessStatus
   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;
+  LttTime cum_cpu_time;
   LttvProcessStatus s;
 } LttvExecutionState;
 
@@ -202,6 +210,7 @@ typedef struct _LttvProcessState {
   LttTime creation_time;
   LttTime insertion_time;
   GQuark name;
+  GQuark brand;
   GQuark pid_time;
   GArray *execution_stack;         /* Array of LttvExecutionState */
   LttvExecutionState *state;       /* Top of interrupt stack */
@@ -210,12 +219,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 */
+  LttvTracefileState  *usertrace;    /* Associated usertrace */
   /* opened file descriptors, address map?... */
-  GArray *user_stack;                                  /* User space function call stack */
-       guint64 current_function;
+  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
@@ -267,14 +276,15 @@ struct _LttvTraceState {
 
   GHashTable *processes;  /* LttvProcessState objects indexed by pid and
                              last_cpu */
-       GHashTable *usertraces; /* GPtrArray objects indexed by pid, containing
-                                                                                                                pointers to LttvTracefileState objects. */
+  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;
+  guint  nb_syscalls;
   GQuark *trap_names;
+  guint  nb_traps;
   GQuark *irq_names;
   GQuark *soft_irq_names;
   LttTime *max_time_state_recomputed_in_seek;
@@ -301,7 +311,7 @@ void lttv_state_state_saved_free(LttvTraceState *self,
     LttvAttribute *container);
 
 int lttv_state_pop_state_cleanup(LttvProcessState *process,
-               LttvTracefileState *tfs);
+    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))
@@ -315,7 +325,7 @@ struct _LttvTracefileState {
 
   //LttvProcessState *process;
   GQuark tracefile_name;
-       guint cpu;      /* Current cpu of the tracefile */
+  guint cpu;  /* Current cpu of the tracefile */
 //  guint saved_position;
 };