#include <ltt/facility.h>
#include <ltt/trace.h>
#include <ltt/event.h>
+#include <ltt/type.h>
#define BUF_SIZE 256
LttvTracefileContext *tfc;
+ LttvTracefileContext **tfs;
LttvTracefileStats *tfcs;
LttTime timestamp = {0,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,
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);
find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
{
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);
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 */
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;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, 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,
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_PROCESS, LTT_EVENT_SCHEDCHANGE,
LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
- before_schedchange,
+ before_schedchange, NULL,
&g_array_index(hooks, LttvTraceHook, 6));
g_assert(!ret);
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, 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,
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_PROCESS, LTT_EVENT_FORK,
LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
- process_fork,
+ process_fork, NULL,
&g_array_index(hooks, LttvTraceHook, 6));
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, 7));
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, 8));
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);
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);