Fix eventview trap handling

[lttv.git] / trunk / lttv / lttv / modules / gui / resourceview / drawing.c

diff --git a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
index 2959cac79fc7a580d4c2f288f7fd29b5dc2ad602..033475adaffdcf0f7e2a15674dab76e561e1d4e4 100644 (file)
--- a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
+++ b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
@@ -279,6 +279,38 @@ void drawing_data_request(Drawing_t *drawing,
           events_request,
           &hooks);
 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_CHANNEL_KERNEL,
+          LTT_EVENT_PAGE_FAULT_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_CHANNEL_KERNEL,
+          LTT_EVENT_PAGE_FAULT_EXIT,
+          NULL,
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_CHANNEL_KERNEL,
+          LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_CHANNEL_KERNEL,
+          LTT_EVENT_PAGE_FAULT_NOSEM_EXIT,
+          NULL,
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
       lttv_trace_find_hook(ts->parent.t,
           LTT_CHANNEL_KERNEL,
           LTT_EVENT_IRQ_ENTRY,
@@ -482,7 +514,7 @@ static void set_last_start(gpointer key, gpointer value, gpointer user_data)
 {
   //ResourceInfo *process_info = (ResourceInfo*)key;
   HashedResourceData *hashed_process_data = (HashedResourceData*)value;
-  guint x = (guint)(gulong)user_data;
+  guint x = GPOINTER_TO_UINT(user_data);
 
   hashed_process_data->x.over = x;
   hashed_process_data->x.over_used = FALSE;
@@ -521,7 +553,7 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
 
   for(i=0; i<RV_RESOURCE_COUNT; i++) {
     g_hash_table_foreach(cfd->process_list->restypes[i].hash_table, set_last_start,
-                         (gpointer)(gulong)x);
+                         GUINT_TO_POINTER(x));
   }
 
 }