#include <config.h>
#endif
+#include <glib.h>
#include <lttv/lttv.h>
#include <lttv/module.h>
#include <lttv/state.h>
#include <ltt/trace.h>
#include <ltt/event.h>
#include <ltt/ltt.h>
+#include <ltt/marker-desc.h>
#include <stdio.h>
#include <string.h>
+#include <ltt/ltt-private.h>
/* Comment :
* Mathieu Desnoyers
LTT_FACILITY_LIST,
LTT_FACILITY_FS,
LTT_FACILITY_USER_GENERIC,
- LTT_FACILITY_BLOCK;
+ LTT_FACILITY_BLOCK,
+ LTT_FACILITY_STATEDUMP;
/* Events Quarks */
LTT_EVENT_THREAD_BRAND,
LTT_EVENT_REQUEST_ISSUE,
LTT_EVENT_REQUEST_COMPLETE,
- LTT_EVENT_LIST_INTERRUPT;
+ LTT_EVENT_LIST_INTERRUPT,
+ LTT_EVENT_SYS_CALL_TABLE,
+ LTT_EVENT_SOFTIRQ_VEC;
/* Fields Quarks */
LTT_FIELD_MAJOR,
LTT_FIELD_OPERATION,
LTT_FIELD_ACTION,
- LTT_FIELD_NUM;
+ LTT_FIELD_ID,
+ LTT_FIELD_ADDRESS,
+ LTT_FIELD_SYMBOL;
LttvExecutionMode
LTTV_STATE_MODE_UNKNOWN,
LTTV_CPU_IDLE,
LTTV_CPU_BUSY,
LTTV_CPU_IRQ,
+ LTTV_CPU_SOFT_IRQ,
LTTV_CPU_TRAP;
LttvIRQMode
LTTV_STATE_NAME_TABLES,
LTTV_STATE_TRACE_STATE_USE_COUNT,
LTTV_STATE_RESOURCE_CPUS,
+ LTTV_STATE_RESOURCE_CPUS_COUNT,
LTTV_STATE_RESOURCE_IRQS,
+ LTTV_STATE_RESOURCE_SOFT_IRQS,
+ LTTV_STATE_RESOURCE_TRAPS,
LTTV_STATE_RESOURCE_BLKDEVS;
static void create_max_time(LttvTraceState *tcs);
g_hash_table_destroy(usertraces);
}
+gboolean rettrue(gpointer key, gpointer value, gpointer user_data)
+{
+ return TRUE;
+}
+
+static guint check_expand(nb, id)
+{
+ if(likely(nb > id))
+ return nb;
+ else
+ return max(id + 1, nb * 2);
+}
+
+static void expand_name_table(LttvTraceState *ts, GQuark **table,
+ guint nb, guint new_nb)
+{
+ /* Expand an incomplete table */
+ GQuark *old_table = *table;
+ *table = g_new(GQuark, new_nb);
+ memcpy(*table, old_table, nb * sizeof(GQuark));
+}
+
+static void fill_name_table(LttvTraceState *ts, GQuark *table, guint nb,
+ guint new_nb, const char *def_string)
+{
+ guint i;
+ GString *fe_name = g_string_new("");
+ for(i = nb; i < new_nb; i++) {
+ g_string_printf(fe_name, "%s %d", def_string, i);
+ table[i] = g_quark_from_string(fe_name->str);
+ }
+ g_string_free(fe_name, TRUE);
+}
+
+static void expand_syscall_table(LttvTraceState *ts, int id)
+{
+ guint new_nb = check_expand(ts->nb_syscalls, id);
+ if(likely(new_nb == ts->nb_syscalls))
+ return;
+ expand_name_table(ts, &ts->syscall_names, ts->nb_syscalls, new_nb);
+ fill_name_table(ts, ts->syscall_names, ts->nb_syscalls, new_nb, "syscall");
+ /* Update the table size */
+ ts->nb_syscalls = new_nb;
+}
+
+static void expand_trap_table(LttvTraceState *ts, int id)
+{
+ guint new_nb = check_expand(ts->nb_traps, id);
+ guint i;
+ if(likely(new_nb == ts->nb_traps))
+ return;
+ expand_name_table(ts, &ts->trap_names, ts->nb_traps, new_nb);
+ fill_name_table(ts, ts->trap_names, ts->nb_traps, new_nb, "trap");
+ /* Update the table size */
+ ts->nb_traps = new_nb;
+
+ LttvTrapState *old_table = ts->trap_states;
+ ts->trap_states = g_new(LttvTrapState, new_nb);
+ memcpy(ts->trap_states, old_table,
+ ts->nb_traps * sizeof(LttvTrapState));
+ for(i = ts->nb_traps; i < new_nb; i++)
+ ts->trap_states[i].running = 0;
+}
+
+static void expand_irq_table(LttvTraceState *ts, int id)
+{
+ guint new_nb = check_expand(ts->nb_irqs, id);
+ guint i;
+ if(likely(new_nb == ts->nb_irqs))
+ return;
+ expand_name_table(ts, &ts->irq_names, ts->nb_irqs, new_nb);
+ fill_name_table(ts, ts->irq_names, ts->nb_irqs, new_nb, "irq");
+
+ LttvIRQState *old_table = ts->irq_states;
+ ts->irq_states = g_new(LttvIRQState, new_nb);
+ memcpy(ts->irq_states, old_table, ts->nb_irqs * sizeof(LttvIRQState));
+ for(i = ts->nb_irqs; i < new_nb; i++) {
+ ts->irq_states[i].mode_stack = g_array_new(FALSE, FALSE, sizeof(LttvIRQMode));
+ }
+ /* Update the table size */
+ ts->nb_irqs = new_nb;
+}
+
+static void expand_soft_irq_table(LttvTraceState *ts, int id)
+{
+ guint new_nb = check_expand(ts->nb_soft_irqs, id);
+ guint i;
+ if(likely(new_nb == ts->nb_soft_irqs))
+ return;
+ expand_name_table(ts, &ts->soft_irq_names, ts->nb_soft_irqs, new_nb);
+ fill_name_table(ts, ts->soft_irq_names, ts->nb_soft_irqs, new_nb, "softirq");
+
+ LttvSoftIRQState *old_table = ts->soft_irq_states;
+ ts->soft_irq_states = g_new(LttvSoftIRQState, new_nb);
+ memcpy(ts->soft_irq_states, old_table,
+ ts->nb_soft_irqs * sizeof(LttvSoftIRQState));
+ for(i = ts->nb_soft_irqs; i < new_nb; i++)
+ ts->soft_irq_states[i].running = 0;
+
+ /* Update the table size */
+ ts->nb_soft_irqs = new_nb;
+}
static void
restore_init_state(LttvTraceState *self)
{
- guint i, nb_cpus, nb_irqs;
+ guint i, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
//LttvTracefileState *tfcs;
nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
nb_irqs = self->nb_irqs;
+ nb_soft_irqs = self->nb_soft_irqs;
+ nb_traps = self->nb_traps;
/* Put the per cpu running_process to beginning state : process 0. */
for(i=0; i< nb_cpus; i++) {
g_array_remove_range(self->irq_states[i].mode_stack, 0, self->irq_states[i].mode_stack->len);
}
+ /* reset softirq states */
+ for(i=0; i<nb_soft_irqs; i++) {
+ self->soft_irq_states[i].running = 0;
+ }
+
+ /* reset trap states */
+ for(i=0; i<nb_traps; i++) {
+ self->trap_states[i].running = 0;
+ }
+
/* reset bdev states */
g_hash_table_foreach(self->bdev_states, bdevstate_free_cb, NULL);
- g_hash_table_steal_all(self->bdev_states);
+ //g_hash_table_steal_all(self->bdev_states);
+ g_hash_table_foreach_steal(self->bdev_states, rettrue, NULL);
#if 0
nb_tracefile = self->parent.tracefiles->len;
g_assert(tcs->irq_states[j].mode_stack != NULL);
}
+ /* init soft irq stuff */
+ /* the kernel has a statically fixed max of 32 softirqs */
+ tcs->soft_irq_states = g_new(LttvSoftIRQState, tcs->nb_soft_irqs);
+
+ /* init trap stuff */
+ tcs->trap_states = g_new(LttvTrapState, tcs->nb_traps);
+
/* init bdev resource stuff */
tcs->bdev_states = g_hash_table_new(g_int_hash, g_int_equal);
process = (LttvProcessState *)value;
fprintf(fp,
-" <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\">\n",
+" <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
process, process->pid, process->tgid, process->ppid,
g_quark_to_string(process->type),
process->creation_time.tv_sec,
process->insertion_time.tv_nsec,
g_quark_to_string(process->name),
g_quark_to_string(process->brand),
- process->cpu);
+ process->cpu, process->free_events);
for(i = 0 ; i < process->execution_stack->len; i++) {
es = &g_array_index(process->execution_stack, LttvExecutionState, i);
//fputc('\0', fp);
fwrite(&process->brand, sizeof(process->brand), 1, fp);
fwrite(&process->pid, sizeof(process->pid), 1, fp);
+ fwrite(&process->free_events, sizeof(process->free_events), 1, fp);
fwrite(&process->tgid, sizeof(process->tgid), 1, fp);
fwrite(&process->ppid, sizeof(process->ppid), 1, fp);
fwrite(&process->cpu, sizeof(process->cpu), 1, fp);
fread(&tmp.name, sizeof(tmp.name), 1, fp);
fread(&tmp.brand, sizeof(tmp.brand), 1, fp);
fread(&tmp.pid, sizeof(tmp.pid), 1, fp);
+ fread(&tmp.free_events, sizeof(tmp.free_events), 1, fp);
fread(&tmp.tgid, sizeof(tmp.tgid), 1, fp);
fread(&tmp.ppid, sizeof(tmp.ppid), 1, fp);
fread(&tmp.cpu, sizeof(tmp.cpu), 1, fp);
(gchar*)g_ptr_array_index(quarktable, tmp.brand));
process->name =
g_quark_from_string((gchar*)g_ptr_array_index(quarktable, tmp.name));
-
+ process->free_events = tmp.free_events;
do {
if(feof(fp) || ferror(fp)) goto end_loop;
guint i,j;
LttvCPUState *retval;
- retval = g_malloc(n*sizeof(LttvCPUState));
+ retval = g_new(LttvCPUState, n);
for(i=0; i<n; i++) {
retval[i].mode_stack = g_array_new(FALSE, FALSE, sizeof(LttvCPUMode));
guint i;
for(i=0; i<n; i++) {
- g_array_free(states[i].mode_stack, FALSE);
+ g_array_free(states[i].mode_stack, TRUE);
}
g_free(states);
guint i,j;
LttvIRQState *retval;
- retval = g_malloc(n*sizeof(LttvIRQState));
+ retval = g_new(LttvIRQState, n);
for(i=0; i<n; i++) {
retval[i].mode_stack = g_array_new(FALSE, FALSE, sizeof(LttvIRQMode));
guint i;
for(i=0; i<n; i++) {
- g_array_free(states[i].mode_stack, FALSE);
+ g_array_free(states[i].mode_stack, TRUE);
+ }
+
+ g_free(states);
+}
+
+static LttvSoftIRQState *lttv_state_copy_soft_irq_states(LttvSoftIRQState *states, guint n)
+{
+ guint i;
+ LttvSoftIRQState *retval;
+
+ retval = g_new(LttvSoftIRQState, n);
+
+ for(i=0; i<n; i++) {
+ retval[i].running = states[i].running;
+ }
+
+ return retval;
+}
+
+static void lttv_state_free_soft_irq_states(LttvSoftIRQState *states, guint n)
+{
+ g_free(states);
+}
+
+static LttvTrapState *lttv_state_copy_trap_states(LttvTrapState *states, guint n)
+{
+ guint i;
+ LttvTrapState *retval;
+
+ retval = g_new(LttvTrapState, n);
+
+ for(i=0; i<n; i++) {
+ retval[i].running = states[i].running;
}
+ return retval;
+}
+
+static void lttv_state_free_trap_states(LttvTrapState *states, guint n)
+{
g_free(states);
}
gint devcode_gint = devcode;
gpointer bdev = g_hash_table_lookup(ts->bdev_states, &devcode_gint);
if(bdev == NULL) {
- LttvBdevState *bdevstate = g_malloc(sizeof(LttvBdevState));
+ LttvBdevState *bdevstate = g_new(LttvBdevState, 1);
bdevstate->mode_stack = g_array_new(FALSE, FALSE, sizeof(GQuark));
- gint * key = g_malloc(sizeof(gint));
+ gint * key = g_new(gint, 1);
*key = devcode;
g_hash_table_insert(ts->bdev_states, key, bdevstate);
static LttvBdevState *bdevstate_new(void)
{
LttvBdevState *retval;
- retval = g_malloc(sizeof(LttvBdevState));
+ retval = g_new(LttvBdevState, 1);
retval->mode_stack = g_array_new(FALSE, FALSE, sizeof(GQuark));
return retval;
static void bdevstate_free(LttvBdevState *bds)
{
- g_array_free(bds->mode_stack, FALSE);
+ g_array_free(bds->mode_stack, TRUE);
g_free(bds);
}
static void state_save(LttvTraceState *self, LttvAttribute *container)
{
- guint i, nb_tracefile, nb_cpus, nb_irqs;
+ guint i, nb_tracefile, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
LttvTracefileState *tfcs;
/* save the cpu state */
{
+ value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_CPUS_COUNT,
+ LTTV_UINT);
+ *(value.v_uint) = nb_cpus;
+
value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_CPUS,
LTTV_POINTER);
*(value.v_pointer) = lttv_state_copy_cpu_states(self->cpu_states, nb_cpus);
*(value.v_pointer) = lttv_state_copy_irq_states(self->irq_states, nb_irqs);
}
+ /* save the soft irq state */
+ nb_soft_irqs = self->nb_soft_irqs;
+ {
+ value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_SOFT_IRQS,
+ LTTV_POINTER);
+ *(value.v_pointer) = lttv_state_copy_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
+ }
+
+ /* save the trap state */
+ nb_traps = self->nb_traps;
+ {
+ value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_TRAPS,
+ LTTV_POINTER);
+ *(value.v_pointer) = lttv_state_copy_trap_states(self->trap_states, nb_traps);
+ }
+
/* save the blkdev states */
value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_BLKDEVS,
LTTV_POINTER);
static void state_restore(LttvTraceState *self, LttvAttribute *container)
{
- guint i, nb_tracefile, pid, nb_cpus, nb_irqs;
+ guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
LttvTracefileState *tfcs;
lttv_state_free_irq_states(self->irq_states, nb_irqs);
self->irq_states = lttv_state_copy_irq_states(*(value.v_pointer), nb_irqs);
+ /* restore soft irq resource states */
+ nb_soft_irqs = self->nb_soft_irqs;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_SOFT_IRQS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
+ self->soft_irq_states = lttv_state_copy_soft_irq_states(*(value.v_pointer), nb_soft_irqs);
+
+ /* restore trap resource states */
+ nb_traps = self->nb_traps;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_TRAPS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_trap_states(self->trap_states, nb_traps);
+ self->trap_states = lttv_state_copy_trap_states(*(value.v_pointer), nb_traps);
+
/* restore the blkdev states */
type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
g_assert(type == LTTV_POINTER);
static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
{
- guint i, nb_tracefile, nb_cpus;
+ guint i, nb_tracefile, nb_cpus, nb_irqs;
LttvTracefileState *tfcs;
lttv_attribute_remove_by_name(container, LTTV_STATE_PROCESSES);
/* Free running processes array */
- nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
type = lttv_attribute_get_by_name(container, LTTV_STATE_RUNNING_PROCESS,
&value);
g_assert(type == LTTV_POINTER);
running_process = *(value.v_pointer);
g_free(running_process);
+ /* free cpu resource states */
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_CPUS_COUNT, &value);
+ g_assert(type == LTTV_UINT);
+ nb_cpus = *value.v_uint;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_CPUS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_cpu_states(*(value.v_pointer), nb_cpus);
+
+ /* free irq resource states */
+ nb_irqs = self->nb_irqs;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_IRQS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_irq_states(*(value.v_pointer), nb_irqs);
+
+ /* free softirq resource states */
+ nb_softirqs = self->nb_irqs;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_SOFT_IRQS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_soft_irq_states(*(value.v_pointer), nb_softirqs);
+
+ /* free the blkdev states */
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_blkdev_hashtable(*(value.v_pointer));
+
nb_tracefile = self->parent.tracefiles->len;
for(i = 0 ; i < nb_tracefile ; i++) {
{
int i;
- LttvTraceHook th;
-
GString *fe_name = g_string_new("");
LttvNameTables *name_tables = g_new(LttvNameTables, 1);
LttvAttributeValue v;
+ GArray *hooks;
+
lttv_attribute_find(tcs->parent.t_a, LTTV_STATE_NAME_TABLES,
LTTV_POINTER, &v);
g_assert(*(v.v_pointer) == NULL);
*(v.v_pointer) = name_tables;
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 1);
+
if(!lttv_trace_find_hook(tcs->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_SYSCALL_ENTRY,
FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
- NULL, NULL)) {
+ NULL, NULL, &hooks)) {
// th = lttv_trace_hook_get_first(&th);
//
-// t = ltt_field_type(th->f1);
+// t = ltt_field_type(lttv_trace_get_hook_field(th, 0));
// nb = ltt_type_element_number(t);
//
- lttv_trace_hook_destroy(&th);
-//
// name_tables->syscall_names = g_new(GQuark, nb);
// name_tables->nb_syscalls = nb;
//
// }
// }
+ name_tables->nb_syscalls = 256;
name_tables->syscall_names = g_new(GQuark, 256);
for(i = 0 ; i < 256 ; i++) {
g_string_printf(fe_name, "syscall %d", i);
name_tables->syscall_names = NULL;
name_tables->nb_syscalls = 0;
}
+ lttv_trace_hook_remove_all(&hooks);
if(!lttv_trace_find_hook(tcs->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_TRAP_ENTRY,
- LTT_FIELD_TRAP_ID, 0, 0,
- NULL, NULL, &th)) {
+ FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+ NULL, NULL, &hooks)) {
// th = lttv_trace_hook_get_first(&th);
//
-// t = ltt_field_type(th->f1);
+// t = ltt_field_type(lttv_trace_get_hook_field(th, 0));
// //nb = ltt_type_element_number(t);
//
- lttv_trace_hook_destroy(&th);
-
// name_tables->trap_names = g_new(GQuark, nb);
// for(i = 0 ; i < nb ; i++) {
// name_tables->trap_names[i] = g_quark_from_string(
name_tables->trap_names = NULL;
name_tables->nb_traps = 0;
}
+ lttv_trace_hook_remove_all(&hooks);
if(!lttv_trace_find_hook(tcs->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_IRQ_ENTRY,
- LTT_FIELD_IRQ_ID, 0, 0,
- NULL, NULL, &th)) {
+ FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+ NULL, NULL, &hooks)) {
- lttv_trace_hook_destroy(&th);
-
/*
name_tables->irq_names = g_new(GQuark, nb);
for(i = 0 ; i < nb ; i++) {
name_tables->nb_irqs = 0;
name_tables->irq_names = NULL;
}
+ lttv_trace_hook_remove_all(&hooks);
/*
name_tables->soft_irq_names = g_new(GQuark, nb);
for(i = 0 ; i < nb ; i++) {
}
*/
- name_tables->nb_softirqs = 256;
- name_tables->soft_irq_names = g_new(GQuark, 256);
- for(i = 0 ; i < 256 ; i++) {
+ /* the kernel is limited to 32 statically defined softirqs */
+ name_tables->nb_softirqs = 32;
+ name_tables->soft_irq_names = g_new(GQuark, name_tables->nb_softirqs);
+ for(i = 0 ; i < name_tables->nb_softirqs ; i++) {
g_string_printf(fe_name, "softirq %d", i);
name_tables->soft_irq_names[i] = g_quark_from_string(fe_name->str);
}
-
+ g_array_free(hooks, TRUE);
g_string_free(fe_name, TRUE);
}
tcs->irq_names = name_tables->irq_names;
tcs->soft_irq_names = name_tables->soft_irq_names;
tcs->nb_irqs = name_tables->nb_irqs;
- tcs->nb_softirqs = name_tables->nb_softirqs;
+ tcs->nb_soft_irqs = name_tables->nb_softirqs;
}
process->creation_time.tv_nsec);
process->pid_time = g_quark_from_string(buffer);
process->cpu = cpu;
+ process->free_events = 0;
//process->last_cpu = tfs->cpu_name;
//process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
process->execution_stack = g_array_sized_new(FALSE, FALSE,
* the parent waits for its child terminaison, but may also happen in special
* cases in the child's exit : when the parent ignores its children SIGCCHLD or
* has the flag SA_NOCLDWAIT. It can also happen when the child is part
- * of a killed thread ground, but isn't the leader.
+ * of a killed thread group, but isn't the leader.
*/
-static void exit_process(LttvTracefileState *tfs, LttvProcessState *process)
+static int exit_process(LttvTracefileState *tfs, LttvProcessState *process)
{
LttvTraceState *ts = LTTV_TRACE_STATE(tfs->parent.t_context);
LttvProcessState key;
+ /* Wait for both schedule with exit dead and process free to happen.
+ * They can happen in any order. */
+ if (++(process->free_events) < 2)
+ return 0;
+
key.pid = process->pid;
key.cpu = process->cpu;
g_hash_table_remove(ts->processes, &key);
g_array_free(process->execution_stack, TRUE);
g_array_free(process->user_stack, TRUE);
g_free(process);
+ return 1;
}
LttvProcessState *process = ts->running_process[cpu];
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- struct marker_field *f = th->f1;
-
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
LttvExecutionSubmode submode;
- guint nb_syscalls = ((LttvTraceState *)(s->parent.t_context))->nb_syscalls;
guint syscall = ltt_event_get_unsigned(e, f);
-
- if(syscall < nb_syscalls) {
- submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[
- syscall];
- } else {
- /* Fixup an incomplete syscall table */
- GString *string = g_string_new("");
- g_string_printf(string, "syscall %u", syscall);
- submode = g_quark_from_string(string->str);
- g_string_free(string, TRUE);
- }
+ expand_syscall_table(ts, syscall);
+ submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[syscall];
/* There can be no system call from PID 0 : unknown state */
if(process->pid != 0)
push_state(s, LTTV_STATE_SYSCALL, submode);
static gboolean trap_entry(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- struct marker_field *f = th->f1;
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
LttvExecutionSubmode submode;
- guint64 nb_traps = ((LttvTraceState *)(s->parent.t_context))->nb_traps;
guint64 trap = ltt_event_get_long_unsigned(e, f);
- if(trap < nb_traps) {
- submode = ((LttvTraceState *)(s->parent.t_context))->trap_names[trap];
- } else {
- /* Fixup an incomplete trap table */
- GString *string = g_string_new("");
- g_string_printf(string, "trap %llu", trap);
- submode = g_quark_from_string(string->str);
- g_string_free(string, TRUE);
- }
+ expand_trap_table(ts, trap);
+
+ submode = ((LttvTraceState *)(s->parent.t_context))->trap_names[trap];
push_state(s, LTTV_STATE_TRAP, submode);
/* update cpu status */
cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
+ /* update trap status */
+ s->cpu_state->last_trap = trap;
+ ts->trap_states[trap].running++;
+
return FALSE;
}
static gboolean trap_exit(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+ guint trap = s->cpu_state->last_trap;
pop_state(s, LTTV_STATE_TRAP);
/* update cpu status */
cpu_pop_mode(s->cpu_state);
+ /* update trap status */
+ if(ts->trap_states[trap].running)
+ ts->trap_states[trap].running--;
+
return FALSE;
}
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- g_assert(th->f1 != NULL);
- struct marker_field *f = th->f1;
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
LttvExecutionSubmode submode;
guint64 irq = ltt_event_get_long_unsigned(e, f);
- guint64 nb_irqs = ((LttvTraceState *)(s->parent.t_context))->nb_irqs;
- if(irq < nb_irqs) {
- submode = ((LttvTraceState *)(s->parent.t_context))->irq_names[irq];
- } else {
- /* Fixup an incomplete irq table */
- GString *string = g_string_new("");
- g_string_printf(string, "irq %llu", irq);
- submode = g_quark_from_string(string->str);
- g_string_free(string, TRUE);
- }
+ expand_irq_table(ts, irq);
+
+ submode = ((LttvTraceState *)(s->parent.t_context))->irq_names[irq];
/* Do something with the info about being in user or system mode when int? */
push_state(s, LTTV_STATE_IRQ, submode);
static gboolean soft_irq_exit(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+ guint softirq = s->cpu_state->last_soft_irq;
pop_state(s, LTTV_STATE_SOFT_IRQ);
- return FALSE;
-}
+ /* update softirq status */
+ if(ts->soft_irq_states[softirq].running)
+ ts->soft_irq_states[softirq].running--;
+
+ /* update cpu status */
+ cpu_pop_mode(s->cpu_state);
+ return FALSE;
+}
static gboolean irq_exit(void *hook_data, void *call_data)
{
static gboolean soft_irq_entry(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- g_assert(th->f1 != NULL);
- struct marker_field *f = th->f1;
-
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
LttvExecutionSubmode submode;
guint64 softirq = ltt_event_get_long_unsigned(e, f);
- guint64 nb_softirqs = ((LttvTraceState *)(s->parent.t_context))->nb_softirqs;
-
- if(softirq < nb_softirqs) {
- submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[softirq];
- } else {
- /* Fixup an incomplete irq table */
- GString *string = g_string_new("");
- g_string_printf(string, "softirq %llu", softirq);
- submode = g_quark_from_string(string->str);
- g_string_free(string, TRUE);
- }
+ expand_soft_irq_table(ts, softirq);
+ submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[softirq];
/* Do something with the info about being in user or system mode when int? */
push_state(s, LTTV_STATE_SOFT_IRQ, submode);
+
+ /* update cpu status */
+ cpu_push_mode(s->cpu_state, LTTV_CPU_SOFT_IRQ);
+
+ /* update softirq status */
+ s->cpu_state->last_soft_irq = softirq;
+ ts->soft_irq_states[softirq].running++;
+
return FALSE;
}
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- GQuark action = g_quark_from_string(ltt_event_get_string(e, th->f1));
- guint irq = ltt_event_get_long_unsigned(e, th->f2);
+ GQuark action = g_quark_from_string(ltt_event_get_string(e,
+ lttv_trace_get_hook_field(th, 0)));
+ guint irq = ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 1));
+ expand_irq_table(ts, irq);
ts->irq_names[irq] = action;
return FALSE;
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- guint major = ltt_event_get_long_unsigned(e, th->f1);
- guint minor = ltt_event_get_long_unsigned(e, th->f2);
- guint oper = ltt_event_get_long_unsigned(e, th->f3);
+ guint major = ltt_event_get_long_unsigned(e,
+ lttv_trace_get_hook_field(th, 0));
+ guint minor = ltt_event_get_long_unsigned(e,
+ lttv_trace_get_hook_field(th, 1));
+ guint oper = ltt_event_get_long_unsigned(e,
+ lttv_trace_get_hook_field(th, 2));
guint16 devcode = MKDEV(major,minor);
/* have we seen this block device before? */
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- guint major = ltt_event_get_long_unsigned(e, th->f1);
- guint minor = ltt_event_get_long_unsigned(e, th->f2);
- //guint oper = ltt_event_get_long_unsigned(e, th->f3);
+ guint major = ltt_event_get_long_unsigned(e,
+ lttv_trace_get_hook_field(th, 0));
+ guint minor = ltt_event_get_long_unsigned(e,
+ lttv_trace_get_hook_field(th, 1));
+ //guint oper = ltt_event_get_long_unsigned(e,
+ // lttv_trace_get_hook_field(th, 2));
guint16 devcode = MKDEV(major,minor);
/* have we seen this block device before? */
guint depth = process->user_stack->len;
- process->user_stack =
+ process->user_stack =
g_array_set_size(process->user_stack, depth + 1);
new_func = &g_array_index(process->user_stack, guint64, depth);
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- g_assert(th->f1 != NULL);
- struct marker_field *f = th->f1;
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
guint64 funcptr = ltt_event_get_long_unsigned(e, f);
push_function(s, funcptr);
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
//guint8 ev_id = ltt_event_eventtype_id(e);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
- g_assert(th->f1 != NULL);
- struct marker_field *f = th->f1;
+ struct marker_field *f = lttv_trace_get_hook_field(th, 0);
guint64 funcptr = ltt_event_get_long_unsigned(e, f);
pop_function(s, funcptr);
return FALSE;
}
+static gboolean dump_syscall(void *hook_data, void *call_data)
+{
+ LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
+ LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
+ LttvTraceHook *th = (LttvTraceHook *)hook_data;
+ guint id;
+ guint64 address;
+ char *symbol;
+
+ id = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
+ address = ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 1));
+ symbol = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 2));
+
+ expand_syscall_table(ts, id);
+ ts->syscall_names[id] = g_quark_from_string(symbol);
+
+ return FALSE;
+}
+
+static gboolean dump_softirq(void *hook_data, void *call_data)
+{
+ LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
+ LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
+ LttvTraceHook *th = (LttvTraceHook *)hook_data;
+ guint id;
+ guint64 address;
+ char *symbol;
+
+ id = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
+ address = ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 1));
+ symbol = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 2));
+
+ expand_soft_irq_table(ts, id);
+ ts->soft_irq_names[id] = g_quark_from_string(symbol);
+
+ return FALSE;
+}
+
static gboolean schedchange(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
guint pid_in, pid_out;
gint64 state_out;
- pid_out = ltt_event_get_unsigned(e, th->f1);
- pid_in = ltt_event_get_unsigned(e, th->f2);
- state_out = ltt_event_get_long_int(e, th->f3);
+ pid_out = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
+ pid_in = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
+ state_out = ltt_event_get_long_int(e, lttv_trace_get_hook_field(th, 2));
if(likely(process != NULL)) {
process->state->change = s->parent.timestamp;
}
- if(state_out == 32 || state_out == 128)
- exit_process(s, process); /* EXIT_DEAD || TASK_DEAD */
- /* see sched.h for states */
+ if(state_out == 32 || state_out == 64) { /* EXIT_DEAD || TASK_DEAD */
+ /* see sched.h for states */
+ if (!exit_process(s, process)) {
+ process->state->s = LTTV_STATE_DEAD;
+ process->state->change = s->parent.timestamp;
+ }
+ }
}
}
process = ts->running_process[cpu] =
/* update cpu status */
if(pid_in == 0)
+ /* going to idle task */
cpu_set_base_mode(s->cpu_state, LTTV_CPU_IDLE);
- else
+ else {
+ /* scheduling a real task.
+ * we must be careful here:
+ * if we just schedule()'ed to a process that is
+ * in a trap, we must put the cpu in trap mode
+ */
cpu_set_base_mode(s->cpu_state, LTTV_CPU_BUSY);
+ if(process->state->t == LTTV_STATE_TRAP)
+ cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
+ }
return FALSE;
}
LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
LttvProcessState *process = ts->running_process[cpu];
LttvProcessState *child_process;
+ struct marker_field *f;
/* Parent PID */
- parent_pid = ltt_event_get_unsigned(e, th->f1);
+ parent_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
/* Child PID */
- child_pid = ltt_event_get_unsigned(e, th->f2);
+ child_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
s->parent.target_pid = child_pid;
/* Child TGID */
- if(th->f3) child_tgid = ltt_event_get_unsigned(e, th->f3);
- else child_tgid = 0;
+ f = lttv_trace_get_hook_field(th, 2);
+ if (likely(f))
+ child_tgid = ltt_event_get_unsigned(e, f);
+ else
+ child_tgid = 0;
/* Mathieu : it seems like the process might have been scheduled in before the
* fork, and, in a rare case, might be the current process. This might happen
*
* Simply put a correct parent.
*/
- g_assert(0); /* This is a problematic case : the process has been created
- before the fork event */
+ g_error("Process %u has been created before fork on cpu %u. Probably an unsynchronized TSC problem on the traced machine.", child_pid, cpu);
+ //g_assert(0); /* This is a problematic case : the process has been created
+ // before the fork event */
child_process->ppid = process->pid;
child_process->tgid = child_tgid;
}
LttvExecutionState *es;
/* PID */
- pid = (guint)ltt_event_get_long_unsigned(e, th->f1);
+ pid = (guint)ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 0));
s->parent.target_pid = pid;
process = lttv_state_find_process_or_create(ts, ANY_CPU, pid,
<t_time_zero);
- process->execution_stack =
- g_array_set_size(process->execution_stack, 1);
- es = process->state =
- &g_array_index(process->execution_stack, LttvExecutionState, 0);
- es->t = LTTV_STATE_SYSCALL;
+ if (process->state->s != LTTV_STATE_DEAD) {
+ process->execution_stack =
+ g_array_set_size(process->execution_stack, 1);
+ es = process->state =
+ &g_array_index(process->execution_stack, LttvExecutionState, 0);
+ es->t = LTTV_STATE_SYSCALL;
+ }
process->type = LTTV_STATE_KERNEL_THREAD;
return FALSE;
LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
LttvProcessState *process; // = ts->running_process[cpu];
- pid = ltt_event_get_unsigned(e, th->f1);
+ pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
s->parent.target_pid = pid;
// FIXME : Add this test in the "known state" section
LttvProcessState *process;
/* PID of the process to release */
- release_pid = ltt_event_get_unsigned(e, th->f1);
+ release_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
s->parent.target_pid = release_pid;
g_assert(release_pid != 0);
process = lttv_state_find_process(ts, ANY_CPU, release_pid);
-
+ if(likely(process != NULL))
+ exit_process(s, process);
+ return FALSE;
+//DISABLED
if(likely(process != NULL)) {
/* release_task is happening at kernel level : we can now safely release
* the data structure of the process */
#if 0//how to use a sequence that must be transformed in a string
/* PID of the process to release */
- guint64 name_len = ltt_event_field_element_number(e, thf->f1);
- //name = ltt_event_get_string(e, thf->f1);
- LttField *child = ltt_event_field_element_select(e, thf->f1, 0);
+ guint64 name_len = ltt_event_field_element_number(e,
+ lttv_trace_get_hook_field(th, 0));
+ //name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
+ LttField *child = ltt_event_field_element_select(e,
+ lttv_trace_get_hook_field(th, 0), 0);
gchar *name_begin =
(gchar*)(ltt_event_data(e)+ltt_event_field_offset(e, child));
gchar *null_term_name = g_new(gchar, name_len+1);
process->name = g_quark_from_string(null_term_name);
#endif //0
- process->name = g_quark_from_string(ltt_event_get_string(e, th->f1));
+ process->name = g_quark_from_string(ltt_event_get_string(e,
+ lttv_trace_get_hook_field(th, 0)));
process->brand = LTTV_STATE_UNBRANDED;
//g_free(null_term_name);
return FALSE;
guint cpu = s->cpu;
LttvProcessState *process = ts->running_process[cpu];
- name = ltt_event_get_string(e, th->f1);
+ name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
process->brand = g_quark_from_string(name);
return FALSE;
LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
LttvProcessState *process = ts->running_process[cpu];
LttvProcessState *parent_process;
- struct marker_field *f4, *f5, *f6, *f7, *f8;
+ struct marker_field *f;
GQuark type, mode, submode, status;
LttvExecutionState *es;
guint i, nb_cpus;
- struct marker_info *mi;
/* PID */
- pid = ltt_event_get_unsigned(e, th->f1);
+ pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
s->parent.target_pid = pid;
/* Parent PID */
- parent_pid = ltt_event_get_unsigned(e, th->f2);
+ parent_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
/* Command name */
- command = ltt_event_get_string(e, th->f3);
+ command = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 2));
/* type */
- mi = marker_get_info_from_id(ts->parent.t, e->event_id);
- f4 = marker_get_field(mi, 3);
- g_assert(f4->name == LTT_FIELD_TYPE);
- type = ltt_enum_string_get(ltt_field_type(f4),
- ltt_event_get_unsigned(e, f4));
+ f = lttv_trace_get_hook_field(th, 3);
+ type = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
+
+ //FIXME: type is rarely used, enum must match possible types.
/* mode */
- f5 = marker_get_field(mi, 4);
- g_assert(f5->name == LTT_FIELD_MODE);
- mode = ltt_enum_string_get(ltt_field_type(f5),
- ltt_event_get_unsigned(e, f5));
+ f = lttv_trace_get_hook_field(th, 4);
+ mode = ltt_enum_string_get(f,ltt_event_get_unsigned(e, f));
/* submode */
- f6 = marker_get_field(mi, 5);
- g_assert(f6->name == LTT_FIELD_SUBMODE);
- submode = ltt_enum_string_get(ltt_field_type(f6),
- ltt_event_get_unsigned(e, f6));
+ f = lttv_trace_get_hook_field(th, 5);
+ submode = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
/* status */
- f7 = marker_get_field(mi, 6);
- g_assert(f7->name == LTT_FIELD_STATUS);
- status = ltt_enum_string_get(ltt_field_type(f7),
- ltt_event_get_unsigned(e, f7));
+ f = lttv_trace_get_hook_field(th, 6);
+ status = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
/* TGID */
- f8 = marker_get_field(mi, 7);
- g_assert(f8->name == LTT_FIELD_TGID);
- if(f8) tgid = ltt_event_get_unsigned(e, f8);
- else tgid = 0;
-
+ f = lttv_trace_get_hook_field(th, 7);
+ if(f)
+ tgid = ltt_event_get_unsigned(e, f);
+ else
+ tgid = 0;
if(pid == 0) {
nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
LttvAttributeValue val;
- gint ret;
- gint hn;
-
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
ts = (LttvTraceState *)self->parent.traces[i];
associated by id hooks. */
hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 19);
- hooks = g_array_set_size(hooks, 19); // Max possible number of hooks.
- hn = 0;
+ //hooks = g_array_set_size(hooks, 19); // Max possible number of hooks.
+ //hn = 0;
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_SYSCALL_ENTRY,
- LTT_FIELD_SYSCALL_ID, 0, 0,
- syscall_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
+ syscall_entry, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_SYSCALL_EXIT,
- 0, 0, 0,
- syscall_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ NULL,
+ syscall_exit, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_TRAP_ENTRY,
- LTT_FIELD_TRAP_ID, 0, 0,
- trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+ trap_entry, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_TRAP_EXIT,
- 0, 0, 0,
- trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ NULL,
+ trap_exit, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_IRQ_ENTRY,
- LTT_FIELD_IRQ_ID, 0, 0,
- irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+ irq_entry, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_IRQ_EXIT,
- 0, 0, 0,
- irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ NULL,
+ irq_exit, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_SOFT_IRQ_ENTRY,
- LTT_FIELD_SOFT_IRQ_ID, 0, 0,
- soft_irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+ soft_irq_entry, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_SOFT_IRQ_EXIT,
- 0, 0, 0,
- soft_irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ NULL,
+ soft_irq_exit, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_SCHED_SCHEDULE,
- LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
- schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID,
+ LTT_FIELD_PREV_STATE),
+ schedchange, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_PROCESS_FORK,
- LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_CHILD_TGID,
- process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID,
+ LTT_FIELD_CHILD_TGID),
+ process_fork, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL_ARCH,
LTT_EVENT_KTHREAD_CREATE,
- LTT_FIELD_PID, 0, 0,
- process_kernel_thread, NULL, &g_array_index(hooks, LttvTraceHook,
- hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PID),
+ process_kernel_thread, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_PROCESS_EXIT,
- LTT_FIELD_PID, 0, 0,
- process_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PID),
+ process_exit, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL,
LTT_EVENT_PROCESS_FREE,
- LTT_FIELD_PID, 0, 0,
- process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PID),
+ process_free, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_FS,
LTT_EVENT_EXEC,
- LTT_FIELD_FILENAME, 0, 0,
- process_exec, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_FILENAME),
+ process_exec, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_USER_GENERIC,
LTT_EVENT_THREAD_BRAND,
- LTT_FIELD_NAME, 0, 0,
- thread_brand, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_NAME),
+ thread_brand, NULL, &hooks);
/* statedump-related hooks */
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_LIST,
LTT_EVENT_PROCESS_STATE,
- LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
- enum_process_state, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+ LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE,
+ LTT_FIELD_STATUS, LTT_FIELD_TGID),
+ enum_process_state, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_LIST,
LTT_EVENT_STATEDUMP_END,
- 0, 0, 0,
- statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ NULL,
+ statedump_end, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_LIST,
LTT_EVENT_LIST_INTERRUPT,
- LTT_FIELD_ACTION, LTT_FIELD_NUM, 0,
- enum_interrupt, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_ACTION, LTT_FIELD_IRQ_ID),
+ enum_interrupt, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_BLOCK,
LTT_EVENT_REQUEST_ISSUE,
- LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
- bdev_request_issue, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
+ bdev_request_issue, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_BLOCK,
LTT_EVENT_REQUEST_COMPLETE,
- LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
- bdev_request_complete, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
+ bdev_request_complete, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_USER_GENERIC,
LTT_EVENT_FUNCTION_ENTRY,
- LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
- function_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+ function_entry, NULL, &hooks);
- ret = lttv_trace_find_hook(ts->parent.t,
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_USER_GENERIC,
LTT_EVENT_FUNCTION_EXIT,
- LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
- function_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
- if(ret) hn--;
+ FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+ function_exit, NULL, &hooks);
+
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_STATEDUMP,
+ LTT_EVENT_SYS_CALL_TABLE,
+ FIELD_ARRAY(LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL),
+ dump_syscall, NULL, &hooks);
+
+ lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_STATEDUMP,
+ LTT_EVENT_SOFTIRQ_VEC,
+ FIELD_ARRAY(LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL),
+ dump_softirq, NULL, &hooks);
- hooks = g_array_set_size(hooks, hn);
-
/* Add these hooks to each event_by_id hooks list */
nb_tracefile = ts->parent.tracefiles->len;
th);
}
}
- for(k = 0 ; k < hooks->len ; k++)
- lttv_trace_hook_destroy(&g_array_index(hooks, LttvTraceHook, k));
+ lttv_trace_hook_remove_all(&hooks);
g_array_free(hooks, TRUE);
}
}
static void module_init()
{
- LTTV_STATE_UNNAMED = g_quark_from_string("UNNAMED");
- LTTV_STATE_UNBRANDED = g_quark_from_string("UNBRANDED");
+ LTTV_STATE_UNNAMED = g_quark_from_string("");
+ LTTV_STATE_UNBRANDED = g_quark_from_string("");
LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("MODE_UNKNOWN");
LTTV_STATE_USER_MODE = g_quark_from_string("USER_MODE");
LTTV_STATE_SYSCALL = g_quark_from_string("SYSCALL");
LTTV_STATE_TRACE_STATE_USE_COUNT =
g_quark_from_string("trace_state_use_count");
LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu resource states");
+ LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu count");
LTTV_STATE_RESOURCE_IRQS = g_quark_from_string("irq resource states");
+ LTTV_STATE_RESOURCE_SOFT_IRQS = g_quark_from_string("soft irq resource states");
+ LTTV_STATE_RESOURCE_TRAPS = g_quark_from_string("trap resource states");
LTTV_STATE_RESOURCE_BLKDEVS = g_quark_from_string("blkdevs resource states");
LTT_FACILITY_LIST = g_quark_from_string("list");
LTT_FACILITY_USER_GENERIC = g_quark_from_string("user_generic");
LTT_FACILITY_BLOCK = g_quark_from_string("block");
-
-
+ LTT_FACILITY_STATEDUMP = g_quark_from_string("statedump");
+
LTT_EVENT_SYSCALL_ENTRY = g_quark_from_string("syscall_entry");
LTT_EVENT_SYSCALL_EXIT = g_quark_from_string("syscall_exit");
LTT_EVENT_TRAP_ENTRY = g_quark_from_string("trap_entry");
LTT_EVENT_TRAP_EXIT = g_quark_from_string("trap_exit");
LTT_EVENT_IRQ_ENTRY = g_quark_from_string("irq_entry");
LTT_EVENT_IRQ_EXIT = g_quark_from_string("irq_exit");
- LTT_EVENT_SOFT_IRQ_ENTRY = g_quark_from_string("soft_irq_entry");
- LTT_EVENT_SOFT_IRQ_EXIT = g_quark_from_string("soft_irq_exit");
+ LTT_EVENT_SOFT_IRQ_ENTRY = g_quark_from_string("softirq_entry");
+ LTT_EVENT_SOFT_IRQ_EXIT = g_quark_from_string("softirq_exit");
LTT_EVENT_SCHED_SCHEDULE = g_quark_from_string("sched_schedule");
LTT_EVENT_PROCESS_FORK = g_quark_from_string("process_fork");
LTT_EVENT_KTHREAD_CREATE = g_quark_from_string("kthread_create");
LTT_EVENT_THREAD_BRAND = g_quark_from_string("thread_brand");
LTT_EVENT_REQUEST_ISSUE = g_quark_from_string("_blk_request_issue");
LTT_EVENT_REQUEST_COMPLETE = g_quark_from_string("_blk_request_complete");
- LTT_EVENT_LIST_INTERRUPT = g_quark_from_string("interrupt");;
-
+ LTT_EVENT_LIST_INTERRUPT = g_quark_from_string("interrupt");
+ LTT_EVENT_SYS_CALL_TABLE = g_quark_from_string("sys_call_table");
+ LTT_EVENT_SOFTIRQ_VEC = g_quark_from_string("softirq_vec");
LTT_FIELD_SYSCALL_ID = g_quark_from_string("syscall_id");
LTT_FIELD_TRAP_ID = g_quark_from_string("trap_id");
LTT_FIELD_MINOR = g_quark_from_string("minor");
LTT_FIELD_OPERATION = g_quark_from_string("direction");
LTT_FIELD_ACTION = g_quark_from_string("action");
- LTT_FIELD_NUM = g_quark_from_string("num");
+ LTT_FIELD_ID = g_quark_from_string("id");
+ LTT_FIELD_ADDRESS = g_quark_from_string("address");
+ LTT_FIELD_SYMBOL = g_quark_from_string("symbol");
LTTV_CPU_UNKNOWN = g_quark_from_string("unknown");
LTTV_CPU_IDLE = g_quark_from_string("idle");
LTTV_CPU_BUSY = g_quark_from_string("busy");
LTTV_CPU_IRQ = g_quark_from_string("irq");
+ LTTV_CPU_SOFT_IRQ = g_quark_from_string("softirq");
LTTV_CPU_TRAP = g_quark_from_string("trap");
LTTV_IRQ_UNKNOWN = g_quark_from_string("unknown");
projects / lttv.git / blobdiff