#include <ltt/facility.h>
#include <ltt/trace.h>
#include <ltt/event.h>
+#include <ltt/type.h>
#define BUF_SIZE 256
LTTV_STATS_USE_COUNT,
LTTV_STATS,
LTTV_STATS_TRACEFILES,
- LTTV_STATS_SUMMED;
-
-static GQuark
+ LTTV_STATS_SUMMED,
LTTV_STATS_BEFORE_HOOKS,
LTTV_STATS_AFTER_HOOKS;
GQuark mode, GQuark sub_mode, LttvAttribute **events_tree,
LttvAttribute **event_types_tree);
-static void
-init(LttvTracesetStats *self, LttvTraceset *ts)
+
+static void lttv_stats_init(LttvTracesetStats *self)
{
guint i, j, nb_trace, nb_tracefile;
LttvTracefileContext *tfc;
+ LttvTracefileContext **tfs;
LttvTracefileStats *tfcs;
LttTime timestamp = {0,0};
*stats_tree,
*tracefiles_stats;
- LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
- init((LttvTracesetContext *)self, ts);
+ LttvTraceset *ts = self->parent.parent.ts;
self->stats = lttv_attribute_find_subdir(
lttv_traceset_attribute(self->parent.parent.ts),
LTTV_STATS_USE_COUNT,
LTTV_UINT, &v);
- *(v.v_uint)++;
+ (*(v.v_uint))++;
if(*(v.v_uint) == 1) {
g_assert(lttv_attribute_get_number(self->stats) == 0);
}
nb_trace = lttv_traceset_number(ts);
for(i = 0 ; i < nb_trace ; i++) {
- tc = (LTTV_TRACESET_CONTEXT(self)->traces[i]);
- tcs = (LttvTraceStats *)tc;
+ tc = self->parent.parent.traces[i];
+ tcs = LTTV_TRACE_STATS(tc);
tcs->stats = lttv_attribute_find_subdir(tcs->parent.parent.t_a,LTTV_STATS);
tracefiles_stats = lttv_attribute_find_subdir(tcs->parent.parent.t_a,
lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT,
LTTV_UINT, &v);
- *(v.v_uint)++;
+ (*(v.v_uint))++;
if(*(v.v_uint) == 1) {
g_assert(lttv_attribute_get_number(tcs->stats) == 0);
}
nb_tracefile = tc->tracefiles->len;
for(j = 0 ; j < nb_tracefile ; j++) {
- tfcs = LTTV_TRACEFILE_STATS(g_array_index(tc->tracefiles,
- LttvTracefileContext*, j));
+ tfs = &g_array_index(tc->tracefiles,
+ LttvTracefileContext*, j);
+ tfcs = LTTV_TRACEFILE_STATS(*tfs);
tfcs->stats = lttv_attribute_find_subdir(tracefiles_stats,
- tfcs->parent.cpu_name);
+ ltt_tracefile_long_name(tfcs->parent.parent.tf));
find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
- tfcs->parent.cpu_name, LTTV_STATE_MODE_UNKNOWN,
+ ltt_tracefile_long_name(tfcs->parent.parent.tf),
+ LTTV_STATE_MODE_UNKNOWN,
LTTV_STATE_SUBMODE_UNKNOWN, &tfcs->current_events_tree,
&tfcs->current_event_types_tree);
}
}
+
}
-static void
-fini(LttvTracesetStats *self)
+static void lttv_stats_fini(LttvTracesetStats *self)
{
guint i, j, nb_trace, nb_tracefile;
lttv_attribute_find(self->parent.parent.ts_a, LTTV_STATS_USE_COUNT,
LTTV_UINT, &v);
- *(v.v_uint)--;
+ (*(v.v_uint))--;
if(*(v.v_uint) == 0) {
lttv_attribute_remove_by_name(self->parent.parent.ts_a, LTTV_STATS);
lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT,
LTTV_UINT, &v);
- *(v.v_uint)--;
+ (*(v.v_uint))--;
if(*(v.v_uint) == 0) {
lttv_attribute_remove_by_name(tcs->parent.parent.t_a,LTTV_STATS);
tfcs->current_event_types_tree = NULL;
}
}
+}
+
+
+void lttv_stats_reset(LttvTracesetStats *self)
+{
+ lttv_stats_fini(self);
+ lttv_stats_init(self);
+}
+
+
+
+static void
+init(LttvTracesetStats *self, LttvTraceset *ts)
+{
+ LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
+ init((LttvTracesetContext *)self, ts);
+
+ lttv_stats_init(self);
+}
+
+
+static void
+fini(LttvTracesetStats *self)
+{
+ lttv_stats_fini(self);
+
LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
fini((LttvTracesetContext *)self);
}
{
LttvAttribute *a;
- LttvTraceStats *tcs = LTTV_TRACE_STATS(tfcs->parent.parent.t_context);
+ LttvTraceStats *tcs = (LttvTraceStats*)tfcs->parent.parent.t_context;
a = lttv_attribute_find_subdir(tcs->stats, LTTV_STATS_PROCESSES);
a = lttv_attribute_find_subdir(a, pid_time);
a = lttv_attribute_find_subdir(a, LTTV_STATS_CPU);
static void update_event_tree(LttvTracefileStats *tfcs)
{
- LttvExecutionState *es = tfcs->parent.process->state;
+ LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+ guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf);
+ LttvProcessState *process = ts->running_process[cpu];
+ LttvExecutionState *es = process->state;
- find_event_tree(tfcs, tfcs->parent.process->pid_time,
- tfcs->parent.cpu_name,
+ find_event_tree(tfcs, process->pid_time,
+ ltt_tracefile_long_name(tfcs->parent.parent.tf),
es->t, es->n, &(tfcs->current_events_tree),
&(tfcs->current_event_types_tree));
}
static void mode_change(LttvTracefileStats *tfcs)
{
+ LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+ guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf);
+ LttvProcessState *process = ts->running_process[cpu];
LttvAttributeValue cpu_time;
LttTime delta;
lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME,
LTTV_TIME, &cpu_time);
delta = ltt_time_sub(tfcs->parent.parent.timestamp,
- tfcs->parent.process->state->change);
+ process->state->change);
*(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta);
}
static void mode_end(LttvTracefileStats *tfcs)
{
+ LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+ guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf);
+ LttvProcessState *process = ts->running_process[cpu];
LttvAttributeValue elapsed_time, cpu_time;
LttTime delta;
lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_ELAPSED_TIME,
LTTV_TIME, &elapsed_time);
delta = ltt_time_sub(tfcs->parent.parent.timestamp,
- tfcs->parent.process->state->entry);
+ process->state->entry);
*(elapsed_time.v_time) = ltt_time_add(*(elapsed_time.v_time), delta);
lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME,
LTTV_TIME, &cpu_time);
delta = ltt_time_sub(tfcs->parent.parent.timestamp,
- tfcs->parent.process->state->change);
+ process->state->change);
*(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta);
}
return FALSE;
}
-
gboolean after_irq_entry(void *hook_data, void *call_data)
{
update_event_tree((LttvTracefileStats *)call_data);
}
+gboolean before_soft_irq_entry(void *hook_data, void *call_data)
+{
+ mode_change((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+gboolean after_soft_irq_entry(void *hook_data, void *call_data)
+{
+ update_event_tree((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+
+gboolean before_soft_irq_exit(void *hook_data, void *call_data)
+{
+ mode_end((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+
+gboolean after_soft_irq_exit(void *hook_data, void *call_data)
+{
+ update_event_tree((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+
gboolean before_schedchange(void *hook_data, void *call_data)
{
LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
+ LttvTraceState *ts = (LttvTraceState*)tfcs->parent.parent.t_context;
+
LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf);
- LttvTraceHookByFacility *thf =
- lttv_trace_hook_get_fac((LttvTraceHook *)hook_data,
- ltt_event_facility_id(e));
+ LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
- guint pid_in, pid_out, state_out;
+ guint pid_in, pid_out;
+
+ gint state_out;
LttvProcessState *process;
pid_out = ltt_event_get_unsigned(e, thf->f1);
pid_in = ltt_event_get_unsigned(e, thf->f2);
- state_out = ltt_event_get_unsigned(e, thf->f3);
+ state_out = ltt_event_get_int(e, thf->f3);
/* compute the time for the process to schedule out */
/* get the information for the process scheduled in */
- process = lttv_state_find_process_or_create(&(tfcs->parent), pid_in);
+ process = lttv_state_find_process_or_create(ts,
+ ANY_CPU, pid_in, &tfcs->parent.parent.timestamp);
- find_event_tree(tfcs, process->pid_time, tfcs->parent.cpu_name,
+ find_event_tree(tfcs, process->pid_time,
+ ltt_tracefile_long_name(tfcs->parent.parent.tf),
process->state->t, process->state->n, &(tfcs->current_events_tree),
&(tfcs->current_event_types_tree));
guint i, j, k, l, nb_trace, nb_tracefile;
- LttFacility *f;
-
- LttEventType *et;
-
LttvTraceStats *ts;
LttvTracefileStats *tfs;
- void *hook_data;
-
GArray *hooks, *before_hooks, *after_hooks;
LttvTraceHook *hook;
/* Find the eventtype id for the following events and register the
associated by id hooks. */
- hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 7);
- g_array_set_size(hooks, 7);
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9);
+ g_array_set_size(hooks, 9);
ret = lttv_trace_find_hook(ts->parent.parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
LTT_FIELD_SYSCALL_ID, 0, 0,
- before_syscall_entry,
+ before_syscall_entry, NULL,
&g_array_index(hooks, LttvTraceHook, 0));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
0, 0, 0,
- before_syscall_exit,
+ before_syscall_exit, NULL,
&g_array_index(hooks, LttvTraceHook, 1));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
LTT_FIELD_TRAP_ID, 0, 0,
- before_trap_entry,
+ before_trap_entry, NULL,
&g_array_index(hooks, LttvTraceHook, 2));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
0, 0, 0,
- before_trap_exit, &g_array_index(hooks, LttvTraceHook, 3));
+ before_trap_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 3));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
LTT_FIELD_IRQ_ID, 0, 0,
- before_irq_entry, &g_array_index(hooks, LttvTraceHook, 4));
+ before_irq_entry, NULL,
+ &g_array_index(hooks, LttvTraceHook, 4));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
0, 0, 0,
- before_irq_exit, &g_array_index(hooks, LttvTraceHook, 5));
+ before_irq_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 5));
+ g_assert(!ret);
+
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
+ LTT_FIELD_SOFT_IRQ_ID, 0, 0,
+ before_soft_irq_entry, NULL,
+ &g_array_index(hooks, LttvTraceHook, 6));
+ g_assert(!ret);
+
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
+ 0, 0, 0,
+ before_soft_irq_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 7));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
- before_schedchange,
- &g_array_index(hooks, LttvTraceHook, 6));
+ before_schedchange, NULL,
+ &g_array_index(hooks, LttvTraceHook, 8));
g_assert(!ret);
before_hooks = hooks;
- hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9);
- g_array_set_size(hooks, 9);
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 11);
+ g_array_set_size(hooks, 11);
ret = lttv_trace_find_hook(ts->parent.parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
LTT_FIELD_SYSCALL_ID, 0, 0,
- after_syscall_entry,
+ after_syscall_entry, NULL,
&g_array_index(hooks, LttvTraceHook, 0));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
0, 0, 0,
- after_syscall_exit,
+ after_syscall_exit, NULL,
&g_array_index(hooks, LttvTraceHook, 1));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
LTT_FIELD_TRAP_ID, 0, 0,
- after_trap_entry, &g_array_index(hooks, LttvTraceHook, 2));
+ after_trap_entry, NULL,
+ &g_array_index(hooks, LttvTraceHook, 2));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
0, 0, 0,
- after_trap_exit, &g_array_index(hooks, LttvTraceHook, 3));
+ after_trap_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 3));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
LTT_FIELD_IRQ_ID, 0, 0,
- after_irq_entry, &g_array_index(hooks, LttvTraceHook, 4));
+ after_irq_entry, NULL,
+ &g_array_index(hooks, LttvTraceHook, 4));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
0, 0, 0,
- after_irq_exit, &g_array_index(hooks, LttvTraceHook, 5));
+ after_irq_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 5));
g_assert(!ret);
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
+ LTT_FIELD_SOFT_IRQ_ID, 0, 0,
+ after_irq_entry, NULL,
+ &g_array_index(hooks, LttvTraceHook, 6));
+ g_assert(!ret);
+
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
+ 0, 0, 0,
+ after_soft_irq_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 7));
+ g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_FORK,
LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
- process_fork,
- &g_array_index(hooks, LttvTraceHook, 6));
+ process_fork, NULL,
+ &g_array_index(hooks, LttvTraceHook, 8));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
LTT_FIELD_PID, 0, 0,
- process_exit, &g_array_index(hooks, LttvTraceHook, 7));
+ process_exit, NULL,
+ &g_array_index(hooks, LttvTraceHook, 9));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
LTT_FIELD_PID, 0, 0,
- process_free, &g_array_index(hooks, LttvTraceHook, 7));
+ process_free, NULL,
+ &g_array_index(hooks, LttvTraceHook, 10));
g_assert(!ret);
nb_tracefile = ts->parent.parent.tracefiles->len;
for(j = 0 ; j < nb_tracefile ; j++) {
- tfs = LTTV_TRACEFILE_STATS(&g_array_index(ts->parent.parent.tracefiles,
- LttvTracefileContext, j));
+ tfs = LTTV_TRACEFILE_STATS(g_array_index(ts->parent.parent.tracefiles,
+ LttvTracefileContext*, j));
lttv_hooks_add(tfs->parent.parent.event, every_event, NULL,
LTTV_PRIO_DEFAULT);
lttv_hooks_add(
lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
thf->h,
- &g_array_index(before_hooks, LttvTraceHook, k),
+ thf,
LTTV_PRIO_STATS_BEFORE_STATE);
}
}
lttv_hooks_add(
lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
thf->h,
- &g_array_index(after_hooks, LttvTraceHook, k),
+ thf,
LTTV_PRIO_STATS_AFTER_STATE);
}
}
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
- ts = LTTV_TRACE_STATS(self->parent.parent.traces[i]);
+ ts = (LttvTraceStats*)self->parent.parent.traces[i];
lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS,
LTTV_POINTER, &val);
before_hooks = *(val.v_pointer);
lttv_hooks_remove_data(
lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
thf->h,
- &g_array_index(before_hooks, LttvTraceHook, k));
+ thf);
}
}
for(k = 0 ; k < after_hooks->len ; k++) {
lttv_hooks_remove_data(
lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
thf->h,
- &g_array_index(after_hooks, LttvTraceHook, k));
+ thf);
}
}
}