X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=79b1f2f0393abde35fc38a1a3ce5b8f4668c6e04;hb=b0b1c1ddd9509b75d82fc5b9ab8768018b0db647;hp=5f22b356f7240317dfb6f4db353a8ee3a0e23dc6;hpb=598026baa39b5672b77d46e70a1434f975d52486;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index 5f22b356..79b1f2f0 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -60,7 +60,8 @@ extern GQuark
     LTT_FACILITY_KERNEL_ARCH,
     LTT_FACILITY_FS,
     LTT_FACILITY_LIST,
-    LTT_FACILITY_USER_GENERIC;
+    LTT_FACILITY_USER_GENERIC,
+    LTT_FACILITY_BLOCK;
 
 /* Events Quarks */
 
@@ -83,7 +84,10 @@ extern GQuark
     LTT_EVENT_STATEDUMP_END,
     LTT_EVENT_FUNCTION_ENTRY,
     LTT_EVENT_FUNCTION_EXIT,
-    LTT_EVENT_THREAD_BRAND;
+    LTT_EVENT_THREAD_BRAND,
+    LTT_EVENT_REQUEST_ISSUE,
+    LTT_EVENT_REQUEST_COMPLETE,
+    LTT_EVENT_LIST_INTERRUPT;
 
 /* Fields Quarks */
 
@@ -106,7 +110,11 @@ extern GQuark
     LTT_FIELD_SUBMODE,
     LTT_FIELD_STATUS,
     LTT_FIELD_THIS_FN,
-    LTT_FIELD_CALL_SITE;
+    LTT_FIELD_CALL_SITE,
+    LTT_FIELD_MINOR,
+    LTT_FIELD_MAJOR,
+    LTT_FIELD_OPERATION,
+    LTT_FIELD_ACTION;
 
 typedef struct _LttvTracesetState LttvTracesetState;
 typedef struct _LttvTracesetStateClass LttvTracesetStateClass;
@@ -203,7 +211,21 @@ extern LttvCPUMode
   LTTV_CPU_UNKNOWN,
   LTTV_CPU_IDLE,
   LTTV_CPU_BUSY,
-  LTTV_CPU_IRQ;
+  LTTV_CPU_IRQ,
+  LTTV_CPU_TRAP;
+
+typedef GQuark LttvIRQMode;
+extern LttvIRQMode
+  LTTV_IRQ_UNKNOWN,
+  LTTV_IRQ_IDLE,
+  LTTV_IRQ_BUSY;
+
+typedef GQuark LttvBdevMode;
+extern LttvBdevMode
+  LTTV_BDEV_UNKNOWN,
+  LTTV_BDEV_IDLE,
+  LTTV_BDEV_BUSY_READING,
+  LTTV_BDEV_BUSY_WRITING;
 
 typedef struct _LttvExecutionState {
   LttvExecutionMode t;
@@ -285,10 +307,18 @@ GType lttv_traceset_state_get_type (void);
 #define LTTV_TRACE_STATE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), LTTV_TRACE_STATE_TYPE, LttvTraceStateClass))
 
 typedef struct _LttvCPUState {
-  LttvCPUMode previous_state;
-  LttvCPUMode present_state;
+  GArray *mode_stack;
+  guint last_irq;
 } LttvCPUState;
 
+typedef struct _LttvIRQState {
+  GArray *mode_stack;
+} LttvIRQState;
+
+typedef struct _LttvBdevState {
+  GArray *mode_stack;
+} LttvBdevState;
+
 struct _LttvTraceState {
   LttvTraceContext parent;
 
@@ -313,6 +343,8 @@ struct _LttvTraceState {
   LttvProcessState **running_process;
   gboolean has_precomputed_states;
   LttvCPUState *cpu_states; /* state of each cpu */
+  LttvIRQState *irq_states; /* state of each irq handler */
+  GHashTable *bdev_states; /* state of the block devices */
 };
 
 struct _LttvTraceStateClass {
@@ -379,6 +411,6 @@ static inline guint lttv_state_get_target_pid(LttvTracefileState *tfs)
 #define HDR_QUARKS 9
 #define HDR_QUARK 10
 
-
+#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
 
 #endif // STATE_H