X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.h;h=68c6eb2569378d029691d92a71c3381f3bf043d5;hb=f63ebe5196f36fcf40385d29cfc37288c4d70817;hp=85ff18943c589b6abdf00ef901ac537835776d72;hpb=b49e54b4abd9105b9904e050656b4a9981bdd064;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h index 85ff1894..68c6eb25 100644 --- a/ltt/branches/poly/lttv/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -58,10 +58,9 @@ 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; /* Events Quarks */ @@ -74,15 +73,17 @@ 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_FUNCTION_ENTRY, - LTT_EVENT_FUNCTION_EXIT; + LTT_EVENT_PROCESS_STATE, + LTT_EVENT_STATEDUMP_END, + LTT_EVENT_FUNCTION_ENTRY, + LTT_EVENT_FUNCTION_EXIT, + LTT_EVENT_THREAD_BRAND; /* Fields Quarks */ @@ -91,19 +92,21 @@ 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_THIS_FN, - LTT_FIELD_CALL_SITE; + LTT_FIELD_THIS_FN, + LTT_FIELD_CALL_SITE; typedef struct _LttvTracesetState LttvTracesetState; typedef struct _LttvTracesetStateClass LttvTracesetStateClass; @@ -186,22 +189,32 @@ 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 struct _LttvExecutionState { LttvExecutionMode t; LttvExecutionSubmode n; LttTime entry; LttTime change; - LttTime cum_cpu_time; + 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 */ @@ -210,12 +223,13 @@ typedef struct _LttvProcessState { * (Mathieu) */ guint cpu; /* CPU where process is scheduled (being either in the active or inactive runqueue)*/ - gboolean kernel_thread; /* Is this thread a kernel_thread ? */ // guint last_tracefile_index; /* index in the trace for cpu tracefile */ - LttvTracefileState *usertrace; /* Associated usertrace */ + LttvTracefileState *usertrace; /* Associated usertrace */ /* opened file descriptors, address map?... */ - GArray *user_stack; /* User space function call stack */ - guint64 current_function; + 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. */ } LttvProcessState; #define ANY_CPU 0 /* For clarity sake : a call to lttv_state_find_process for @@ -226,13 +240,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. */ @@ -267,20 +282,24 @@ struct _LttvTraceState { GHashTable *processes; /* LttvProcessState objects indexed by pid and last_cpu */ - GHashTable *usertraces; /* GPtrArray objects indexed by pid, containing - pointers to LttvTracefileState objects. */ + 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; + guint nb_syscalls; GQuark *trap_names; + guint nb_traps; + guint nb_irqs; + guint nb_softirqs; 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; }; struct _LttvTraceStateClass { @@ -301,7 +320,7 @@ void lttv_state_state_saved_free(LttvTraceState *self, LttvAttribute *container); int lttv_state_pop_state_cleanup(LttvProcessState *process, - LttvTracefileState *tfs); + 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)) @@ -315,7 +334,7 @@ struct _LttvTracefileState { //LttvProcessState *process; GQuark tracefile_name; - guint cpu; /* Current cpu of the tracefile */ + guint cpu; /* Current cpu of the tracefile */ // guint saved_position; }; @@ -325,5 +344,29 @@ 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 + + #endif // STATE_H