X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=be2e0b1c71be34249fd8f5298ef6de0a4828f783;hb=8743690d339401db862834d50f9b6bbd1268271f;hp=7884ff2fe363ece40eda83cefe7722b394d8ede4;hpb=86c32a8f662ef6a6c88a72d54c06d2a1095970bf;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index 7884ff2f..be2e0b1c 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -92,9 +92,9 @@ extern GQuark
     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_PREV_PID,
+    LTT_FIELD_NEXT_PID,
+    LTT_FIELD_PREV_STATE,
     LTT_FIELD_PARENT_PID,
     LTT_FIELD_CHILD_PID,
     LTT_FIELD_PID,
@@ -198,6 +198,20 @@ extern LttvProcessType
   LTTV_STATE_USER_THREAD,
   LTTV_STATE_KERNEL_THREAD;
 
+typedef GQuark LttvCPUMode;
+extern LttvCPUMode
+  LTTV_CPU_UNKNOWN,
+  LTTV_CPU_IDLE,
+  LTTV_CPU_BUSY,
+  LTTV_CPU_IRQ,
+  LTTV_CPU_TRAP;
+
+typedef GQuark LttvIRQMode;
+extern LttvIRQMode
+  LTTV_IRQ_UNKNOWN,
+  LTTV_IRQ_IDLE,
+  LTTV_IRQ_BUSY;
+
 typedef struct _LttvExecutionState {
   LttvExecutionMode t;
   LttvExecutionSubmode n;
@@ -277,6 +291,15 @@ GType lttv_traceset_state_get_type (void);
 #define LTTV_IS_TRACE_STATE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), LTTV_TRACE_STATE_TYPE))
 #define LTTV_TRACE_STATE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), LTTV_TRACE_STATE_TYPE, LttvTraceStateClass))
 
+typedef struct _LttvCPUState {
+  GArray *mode_stack;
+  guint last_irq;
+} LttvCPUState;
+
+typedef struct _LttvIRQState {
+  GArray *mode_stack;
+} LttvIRQState;
+
 struct _LttvTraceState {
   LttvTraceContext parent;
 
@@ -300,6 +323,8 @@ struct _LttvTraceState {
   /* Array of per cpu running process */
   LttvProcessState **running_process;
   gboolean has_precomputed_states;
+  LttvCPUState *cpu_states; /* state of each cpu */
+  LttvIRQState *irq_states; /* state of each irq handler */
 };
 
 struct _LttvTraceStateClass {
@@ -332,10 +357,9 @@ int lttv_state_pop_state_cleanup(LttvProcessState *process,
 struct _LttvTracefileState {
   LttvTracefileContext parent;
 
-  //LttvProcessState *process;
   GQuark tracefile_name;
-  guint cpu;  /* Current cpu of the tracefile */
-//  guint saved_position;
+  guint cpu;  /* Current cpu of the tracefile */ /* perhaps merge in cpu_state */
+  LttvCPUState *cpu_state; /* cpu resource state */
 };
 
 struct _LttvTracefileStateClass {