update traps, now in kernel facility, not kernel_arch

git-svn-id: http://ltt.polymtl.ca/svn@3131 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/trunk/lttv/lttv/lttv/state.c b/trunk/lttv/lttv/lttv/state.c
index 2105cb769032c5161c513fca1f0dc635611f0f24..b9bd1416648d6fc3046c8179fa139aa34f939cf1 100644 (file)
--- 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 9acbb54599fea1fd20cfc29cf2452549482f1242..afd530d2cb1236be806c13adb29fc00aaad95570 100644 (file)
--- 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 9908029f95eda2adbbd6e22c7283ad37041c7745..3af879f76ca64af26c415cde405c7047931e32e1 100644 (file)
--- 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 6c74bdbbb3c82e84b3b61a1c2256635153cfd4b5..b6d3c5493fc11303a322713e55183f93a0c43ebe 100644 (file)
--- 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));
   }