From 86c32a8f662ef6a6c88a72d54c06d2a1095970bf Mon Sep 17 00:00:00 2001 From: compudj Date: Mon, 2 Apr 2007 20:41:48 +0000 Subject: [PATCH] change fac/ev names git-svn-id: http://ltt.polymtl.ca/svn@2464 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/lttv/lttv/state.c | 50 +++++++++---------- ltt/branches/poly/lttv/lttv/state.h | 15 +++--- ltt/branches/poly/lttv/lttv/stats.c | 24 ++++----- .../lttv/modules/gui/controlflow/drawing.c | 16 +++--- 4 files changed, 51 insertions(+), 54 deletions(-) diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index cf7b0b00..a9cc924f 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -47,9 +47,8 @@ GQuark LTT_FACILITY_KERNEL, LTT_FACILITY_KERNEL_ARCH, - LTT_FACILITY_PROCESS, + LTT_FACILITY_LIST, LTT_FACILITY_FS, - LTT_FACILITY_STATEDUMP, LTT_FACILITY_USER_GENERIC; /* Events Quarks */ @@ -63,13 +62,13 @@ 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_PROCESS_STATE, LTT_EVENT_STATEDUMP_END, LTT_EVENT_FUNCTION_ENTRY, LTT_EVENT_FUNCTION_EXIT, @@ -1436,7 +1435,7 @@ create_name_tables(LttvTraceState *tcs) name_tables->nb_syscalls = 0; } - if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL, + if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, NULL, NULL, &h)) { @@ -2686,13 +2685,13 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + 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--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT, 0, 0, 0, trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; @@ -2722,32 +2721,32 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FORK, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK, LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_TGID, process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_KERNEL_THREAD, + 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--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT, LTT_FIELD_PID, 0, 0, process_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FREE, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE, LTT_FIELD_PID, 0, 0, process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; @@ -2766,13 +2765,13 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + 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--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END, + LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END, 0, 0, 0, statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; @@ -3462,9 +3461,8 @@ static void module_init() LTT_FACILITY_KERNEL = g_quark_from_string("kernel"); LTT_FACILITY_KERNEL_ARCH = g_quark_from_string("kernel_arch"); - LTT_FACILITY_PROCESS = g_quark_from_string("process"); LTT_FACILITY_FS = g_quark_from_string("fs"); - LTT_FACILITY_STATEDUMP = g_quark_from_string("statedump"); + LTT_FACILITY_LIST = g_quark_from_string("list"); LTT_FACILITY_USER_GENERIC = g_quark_from_string("user_generic"); @@ -3476,13 +3474,13 @@ static void module_init() 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_SCHEDCHANGE = g_quark_from_string("schedchange"); - LTT_EVENT_FORK = g_quark_from_string("fork"); - LTT_EVENT_KERNEL_THREAD = g_quark_from_string("kernel_thread"); - LTT_EVENT_EXIT = g_quark_from_string("exit"); - LTT_EVENT_FREE = g_quark_from_string("free"); + 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_PROCESS_EXIT = g_quark_from_string("process_exit"); + LTT_EVENT_PROCESS_FREE = g_quark_from_string("procesS_free"); LTT_EVENT_EXEC = g_quark_from_string("exec"); - LTT_EVENT_ENUM_PROCESS_STATE = g_quark_from_string("enumerate_process_state"); + LTT_EVENT_PROCESS_STATE = g_quark_from_string("process_state"); LTT_EVENT_STATEDUMP_END = g_quark_from_string("statedump_end"); LTT_EVENT_FUNCTION_ENTRY = g_quark_from_string("function_entry"); LTT_EVENT_FUNCTION_EXIT = g_quark_from_string("function_exit"); diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h index b8f37e7d..7884ff2f 100644 --- a/ltt/branches/poly/lttv/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -58,9 +58,8 @@ 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; /* Events Quarks */ @@ -74,13 +73,13 @@ 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_PROCESS_STATE, LTT_EVENT_STATEDUMP_END, LTT_EVENT_FUNCTION_ENTRY, LTT_EVENT_FUNCTION_EXIT, diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index f3743dc9..179fde3f 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -1102,14 +1102,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, before_trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT, 0, 0, 0, before_trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1144,7 +1144,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, before_schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1166,7 +1166,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE, LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, before_enum_process_state, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1195,14 +1195,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, after_trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT, 0, 0, 0, after_trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1237,28 +1237,28 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, after_schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FORK, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK, LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT, LTT_FIELD_PID, 0, 0, process_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FREE, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE, LTT_FIELD_PID, 0, 0, process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1280,14 +1280,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE, LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, after_enum_process_state, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END, + LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END, 0, 0, 0, after_statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 8db42ca8..37d083b5 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -291,7 +291,7 @@ void drawing_data_request(Drawing_t *drawing, ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, before_schedchange_hook, events_request, @@ -299,7 +299,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) before_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT, LTT_FIELD_PID, 0, 0, before_process_exit_hook, events_request, @@ -307,7 +307,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) before_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FREE, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE, LTT_FIELD_PID, 0, 0, before_process_release_hook, events_request, @@ -315,7 +315,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) before_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END, + LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END, 0, 0, 0, before_statedump_end, events_request, @@ -374,7 +374,7 @@ void drawing_data_request(Drawing_t *drawing, after_hn = before_hn; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, after_schedchange_hook, events_request, @@ -382,7 +382,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) after_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_FORK, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK, LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, after_process_fork_hook, events_request, @@ -390,7 +390,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) after_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT, LTT_FIELD_PID, 0, 0, after_process_exit_hook, events_request, @@ -414,7 +414,7 @@ void drawing_data_request(Drawing_t *drawing, if(ret) after_hn--; ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE, LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, after_event_enum_process_hook, events_request, -- 2.34.1