From 3c9fcfb389b04c83ecff34514f5d6eb04cb3eca3 Mon Sep 17 00:00:00 2001 From: compudj Date: Mon, 27 Oct 2008 18:41:19 +0000 Subject: [PATCH] update traps, now in kernel facility, not kernel_arch git-svn-id: http://ltt.polymtl.ca/svn@3131 04897980-b3bd-0310-b5e0-8ef037075253 --- trunk/lttv/lttv/lttv/state.c | 6 +++--- trunk/lttv/lttv/modules/gui/controlflow/drawing.c | 4 ++-- trunk/lttv/lttv/modules/gui/resourceview/drawing.c | 4 ++-- trunk/lttv/lttv/modules/gui/resourceview/eventhooks.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/trunk/lttv/lttv/lttv/state.c b/trunk/lttv/lttv/lttv/state.c index 2105cb76..b9bd1416 100644 --- a/trunk/lttv/lttv/lttv/state.c +++ b/trunk/lttv/lttv/lttv/state.c @@ -1912,7 +1912,7 @@ create_name_tables(LttvTraceState *tcs) lttv_trace_hook_remove_all(&hooks); if(!lttv_trace_find_hook(tcs->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, FIELD_ARRAY(LTT_FIELD_TRAP_ID), NULL, NULL, &hooks)) { @@ -3391,13 +3391,13 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) syscall_exit, NULL, &hooks); lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, FIELD_ARRAY(LTT_FIELD_TRAP_ID), trap_entry, NULL, &hooks); lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, NULL, trap_exit, NULL, &hooks); diff --git a/trunk/lttv/lttv/modules/gui/controlflow/drawing.c b/trunk/lttv/lttv/modules/gui/controlflow/drawing.c index 9acbb545..afd530d2 100644 --- a/trunk/lttv/lttv/modules/gui/controlflow/drawing.c +++ b/trunk/lttv/lttv/modules/gui/controlflow/drawing.c @@ -239,7 +239,7 @@ void drawing_data_request(Drawing_t *drawing, &hooks); lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, FIELD_ARRAY(LTT_FIELD_TRAP_ID), before_execmode_hook, @@ -247,7 +247,7 @@ void drawing_data_request(Drawing_t *drawing, &hooks); lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, NULL, before_execmode_hook, diff --git a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c index 9908029f..3af879f7 100644 --- a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c +++ b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c @@ -263,7 +263,7 @@ void drawing_data_request(Drawing_t *drawing, // &hooks); // lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, FIELD_ARRAY(LTT_FIELD_TRAP_ID), before_execmode_hook, @@ -271,7 +271,7 @@ void drawing_data_request(Drawing_t *drawing, &hooks); lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL_ARCH, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, NULL, before_execmode_hook, diff --git a/trunk/lttv/lttv/modules/gui/resourceview/eventhooks.c b/trunk/lttv/lttv/modules/gui/resourceview/eventhooks.c index 6c74bdbb..b6d3c549 100644 --- a/trunk/lttv/lttv/modules/gui/resourceview/eventhooks.c +++ b/trunk/lttv/lttv/modules/gui/resourceview/eventhooks.c @@ -1170,8 +1170,8 @@ int before_execmode_hook_trap(void *hook_data, void *call_data) guint64 trap; guint cpu = tfs->cpu; - guint16 ev_id_entry = marker_get_id_from_info(trace, marker_get_info_from_name(trace, lttv_merge_facility_event_name(LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY))); - guint16 ev_id_exit = marker_get_id_from_info(trace, marker_get_info_from_name(trace, lttv_merge_facility_event_name(LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT))); + guint16 ev_id_entry = marker_get_id_from_info(trace, marker_get_info_from_name(trace, lttv_merge_facility_event_name(LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY))); + guint16 ev_id_exit = marker_get_id_from_info(trace, marker_get_info_from_name(trace, lttv_merge_facility_event_name(LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT))); if(ev_id_entry == e->event_id) { trap = ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 0)); } -- 2.34.1