X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=7334e7815a5ee482cd8554bbcdd97a14fd9a5b9b;hb=9cb943f4586eb2cbc045d8f44c8715db4549450f;hp=f03138489f35b18bfe52a7024ef164563e6c02cb;hpb=d41c66bf9a23a32605f5f30127cce2cbd68307a8;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h index f0313848..7334e781 100644 --- a/ltt/branches/poly/lttv/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -58,10 +58,10 @@ extern GQuark LTT_FACILITY_KERNEL, LTT_FACILITY_KERNEL_ARCH, - LTT_FACILITY_PROCESS, LTT_FACILITY_FS, - LTT_FACILITY_STATEDUMP, - LTT_FACILITY_USER_GENERIC; + LTT_FACILITY_LIST, + LTT_FACILITY_USER_GENERIC, + LTT_FACILITY_BLOCK; /* Events Quarks */ @@ -74,16 +74,20 @@ extern GQuark LTT_EVENT_IRQ_EXIT, LTT_EVENT_SOFT_IRQ_ENTRY, LTT_EVENT_SOFT_IRQ_EXIT, - LTT_EVENT_SCHEDCHANGE, - LTT_EVENT_FORK, - LTT_EVENT_KERNEL_THREAD, - LTT_EVENT_EXIT, - LTT_EVENT_FREE, + LTT_EVENT_SCHED_SCHEDULE, + LTT_EVENT_PROCESS_FORK, + LTT_EVENT_KTHREAD_CREATE, + LTT_EVENT_PROCESS_EXIT, + LTT_EVENT_PROCESS_FREE, LTT_EVENT_EXEC, - LTT_EVENT_ENUM_PROCESS_STATE, + LTT_EVENT_PROCESS_STATE, + 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 */ @@ -92,9 +96,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, @@ -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; @@ -181,7 +189,6 @@ typedef GQuark LttvProcessStatus; extern LttvProcessStatus LTTV_STATE_UNNAMED, - LTTV_STATE_UNBRANDED, LTTV_STATE_WAIT_FORK, LTTV_STATE_WAIT_CPU, LTTV_STATE_EXIT, @@ -190,12 +197,37 @@ extern LttvProcessStatus LTTV_STATE_RUN, LTTV_STATE_DEAD; +extern GQuark + LTTV_STATE_UNBRANDED; + typedef GQuark LttvProcessType; 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_SOFT_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; @@ -228,6 +260,7 @@ typedef struct _LttvProcessState { guint64 current_function; LttvProcessType type; /* kernel thread or user space ? */ guint target_pid; /* target PID of the current event. */ + guint free_events; /* 0 : none, 1 : free or exit dead, 2 : should delete */ } LttvProcessState; #define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for @@ -275,6 +308,29 @@ 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; + guint last_soft_irq; + guint last_trap; +} 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 _LttvTrapState { + guint running; /* number of times it is currently running (on different processors) */ +} LttvTrapState; + +typedef struct _LttvBdevState { + GArray *mode_stack; +} LttvBdevState; + struct _LttvTraceState { LttvTraceContext parent; @@ -289,12 +345,20 @@ struct _LttvTraceState { guint nb_syscalls; GQuark *trap_names; guint nb_traps; + guint nb_irqs; + guint nb_soft_irqs; GQuark *irq_names; GQuark *soft_irq_names; LttTime *max_time_state_recomputed_in_seek; /* 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 */ + LttvSoftIRQState *soft_irq_states; /* state of each softirq */ + LttvTrapState *trap_states; /* state of each trap */ + GHashTable *bdev_states; /* state of the block devices */ }; struct _LttvTraceStateClass { @@ -327,10 +391,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 { @@ -362,6 +425,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