X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=87a89b992c213e243c67567c0f0aef1be849d4b4;hb=dc6b246703be1051c20919746dc34eccbc8912ea;hp=f8d62d4cd2e50480559ecb5b8ea6f580a3242b93;hpb=b3fd4c02566c71add135fbc715fddafc9b03b141;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h index f8d62d4c..87a89b99 100644 --- a/ltt/branches/poly/lttv/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -58,9 +58,11 @@ extern GQuark LTT_FACILITY_KERNEL, LTT_FACILITY_KERNEL_ARCH, - LTT_FACILITY_PROCESS, LTT_FACILITY_FS, - LTT_FACILITY_STATEDUMP; + LTT_FACILITY_LIST, + LTT_FACILITY_USER_GENERIC, + LTT_FACILITY_BLOCK, + LTT_FACILITY_STATEDUMP; /* Events Quarks */ @@ -73,12 +75,22 @@ extern GQuark LTT_EVENT_IRQ_EXIT, LTT_EVENT_SOFT_IRQ_ENTRY, LTT_EVENT_SOFT_IRQ_EXIT, - LTT_EVENT_SCHEDCHANGE, - LTT_EVENT_FORK, - 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_REQUEST_ISSUE, + LTT_EVENT_REQUEST_COMPLETE, + LTT_EVENT_LIST_INTERRUPT, + LTT_EVENT_SYS_CALL_TABLE, + LTT_EVENT_SOFTIRQ_VEC; /* Fields Quarks */ @@ -87,17 +99,28 @@ 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, + LTT_FIELD_TGID, LTT_FIELD_FILENAME, LTT_FIELD_NAME, + LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE, - LTT_FIELD_STATUS; + LTT_FIELD_STATUS, + LTT_FIELD_THIS_FN, + LTT_FIELD_CALL_SITE, + LTT_FIELD_MINOR, + LTT_FIELD_MAJOR, + LTT_FIELD_OPERATION, + LTT_FIELD_ACTION, + LTT_FIELD_ID, + LTT_FIELD_ADDRESS, + LTT_FIELD_SYMBOL; typedef struct _LttvTracesetState LttvTracesetState; typedef struct _LttvTracesetStateClass LttvTracesetStateClass; @@ -180,22 +203,54 @@ 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; LttTime entry; LttTime change; + LttTime cum_cpu_time; LttvProcessStatus s; } LttvExecutionState; - typedef struct _LttvProcessState { guint pid; + guint tgid; guint ppid; LttTime creation_time; LttTime insertion_time; GQuark name; + GQuark brand; GQuark pid_time; GArray *execution_stack; /* Array of LttvExecutionState */ LttvExecutionState *state; /* Top of interrupt stack */ @@ -205,7 +260,13 @@ typedef struct _LttvProcessState { guint cpu; /* CPU where process is scheduled (being either in the active or inactive runqueue)*/ // guint last_tracefile_index; /* index in the trace for cpu tracefile */ + LttvTracefileState *usertrace; /* Associated usertrace */ /* opened file descriptors, address map?... */ + GArray *user_stack; /* User space function call stack */ + 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 @@ -216,13 +277,14 @@ lttv_state_find_process(LttvTraceState *ts, guint cpu, guint pid); LttvProcessState * lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid, - LttTime *timestamp); + const LttTime *timestamp); LttvProcessState * lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, - guint cpu, guint pid, GQuark name, const LttTime *timestamp); + guint cpu, guint pid, guint tgid, GQuark name, const LttTime *timestamp); void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp); +void lttv_state_write_raw(LttvTraceState *self, LttTime t, FILE *fp); /* The LttvTracesetState, LttvTraceState and LttvTracefileState types inherit from the corresponding Context objects defined in processTrace. */ @@ -252,23 +314,57 @@ 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; GHashTable *processes; /* LttvProcessState objects indexed by pid and last_cpu */ + GHashTable *usertraces; /* GPtrArray objects indexed by pid, containing + pointers to LttvTracefileState objects. */ guint nb_event, save_interval; /* Block/char devices, locks, memory pages... */ GQuark *eventtype_names; GQuark *syscall_names; + 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 { @@ -288,6 +384,8 @@ void lttv_state_restore(LttvTraceState *self, LttvAttribute *container); void lttv_state_state_saved_free(LttvTraceState *self, LttvAttribute *container); +int lttv_state_pop_state_cleanup(LttvProcessState *process, + LttvTracefileState *tfs); #define LTTV_TRACEFILE_STATE_TYPE (lttv_tracefile_state_get_type ()) #define LTTV_TRACEFILE_STATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LTTV_TRACEFILE_STATE_TYPE, LttvTracefileState)) @@ -299,9 +397,9 @@ void lttv_state_state_saved_free(LttvTraceState *self, struct _LttvTracefileState { LttvTracefileContext parent; - //LttvProcessState *process; GQuark tracefile_name; -// guint saved_position; + guint cpu; /* Current cpu of the tracefile */ /* perhaps merge in cpu_state */ + LttvCPUState *cpu_state; /* cpu resource state */ }; struct _LttvTracefileStateClass { @@ -310,5 +408,34 @@ struct _LttvTracefileStateClass { GType lttv_tracefile_state_get_type (void); +static inline guint lttv_state_get_target_pid(LttvTracefileState *tfs) +{ + LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context; + guint cpu = tfs->cpu; + LttvProcessState *process = ts->running_process[cpu]; + + if(tfs->parent.target_pid >= 0) return tfs->parent.target_pid; + else return process->pid; +} + + +#define HDR_PROCESS 0 +#define HDR_ES 1 +#define HDR_USER_STACK 2 +#define HDR_USERTRACE 3 +#define HDR_PROCESS_STATE 4 +#define HDR_CPU 5 +#define HDR_TRACEFILE 6 +#define HDR_TRACESET 7 +#define HDR_TRACE 8 +#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