resourceview: add trap resource
[lttv.git] / ltt / branches / poly / lttv / modules / gui / resourceview / drawing.c
index 83311b5eeb6fcdb595f53a81c8f352c2915bbf4b..a78fd2e5c20c9834a5aec2523fe4e4e74de19ca0 100644 (file)
@@ -37,7 +37,6 @@
 #include "cfv.h"
 
 //#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-//#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
 
 //FIXME
 // fixed #define TRACE_NUMBER 0
@@ -90,6 +89,7 @@ GdkColor drawing_colors_cpu[NUM_COLORS_CPU] =
   { 0, 0xBBBB, 0xBBBB, 0xBBBB }, /* COL_CPU_IDLE */
   { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_CPU_BUSY */
   { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_CPU_IRQ */
+  { 0, 0xFFFF, 0x9400, 0x9600 }, /* COL_CPU_SOFT_IRQ */
   { 0, 0xFF00, 0xFF00, 0x0100 }, /* COL_CPU_TRAP */
 };
 
@@ -100,6 +100,20 @@ GdkColor drawing_colors_irq[NUM_COLORS_IRQ] =
   { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_IRQ_BUSY */
 };
 
+GdkColor drawing_colors_soft_irq[NUM_COLORS_SOFT_IRQ] =
+{ /* Pixel, R, G, B */
+  { 0, 0x0000, 0x0000, 0x0000 }, /* COL_SOFT_IRQ_UNKNOWN */
+  { 0, 0x0000, 0x0000, 0x0000 }, /* COL_SOFT_IRQ_IDLE */
+  { 0, 0xFFFF, 0x9400, 0x9600 }, /* COL_SOFT_IRQ_BUSY */
+};
+
+GdkColor drawing_colors_trap[NUM_COLORS_TRAP] =
+{ /* Pixel, R, G, B */
+  { 0, 0x0000, 0x0000, 0x0000 }, /* COL_TRAP_UNKNOWN */
+  { 0, 0xBBBB, 0xBBBB, 0xBBBB }, /* COL_TRAP_IDLE */
+  { 0, 0xFF00, 0xFF00, 0x0100 }, /* COL_TRAP_BUSY */
+};
+
 GdkColor drawing_colors_bdev[NUM_COLORS_BDEV] =
 { /* Pixel, R, G, B */
   { 0, 0x0000, 0x0000, 0x0000 }, /* COL_BDEV_UNKNOWN */
@@ -139,7 +153,7 @@ void drawing_data_request(Drawing_t *drawing,
 
   ControlFlowData *control_flow_data = drawing->control_flow_data;
   //    (ControlFlowData*)g_object_get_data(
-  //               G_OBJECT(drawing->drawing_area), "control_flow_data");
+  //               G_OBJECT(drawing->drawing_area), "resourceview_data");
 
   LttTime start, time_end;
   LttTime window_end = time_window.end_time;
@@ -184,15 +198,14 @@ void drawing_data_request(Drawing_t *drawing,
 
     LttvTraceHook *hook;
 
-    LttvTraceHookByFacility *thf;
+    LttvTraceHook *th;
 
     guint ret;
-    gint before_hn, after_hn;
+    guint first_after;
 
     nb_trace = lttv_traceset_number(traceset);
     // FIXME  (fixed) : eventually request for more traces
     for(i = 0 ; i < nb_trace ; i++) {
-    //for(i = 0; i<MIN(TRACE_NUMBER+1, nb_trace);i++) {
       EventsRequest *events_request = g_new(EventsRequest, 1);
       // Create the hooks
       //LttvHooks *event = lttv_hooks_new();
@@ -228,259 +241,192 @@ void drawing_data_request(Drawing_t *drawing,
       /* Find the eventtype id for the following events and register the
          associated by id hooks. */
 
-      hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
-      hooks = g_array_set_size(hooks, 18);
-      before_hn = after_hn = 0;
+      hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18);
 
       /* before hooks */
       
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
-//          LTT_FIELD_SYSCALL_ID, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL_ARCH,
+//          LTT_EVENT_SYSCALL_ENTRY,
+//          FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
 //          before_execmode_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
-//          0, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL_ARCH,
+//          LTT_EVENT_SYSCALL_EXIT,
+//          NULL,
 //          before_execmode_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+//          &hooks);
 //
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY,
-          LTT_FIELD_TRAP_ID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_TRAP_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_TRAP_ID),
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
-          0, 0, 0, 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_TRAP_EXIT,
+          NULL,
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
-          LTT_FIELD_IRQ_ID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_IRQ_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_IRQ_ID),
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
-          0, 0, 0, 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_IRQ_EXIT,
+          NULL,
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
-//
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
-//          LTT_FIELD_SOFT_IRQ_ID, 0, 0,
-//          before_execmode_hook,
-//          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
-//
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
-//          0, 0, 0, 
-//          before_execmode_hook,
-//          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SOFT_IRQ_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SOFT_IRQ_EXIT,
+          NULL,
+          before_execmode_hook,
+          events_request,
+          &hooks);
 
 
-      ret = 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,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SCHED_SCHEDULE,
+          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           before_schedchange_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
+          &hooks);
 
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
-//          LTT_FIELD_PID, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL,
+//          LTT_EVENT_PROCESS_EXIT,
+//          FIELD_ARRAY(LTT_FIELD_PID),
 //          before_process_exit_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+//          &hooks);
 //      
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE,
-//          LTT_FIELD_PID, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL,
+//          LTT_EVENT_PROCESS_FREE,
+//          FIELD_ARRAY(LTT_FIELD_PID),
 //          before_process_release_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END,
-//          0, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_LIST,
+//          LTT_EVENT_STATEDUMP_END,
+//          NULL,
 //          before_statedump_end,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, before_hn++));
-//      if(ret) before_hn--;
+//          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_BLOCK, LTT_EVENT_REQUEST_ISSUE,
-          LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_REQUEST_ISSUE,
+          FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
           before_bdev_event_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_BLOCK, LTT_EVENT_REQUEST_COMPLETE,
-          LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_REQUEST_COMPLETE,
+          FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
           before_bdev_event_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, before_hn++));
-      if(ret) before_hn--;
-
-#if 0
-      lttv_trace_find_hook(ts->parent.t,
-          "core", "process", "event_sub_id", 
-          "event_data1", "event_data2", before_process_hook,
-          &g_array_index(hooks, LttvTraceHook, hn++));
-#endif //0
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
-          NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, 
-          NULL, process_exit, &g_array_index(hooks, LttvTraceHook, hn++));
-#endif //0
-
-      /* after hooks */
-      
-#if 0
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id", 
-    NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, 
-          NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id",
-    NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL, 
-          after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL, 
-          NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, 
-          after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
-#endif //0
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", 
-        "out_state", after_schedchange_hook, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
+          &hooks);
 
-      lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", 
-          "event_data1", "event_data2", after_process_hook,
-          &g_array_index(hooks, LttvTraceHook, hn++));
-#endif //0
-      after_hn = before_hn;
+      /* After hooks */
+      first_after = hooks->len;
       
-      ret = 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,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SCHED_SCHEDULE,
+          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           after_schedchange_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, after_hn++));
-      if(ret) after_hn--;
+          &hooks);
 
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK,
-//          LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL,
+//          LTT_EVENT_PROCESS_FORK,
+//          FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
 //          after_process_fork_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, after_hn++));
-//      if(ret) after_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
-//          LTT_FIELD_PID, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL,
+//          LTT_EVENT_PROCESS_EXIT,
+//          FIELD_ARRAY(LTT_FIELD_PID),
 //          after_process_exit_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, after_hn++));
-//      if(ret) after_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_FS, LTT_EVENT_EXEC,
-//          0, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_KERNEL,
+//          LTT_EVENT_EXEC,
+//          NULL,
 //          after_fs_exec_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, after_hn++));
-//      if(ret) after_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND,
-//          LTT_FIELD_NAME, 0, 0,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_USER_GENERIC,
+//          LTT_EVENT_THREAD_BRAND,
+//          FIELD_ARRAY(LTT_FIELD_NAME),
 //          after_user_generic_thread_brand_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, after_hn++));
-//      if(ret) after_hn--;
+//          &hooks);
 //
-//      ret = lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE,
-//          LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+//      lttv_trace_find_hook(ts->parent.t,
+//          LTT_FACILITY_LIST,
+//          LTT_EVENT_PROCESS_STATE,
+//          FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
 //          after_event_enum_process_hook,
 //          events_request,
-//          &g_array_index(hooks, LttvTraceHook, after_hn++));
-//      if(ret) after_hn--;
-
-      hooks = g_array_set_size(hooks, after_hn);
-
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
-          NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, hn++));
-
-      lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, 
-          NULL, process_exit, &g_array_index(hooks, LttvTraceHook, hn++));
-#endif //0
-
+//          &hooks);
 
       
       /* Add these hooks to each event_by_id hooks list */
       /* add before */
-      for(k = 0 ; k < before_hn ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
-          lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, thf->id),
-                          thf->h,
-                          thf,
-                          LTTV_PRIO_STATE-5);
-        }
+      for(k = 0 ; k < first_after ; k++) {
+        th = &g_array_index(hooks, LttvTraceHook, k);
+        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                        th->h,
+                        th,
+                        LTTV_PRIO_STATE-5);
       }
 
       /* add after */
-      for(k = before_hn ; k < after_hn ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
-          lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, thf->id),
-                         thf->h,
-                         thf,
-                         LTTV_PRIO_STATE+5);
-        }
+      for(k = first_after ; k < hooks->len ; k++) {
+        th = &g_array_index(hooks, LttvTraceHook, k);
+        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                       th->h,
+                       th,
+                       LTTV_PRIO_STATE+5);
       }
       
       events_request->hooks = hooks;
@@ -516,42 +462,13 @@ void drawing_data_request(Drawing_t *drawing,
       lttvwindow_events_request(tab, events_request);
 
     }
-
   }
-
-#if 0
-  lttv_hooks_add(event,
-                 before_schedchange_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_schedchange_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-  lttv_hooks_add(event,
-                 before_execmode_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_execmode_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-  lttv_hooks_add(event,
-                 before_process_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_process_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-#endif //0
-
 }
  
 
 static void set_last_start(gpointer key, gpointer value, gpointer user_data)
 {
-  ResourceInfo *process_info = (ResourceInfo*)key;
+  //ResourceInfo *process_info = (ResourceInfo*)key;
   HashedResourceData *hashed_process_data = (HashedResourceData*)value;
   guint x = (guint)user_data;
 
@@ -571,6 +488,8 @@ static void set_last_start(gpointer key, gpointer value, gpointer user_data)
 
 void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState *tss)
 {
+  int i;
+
   g_debug("Begin of data request");
   ControlFlowData *cfd = events_request->viewer_data;
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
@@ -588,8 +507,10 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
           width,
           &x);
 
-  g_hash_table_foreach(cfd->process_list->process_hash, set_last_start,
-                            (gpointer)x);
+  for(i=0; i<RV_RESOURCE_COUNT; i++) {
+    g_hash_table_foreach(cfd->process_list->restypes[i].hash_table, set_last_start,
+                         (gpointer)x);
+  }
 
 }
 
@@ -597,7 +518,7 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
 {
   g_debug("Begin of chunk");
   ControlFlowData *cfd = events_request->viewer_data;
-  LttvTracesetContext *tsc = &tss->parent.parent;
+  LttvTracesetContext *tsc = &tss->parent;
   //LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
   guint i;
   LttvTraceset *traceset = tsc->ts;
@@ -771,7 +692,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "control_flow_data");
+                "resourceview_data");
 #if 0
   if(unlikely(drawing->gc == NULL)) {
     drawing->gc = gdk_gc_new(drawing->drawing_area->window);
@@ -898,7 +819,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "control_flow_data");
+                "resourceview_data");
   Drawing_t *drawing = control_flow_data->drawing;
   TimeWindow time_window =
                lttvwindow_get_time_window(control_flow_data->tab);
@@ -1101,6 +1022,10 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
                             TRUE, success);
   gdk_colormap_alloc_colors(colormap, drawing_colors_irq, NUM_COLORS_IRQ, FALSE,
                             TRUE, success);
+  gdk_colormap_alloc_colors(colormap, drawing_colors_soft_irq, NUM_COLORS_SOFT_IRQ, FALSE,
+                            TRUE, success);
+  gdk_colormap_alloc_colors(colormap, drawing_colors_trap, NUM_COLORS_TRAP, FALSE,
+                            TRUE, success);
   gdk_colormap_alloc_colors(colormap, drawing_colors_bdev, NUM_COLORS_BDEV, FALSE,
                             TRUE, success);
   
@@ -1161,6 +1086,8 @@ void drawing_destroy(Drawing_t *drawing)
   gdk_colormap_free_colors(colormap, drawing_colors, NUM_COLORS);
   gdk_colormap_free_colors(colormap, drawing_colors_cpu, NUM_COLORS_CPU);
   gdk_colormap_free_colors(colormap, drawing_colors_irq, NUM_COLORS_IRQ);
+  gdk_colormap_free_colors(colormap, drawing_colors_soft_irq, NUM_COLORS_IRQ);
+  gdk_colormap_free_colors(colormap, drawing_colors_trap, NUM_COLORS_TRAP);
   gdk_colormap_free_colors(colormap, drawing_colors_bdev, NUM_COLORS_BDEV);
 
   // Do not unref here, Drawing_t destroyed by it's widget.
This page took 0.028835 seconds and 4 git commands to generate.