Remove more warnings in the GUI modules

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>

diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index eeb27e4719f026ec66e6ef151da301c0304449d9..cf3881b091f3bb0c417d22e17acef5e61bf9d3c6 100644 (file)
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -192,10 +192,7 @@ void drawing_data_request(Drawing_t *drawing,
        lttv_hooks_add(event_hook, after_process_exit_hook, control_flow_data, LTTV_PRIO_STATE+5);
        lttv_hooks_add(event_hook, after_event_enum_process_hook, control_flow_data, LTTV_PRIO_STATE+5);
 
-    guint i, k, nb_trace;
-    LttvTraceState *ts;
-    GArray *hooks;
-    gint first_after;
+    guint i, nb_trace;
 
     nb_trace = lttv_traceset_number(traceset);
     // FIXME  (fixed) : eventually request for more traces
@@ -229,220 +226,7 @@ void drawing_data_request(Drawing_t *drawing,
                      events_request,
                      LTTV_PRIO_DEFAULT);
 
-#ifdef BABEL_CLEANUP
-      ts = (LttvTraceState *)tsc->traces[i];
-
-      /* Find the eventtype id for the following events and register the
-         associated by id hooks. */
-
-      hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18);
-
-      /* before hooks */
-      
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SYSCALL_ENTRY,
-          FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-         LTT_CHANNEL_KERNEL,
-         LTT_EVENT_SCHED_TRY_WAKEUP,            
-         FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_CPU_ID, LTT_FIELD_STATE),
-         before_trywakeup_hook,
-         events_request,
-         &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SYSCALL_EXIT,
-          NULL,
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_TRAP_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_TRAP_EXIT,
-          NULL, 
-          before_execmode_hook,
-          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,
-          FIELD_ARRAY(LTT_FIELD_IRQ_ID),
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_IRQ_EXIT,
-          NULL,
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_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_CHANNEL_KERNEL,
-          LTT_EVENT_SOFT_IRQ_EXIT,
-          NULL,
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SCHED_SCHEDULE,
-          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
-          before_schedchange_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_PROCESS_EXIT,
-          FIELD_ARRAY(LTT_FIELD_PID),
-          before_process_exit_hook,
-          events_request,
-          &hooks);
-      
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_PROCESS_FREE,
-          FIELD_ARRAY(LTT_FIELD_PID),
-          before_process_release_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_GLOBAL_STATE,
-          LTT_EVENT_STATEDUMP_END,
-          NULL,
-          before_statedump_end,
-          events_request,
-          &hooks);
-
-      /* After hooks */
-      first_after = hooks->len;
- 
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SCHED_SCHEDULE,
-          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
-          after_schedchange_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_PROCESS_FORK,
-          FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
-          after_process_fork_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_PROCESS_EXIT,
-          FIELD_ARRAY(LTT_FIELD_PID),
-          after_process_exit_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_FS,
-          LTT_EVENT_EXEC,
-          NULL,
-          after_fs_exec_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_TASK_STATE,
-          LTT_EVENT_PROCESS_STATE,
-          FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
-          after_event_enum_process_hook,
-          events_request,
-          &hooks);
-
-      
-      /* Add these hooks to each event_by_id_channel hooks list */
-      /* add before */
-      for(k = 0 ; k < first_after ; k++) {
-        th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
-                                                    th->channel, th->id),
-                        th->h,
-                        th,
-                        LTTV_PRIO_STATE-5);
-      }
-
-      /* add after */
-      for(k = first_after ; k < hooks->len ; k++) {
-        th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
-                                                    th->channel, th->id),
-                       th->h,
-                       th,
-                       LTTV_PRIO_STATE+5);
-      }
-      
-      events_request->hooks = hooks;
-#endif //babel_cleanup
+
       // Fill the events request
       events_request->owner = control_flow_data;
       events_request->viewer_data = control_flow_data;

diff --git a/lttv/modules/gui/controlflow/eventhooks.c b/lttv/modules/gui/controlflow/eventhooks.c
index 88f06a99d130293a2394409fa6f3d577f12977f7..f38e6d20d0d13e1e4f6130411e667f0ff507f5bb 100644 (file)
--- a/lttv/modules/gui/controlflow/eventhooks.c
+++ b/lttv/modules/gui/controlflow/eventhooks.c
@@ -117,7 +117,6 @@ static void request_background_data(ControlFlowData *control_flow_data)
   gint num_traces = lttv_traceset_number(ts);
   gint i;
   LttvTrace *trace;
-  LttvTraceState *tstate;
 
   LttvHooks *background_ready_hook = lttv_hooks_new();
   lttv_hooks_add(background_ready_hook, background_ready, control_flow_data,
@@ -553,7 +552,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   //LttvProcessState *old_process = ts->running_process[cpu];
 
   guint pid_in, pid_out;
-  gint64 state_out;
   LttTime evtime;
   event = (LttvEvent *) call_data;
   if (strcmp(lttv_traceset_get_name_from_event(event),"sched_switch") != 0)
@@ -571,7 +569,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   
   pid_out = lttv_event_get_long(event, "prev_tid");
   pid_in = lttv_event_get_long(event, "next_tid");
-  state_out = lttv_event_get_long(event, "prev_state");
   guint trace_number = lttv_traceset_get_trace_index_from_event(event);
 
   process = lttv_state_find_process(ts,cpu,pid_out);
@@ -631,7 +628,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                  evtime );
 
     } else
-           g_warning("Cannot find pid_in in schedchange %u at %u.%u", pid_in, evtime.tv_sec, evtime.tv_nsec);
+           g_warning("Cannot find pid_in in schedchange %u at %lu.%lu", pid_in, evtime.tv_sec, evtime.tv_nsec);
 #ifdef BABEL_CLEANUP
   tfc->target_pid = target_pid_saved;
 #endif //babel_cleanup
@@ -782,7 +779,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
 {
   LttvEvent *event;
   guint cpu;
-  guint pid = 0;
   LttvTraceState *ts;
   LttvProcessState *process;
   
@@ -800,7 +796,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
   LttTime evtime = lttv_event_get_timestamp(event);
   ControlFlowData *control_flow_data = (ControlFlowData*)hook_data;
   /* For the pid */
-  LttvTraceset *traceSet = lttvwindow_get_traceset(control_flow_data->tab);
   
   cpu = lttv_traceset_get_cpuid_from_event(event);
   ts = event->state;
@@ -2025,10 +2020,6 @@ int before_statedump_end(void *hook_data, void *call_data)
 
   ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
 
-
-  LttvTraceState *ts = event->state;
-
-
   ProcessList *process_list = control_flow_data->process_list;
 
 #ifdef BABEL_CLEANUP

diff --git a/lttv/modules/gui/detailedevents/events.c b/lttv/modules/gui/detailedevents/events.c
index c688a056eb7fb883b269acda7fa6f1651790bdc4..affd293dcc35c9bab35b3a0deb98619a2a5b3fb7 100644 (file)
--- a/lttv/modules/gui/detailedevents/events.c
+++ b/lttv/modules/gui/detailedevents/events.c
@@ -527,7 +527,6 @@ static void request_background_data(EventViewerData *event_viewer_data)
   gint num_traces = ts->traces->len;
   gint i;
   LttvTrace *trace;
-  LttvTraceState *tstate;
 
   LttvHooks *background_ready_hook = 
     lttv_hooks_new();
@@ -1421,7 +1420,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
     
        event_viewer_data->currently_selected_position = 
          lttv_traceset_create_current_position(ts);
-       g_debug("update_current_time: %p %d", event_viewer_data->currently_selected_position,  event_viewer_data->currently_selected_position->timestamp);
+       g_debug("update_current_time: %p %lu", event_viewer_data->currently_selected_position,  event_viewer_data->currently_selected_position->timestamp);
   }
 
   event_viewer_data->report_position = FALSE;
@@ -1442,7 +1441,7 @@ gboolean update_current_position(void * hook_data, void * call_data)
   
   if(lttv_traceset_position_compare(
         event_viewer_data->currently_selected_position, current_pos) != 0) {
-    g_debug("Update current pos: %p, %d", current_pos, current_pos->timestamp);
+    g_debug("Update current pos: %p, %lu", current_pos, current_pos->timestamp);
                 event_viewer_data->currently_selected_position = current_pos;
       /* Simply update the current time : it is in the list */
       event_update_selection(event_viewer_data);

diff --git a/lttv/modules/gui/detailedevents/lttv_plugin_evd.c b/lttv/modules/gui/detailedevents/lttv_plugin_evd.c
index ed4e4dafd9d54c6dbe828ee68dcdf46ce4dd9a85..ef7f5b1092f27f1be13b1b1f0bb34c738ed79871 100644 (file)
--- a/lttv/modules/gui/detailedevents/lttv_plugin_evd.c
+++ b/lttv/modules/gui/detailedevents/lttv_plugin_evd.c
@@ -42,9 +42,10 @@ static void evd_update_filter(LttvPlugin *parent, LttvFilter *filter)
 static void
 lttv_plugin_evd_class_init (LttvPluginEVDClass *klass)
 {
+  #ifdef BABEL_CLEANUP
   LttvPluginClass *parent_klass;
   parent_klass = &klass->parent;
-  #ifdef BABEL_CLEANUP
+
   parent_klass->update_filter = evd_update_filter;
 #endif //babel cleanup
   g_type_class_add_private (klass, sizeof (EventViewerData));

diff --git a/lttv/modules/gui/histogram/histoeventhooks.c b/lttv/modules/gui/histogram/histoeventhooks.c
index 8e5d780a108002641319321fa1f92b478f30cba7..a870e419c7aa44378a24c4927ed3f9eee143b876 100644 (file)
--- a/lttv/modules/gui/histogram/histoeventhooks.c
+++ b/lttv/modules/gui/histogram/histoeventhooks.c
@@ -783,8 +783,6 @@ int histo_after_chunk(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   HistoControlFlowData *histocontrol_flow_data = events_request->viewer_data;
-  LttvTraceset *traceset = (LttvTraceset*)call_data;
-
   LttTime end_time;
 
   histoDrawing_t *drawing = histocontrol_flow_data->drawing;

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 018947aaf9778e05825c3052fa87a8207fe4c2fe..1a675dc88a0f7e1a5daec682ad5b725952454c79 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -1300,7 +1300,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
     {
       /* 5. After process traceset middle */
 
-      LttTime curTime = lttv_traceset_get_current_time(ts);
       /* - if the iterator is not valid anymore (got to the end) */
       if(bt_ctf_iter_read_event(ts->iter) == NULL) {
         /* - For each req in list_in */
@@ -1540,13 +1539,14 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 }
 
 #undef list_out
+#ifdef BABEL_CLEANUP
 /** 
     Manage the periodic update of a live trace
 */
 static gboolean
 live_trace_update_handler(Tab *tab)
 {  
-#ifdef BABEL_CLEANUP
+
        unsigned int updated_count;
        LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
        TimeInterval initial_time_span = tsc->time_span;
@@ -1582,12 +1582,12 @@ live_trace_update_handler(Tab *tab)
 
        /* Timer will be recalled as long as there is files to update */
        return (updated_count > 0);
-#endif /* BABEL_CLEANUP */
 }
-
+#endif /* BABEL_CLEANUP */
+#ifdef BABEL_CLEANUP
 static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
 {
-#ifdef BABEL_CLEANUP
+
   LttvTraceset *traceset = tab->traceset_info->traceset;
   guint i;
   guint num_traces = lttv_traceset_number(traceset);
@@ -1648,9 +1648,9 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
                                 (GSourceFunc) live_trace_update_handler,
                                 tab);
   }
-#endif /* BABEL_CLEANUP */
-}
 
+}
+#endif /* BABEL_CLEANUP */
 /* add_trace adds a trace into the current traceset. It first displays a 
  * directory selection dialogue to let user choose a trace, then recreates
  * tracset_context, and redraws all the viewer of the current tab 
@@ -3018,7 +3018,7 @@ on_about_activate                      (GtkMenuItem     *menuitem,
   
   static const gchar *copyright = "Copyright \xc2\xa9 2004-2013";
 
-  gtk_show_about_dialog(main_window->mwindow,
+  gtk_show_about_dialog((GtkWindow *)main_window->mwindow,
                  "authors", authors,
                  "comments", comments,
                  "version", VERSION,
@@ -3039,7 +3039,7 @@ on_button_new_clicked                  (GtkButton       *button,
 #else
   GtkWidget *dialogue = 
     gtk_message_dialog_new(
-      GTK_WINDOW(gtk_widget_get_toplevel(button)),
+           GTK_WINDOW(gtk_widget_get_toplevel((GtkWidget *)button)),
       GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
       GTK_MESSAGE_ERROR,
       GTK_BUTTONS_OK,

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
index 56013356c8ac111b78d149cbad9fe290112598f2..b341f3591f67cdf6c37566b6e98cab6fa3a70ae5 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/interface.c
@@ -56,8 +56,10 @@ create_MWindow (void)
   GtkWidget *FileMenuNewTitle;
   GtkWidget *FileMenuNewTitle_menu;
   //  GtkWidget *EmptyTraceset;
+#ifdef BABEL_CLEANUP
   GtkWidget *CloneTraceset;
   GtkWidget *FileMenuNewSep;
+#endif
   GtkWidget *Tab;
   //  GtkWidget *OpenTraceset;
   GtkWidget *Close;
@@ -113,7 +115,9 @@ create_MWindow (void)
   GtkWidget *About;
   GtkWidget *MToolbar1;
   GtkWidget *tmp_toolbar_icon;
+#ifdef BABEL_CLEANUP
   GtkWidget *tlbEmptyTraceset;
+#endif
   GtkWidget *tlbTab;
   //  GtkWidget *tlbOpenTraceset;
   GtkWidget *tlbAddTrace;
@@ -916,7 +920,7 @@ create_MWindow (void)
   GLADE_HOOKUP_OBJECT (MWindow, MToolbar1, "MToolbar1");
 #ifdef BABEL_CLEANUP
   GLADE_HOOKUP_OBJECT (MWindow, tlbEmptyTraceset, "tlbEmptyTraceset");
-#endif BABEL_CLEANUP
+#endif /* BABEL_CLEANUP */
   GLADE_HOOKUP_OBJECT (MWindow, tlbTab, "tlbTab");
   //  GLADE_HOOKUP_OBJECT (MWindow, tlbOpenTraceset, "tlbOpenTraceset");
   GLADE_HOOKUP_OBJECT (MWindow, tlbAddTrace, "tlbAddTrace");

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
index 0cd5d5f587886bf672dc72621b8c1abbf4ec492a..2e0ed0a01f9dbe05b8c978d5a26c8c65ce5076b5 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
@@ -140,14 +140,14 @@ __EXPORT guint lttvwindowtraces_get_number()
 void lttvwindowtraces_add_trace(LttvTrace *trace)
 {
 
-  LttvAttribute *g_attribute = lttv_global_attributes();
   LttvAttribute *attribute;
-  LttvAttributeValue value;
+#ifdef BABEL_CLEANUP
+
+  LttvAttribute *g_attribute = lttv_global_attributes();
   struct stat buf;
   gchar attribute_path[PATH_MAX];
   int result;
   gboolean result_b;
-  #ifdef BABEL_CLEANUP
   if(stat(g_quark_to_string(ltt_trace_name(lttv_trace(trace))), &buf)) {
     g_warning("lttvwindowtraces_add_trace: Trace %s not found",
         g_quark_to_string(ltt_trace_name(lttv_trace(trace))));
@@ -206,19 +206,19 @@ void lttvwindowtraces_add_trace(LttvTrace *trace)
   sync_position = lttv_traceset_context_position_new();
   *(value.v_pointer) = sync_position;
 #endif //0
-  value = lttv_attribute_add(attribute,
+  lttv_attribute_add(attribute,
                      LTTV_REQUESTS_QUEUE,
                      LTTV_POINTER);
 
-  value = lttv_attribute_add(attribute,
+  lttv_attribute_add(attribute,
                      LTTV_REQUESTS_CURRENT,
                      LTTV_POINTER);
  
-  value = lttv_attribute_add(attribute,
+  lttv_attribute_add(attribute,
                      LTTV_NOTIFY_QUEUE,
                      LTTV_POINTER);
   
-  value = lttv_attribute_add(attribute,
+  lttv_attribute_add(attribute,
                      LTTV_NOTIFY_CURRENT,
                      LTTV_POINTER);
 }
@@ -886,7 +886,7 @@ void lttvwindowtraces_call_after_chunk(LttvAttributeName module_name,
   type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(module_attribute),
                                      LTTV_EVENT_HOOK_BY_ID_CHANNEL,
                                      &value);
-  #ifdef BABEL_CLEANUP
+#ifdef BABEL_CLEANUP
   lttv_process_traceset_end(tsc,
                             after_chunk_traceset,
                             after_chunk_trace,
@@ -1002,13 +1002,13 @@ __EXPORT gboolean lttvwindowtraces_get_ready(LttvAttributeName module_name,
   else
     return TRUE;
 }
-
+#ifdef BABEL_CLEANUP
 static gint find_window_widget(MainWindow *a, GtkWidget *b)
 {
   if(a->mwindow == b) return 0;
   else return -1;
 }
-
+#endif
 
 /* lttvwindowtraces_process_pending_requests
  *
@@ -1022,8 +1022,6 @@ static gint find_window_widget(MainWindow *a, GtkWidget *b)
 
 gboolean lttvwindowtraces_process_pending_requests(LttvTrace *trace)
 {
-  LttvTraceset *tsc;
-  LttvTraceset *ts;
   LttvAttribute *attribute;
   LttvAttribute *g_attribute = lttv_global_attributes();
   GSList **list_out, **list_in, **notify_in, **notify_out;
@@ -1066,8 +1064,9 @@ gboolean lttvwindowtraces_process_pending_requests(LttvTrace *trace)
                                      LTTV_COMPUTATION_TRACESET,
                                      &value);
   g_assert(type == LTTV_POINTER);
+#ifdef BABEL_CLEANUP
   ts = (LttvTraceset*)*(value.v_pointer);
- 
+#endif
 #if 0
   type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute),
                                      LTTV_COMPUTATION_SYNC_POSITION,

diff --git a/lttv/modules/gui/resourceview/drawing.c b/lttv/modules/gui/resourceview/drawing.c
index ecb8270d8a73b0f0e34444c500a1949f748fba78..fb9b1b86474d14402d191be3828cac95c8713e30 100644 (file)
--- a/lttv/modules/gui/resourceview/drawing.c
+++ b/lttv/modules/gui/resourceview/drawing.c
@@ -188,13 +188,7 @@ void drawing_data_request(Drawing_t *drawing,
     lttv_hooks_add(event_hook,before_execmode_hook , control_flow_data, LTTV_PRIO_STATE-5);    
     lttv_hooks_add(event_hook, after_schedchange_hook, control_flow_data, LTTV_PRIO_STATE+5);       
 
-    /* find the tracehooks */
-
-    LttvTraceState *ts;
-    GArray *hooks;
-
-    guint i, k;
-    guint first_after;
+    guint i;
 
     guint nb_trace = lttv_traceset_number(traceset);
     // FIXME  (fixed) : eventually request for more traces
@@ -228,236 +222,6 @@ void drawing_data_request(Drawing_t *drawing,
                      events_request,
                      LTTV_PRIO_DEFAULT);
 
-#ifdef BABEL_CLEANUP
-      ts = (LttvTraceState *)tsc->traces[i];
-
-      /* Find the eventtype id for the following events and register the
-         associated by id hooks. */
-
-      hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18);
-
-      /* before hooks */
-      
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_ARCH,
-//          LTT_EVENT_SYSCALL_ENTRY,
-//          FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
-//          before_execmode_hook,
-//          events_request,
-//          &hooks);
-//
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_ARCH,
-//          LTT_EVENT_SYSCALL_EXIT,
-//          NULL,
-//          before_execmode_hook,
-//          events_request,
-//          &hooks);
-//
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_TRAP_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_TRAP_EXIT,
-          NULL,
-          before_execmode_hook,
-          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,
-          FIELD_ARRAY(LTT_FIELD_IRQ_ID),
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_IRQ_EXIT,
-          NULL,
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SOFT_IRQ_RAISE,
-          FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_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_CHANNEL_KERNEL,
-          LTT_EVENT_SOFT_IRQ_EXIT,
-          NULL,
-          before_execmode_hook,
-          events_request,
-          &hooks);
-
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SCHED_SCHEDULE,
-          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
-          before_schedchange_hook,
-          events_request,
-          &hooks);
-
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_CHANNEL_KERNEL,
-//          LTT_EVENT_PROCESS_EXIT,
-//          FIELD_ARRAY(LTT_FIELD_PID),
-//          before_process_exit_hook,
-//          events_request,
-//          &hooks);
-//      
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_CHANNEL_KERNEL,
-//          LTT_EVENT_PROCESS_FREE,
-//          FIELD_ARRAY(LTT_FIELD_PID),
-//          before_process_release_hook,
-//          events_request,
-//          &hooks);
-//
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_LIST,
-//          LTT_EVENT_STATEDUMP_END,
-//          NULL,
-//          before_statedump_end,
-//          events_request,
-//          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_BLOCK,
-          LTT_EVENT_REQUEST_ISSUE,
-          FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
-          before_bdev_event_hook,
-          events_request,
-          &hooks);
-
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_BLOCK,
-          LTT_EVENT_REQUEST_COMPLETE,
-          FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
-          before_bdev_event_hook,
-          events_request,
-          &hooks);
-
-      /* After hooks */
-      first_after = hooks->len;
-      
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_KERNEL,
-          LTT_EVENT_SCHED_SCHEDULE,
-          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
-          after_schedchange_hook,
-          events_request,
-          &hooks);
-
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_CHANNEL_KERNEL,
-//          LTT_EVENT_PROCESS_FORK,
-//          FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
-//          after_process_fork_hook,
-//          events_request,
-//          &hooks);
-//
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_CHANNEL_KERNEL,
-//          LTT_EVENT_PROCESS_EXIT,
-//          FIELD_ARRAY(LTT_FIELD_PID),
-//          after_process_exit_hook,
-//          events_request,
-//          &hooks);
-//
-//      lttv_trace_find_hook(ts->parent.t,
-//          LTT_CHANNEL_KERNEL,
-//          LTT_EVENT_EXEC,
-//          NULL,
-//          after_fs_exec_hook,
-//          events_request,
-//          &hooks);
-//
-//      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,
-//          &hooks);
-
-      
-      /* Add these hooks to each event_by_id hooks list */
-      /* add before */
-      for(k = 0 ; k < first_after ; k++) {
-        th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
-                                                     th->channel, th->id),
-          th->h,
-          th,
-          LTTV_PRIO_STATE-5);
-      }
-
-      /* add after */
-      for(k = first_after ; k < hooks->len ; k++) {
-        th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
-                                                     th->channel, th->id),
-          th->h,
-          th,
-          LTTV_PRIO_STATE+5);
-      }
-      
-      events_request->hooks = hooks;
-#endif
       // Fill the events request
       events_request->owner = control_flow_data;
       events_request->viewer_data = control_flow_data;

diff --git a/lttv/modules/gui/resourceview/eventhooks.c b/lttv/modules/gui/resourceview/eventhooks.c
index 86bb8cdb8550a56c3904c273adcebc5599b98c02..f46018442ef3241ecb87cc8e9b8317cab024d1f7 100644 (file)
--- a/lttv/modules/gui/resourceview/eventhooks.c
+++ b/lttv/modules/gui/resourceview/eventhooks.c
@@ -117,7 +117,6 @@ static void request_background_data(ControlFlowData *resourceview_data)
   gint num_traces = lttv_traceset_number(ts);
   gint i;
   LttvTrace *trace;
-  LttvTraceState *tstate;
 
   LttvHooks *background_ready_hook = 
     lttv_hooks_new();
@@ -381,6 +380,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
    * time to do it.
    */
 
+#ifdef BABEL_CLEANUP
   guint pid_out;
   pid_out = lttv_event_get_long(event, "prev_tid");
 // TODO: can't we reenable this? pmf
@@ -388,7 +388,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
 //    /* not a transition to/from idle */
 //    return 0;
 //  }
-
+#endif
 
   guint cpu = lttv_traceset_get_cpuid_from_event(event);
   ts = event->state;      
@@ -622,7 +622,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
 {
   LttvEvent *event;
   guint cpu;
-  guint pid = 0;
   LttvTraceState *ts;
   LttvProcessState *process;
 
@@ -644,9 +643,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
   LttTime evtime = lttv_event_get_timestamp(event);
   ControlFlowData *resourceview_data = (ControlFlowData*)hook_data;
 
-  /* For the pid */
-  LttvTraceset *traceSet = lttvwindow_get_traceset(resourceview_data->tab);
-  
   cpu = lttv_traceset_get_cpuid_from_event(event);
   ts = event->state;
   
@@ -803,7 +799,6 @@ int before_execmode_hook_irq(void *hook_data, void *call_data)
 
   guint64 irq;
   guint cpu = lttv_traceset_get_cpuid_from_event(event);
-  LttvTraceset *traceSet = lttvwindow_get_traceset(resourceview_data->tab);
   LttvTraceState *ts = event->state;;
 
   /*
@@ -995,8 +990,6 @@ int before_execmode_hook_soft_irq(void *hook_data, void *call_data)
 
   LttTime evtime = lttv_event_get_timestamp(event);
   ControlFlowData *resourceview_data = (ControlFlowData*)hook_data;
-  LttvTraceset *traceSet = lttvwindow_get_traceset(resourceview_data->tab);
-  guint cpu =  lttv_traceset_get_cpuid_from_event(event);  
   ts = event->state;
   guint trace_num = lttv_traceset_get_trace_index_from_event(event);
 
@@ -1304,7 +1297,6 @@ int before_bdev_event_hook(void *hook_data, void *call_data)
 {
 LttvEvent *event;
   guint cpu;
-  guint pid = 0;
   LttvTraceState *ts;
   LttvProcessState *process;
 
@@ -2078,8 +2070,6 @@ int after_chunk(void *hook_data, void *call_data)
   ControlFlowData *resourceview_data = events_request->viewer_data;
   LttvTraceset *ts = (LttvTraceset*)call_data;
 
-  LttTime end_time;
-  
   ProcessList *process_list = resourceview_data->process_list;
   guint i;
   guint nb_trace = lttv_traceset_number(ts);
@@ -2093,12 +2083,7 @@ int after_chunk(void *hook_data, void *call_data)
   }
   g_free(process_list->current_hash_data);
   process_list->current_hash_data = NULL;
-#ifdef BABEL_CLEANUP
-  if(tfc != NULL)
-    end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
-  else /* end of traceset, or position now out of request : end */
-    end_time = events_request->end_time;
-#endif
+
   draw_closing_lines(resourceview_data, events_request);
 
   return 0;
@@ -2123,10 +2108,6 @@ int before_statedump_end(void *hook_data, void *call_data)
 
   ControlFlowData *resourceview_data = (ControlFlowData*) hook_data;
 
-
-  LttvTraceState *ts = event->state;
-
-
   gint i;
 
 #ifdef BABEL_CLEANUP