X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=07867b10ceffd1eea2052097598a59fb0b3d03e5;hb=d34141ca6fc6dd872a922134b22095bd74ec013d;hp=79b1f2f0393abde35fc38a1a3ce5b8f4668c6e04;hpb=43fb1d98c1e2bfc231a4c6a3a7f03c912f49ca48;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index 79b1f2f0..07867b10 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -212,6 +212,7 @@ extern LttvCPUMode
   LTTV_CPU_IDLE,
   LTTV_CPU_BUSY,
   LTTV_CPU_IRQ,
+  LTTV_CPU_SOFT_IRQ,
   LTTV_CPU_TRAP;
 
 typedef GQuark LttvIRQMode;
@@ -309,12 +310,17 @@ GType lttv_traceset_state_get_type (void);
 typedef struct _LttvCPUState {
   GArray *mode_stack;
   guint last_irq;
+  guint last_soft_irq;
 } LttvCPUState;
 
 typedef struct _LttvIRQState {
   GArray *mode_stack;
 } LttvIRQState;
 
+typedef struct _LttvSoftIRQState {
+  guint running; /* number of times it is currently running (on different processors) */
+} LttvSoftIRQState;
+
 typedef struct _LttvBdevState {
   GArray *mode_stack;
 } LttvBdevState;
@@ -334,7 +340,7 @@ struct _LttvTraceState {
   GQuark *trap_names;
   guint  nb_traps;
   guint  nb_irqs;
-  guint  nb_softirqs;
+  guint  nb_soft_irqs;
   GQuark *irq_names;
   GQuark *soft_irq_names;
   LttTime *max_time_state_recomputed_in_seek;
@@ -344,6 +350,7 @@ struct _LttvTraceState {
   gboolean has_precomputed_states;
   LttvCPUState *cpu_states; /* state of each cpu */
   LttvIRQState *irq_states; /* state of each irq handler */
+  LttvSoftIRQState *soft_irq_states; /* state of each softirq */
   GHashTable *bdev_states; /* state of the block devices */
 };
 
@@ -411,6 +418,11 @@ 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))
+/* 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