resourceview: redesign resource handling in a tree fashion

[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 c419e43fe0e132fc5453448aa35dc5b1e227383e..c3bdf1385624b3235027f97c2b4f69cbf999e408 100644 (file)
--- 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;
@@ -206,6 +214,19 @@ extern LttvCPUMode
   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;
   LttvExecutionSubmode n;
@@ -287,8 +308,17 @@ GType lttv_traceset_state_get_type (void);
 
 typedef struct _LttvCPUState {
   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,11 @@ static inline guint lttv_state_get_target_pid(LttvTracefileState *tfs)
 #define HDR_QUARKS 9
 #define HDR_QUARK 10
 
-
+/* Device number manipulation macros from kernel source */
+#define MINORBITS      20
+#define MINORMASK      ((1U << MINORBITS) - 1)
+#define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
+#define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
+#define MKDEV(ma,mi)   (((ma) << MINORBITS) | (mi))
 
 #endif // STATE_H