X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=25586e6cd7fa6ee35ab279c81b8dca35ab820bb3;hb=0e8fbe23bcada91edead9534dcb42bdef681bc91;hp=be473deafd31b25bfae1465e6d6fa251d475f22a;hpb=a18124ff571a52da3166455842735142ad067a89;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index be473dea..25586e6c 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -386,7 +386,7 @@ static void connect_focus_recursive(GtkWidget *widget,
 
   }
   if(GTK_IS_TREE_VIEW(widget)) {
-    gtk_tree_view_set_headers_clickable(widget, TRUE);
+    gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(widget), TRUE);
   }
   gtk_widget_add_events(widget, GDK_BUTTON_PRESS_MASK);
   g_signal_connect (G_OBJECT(widget),
@@ -403,10 +403,7 @@ static void connect_focus_recursive(GtkWidget *widget,
 void
 insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data)
 {
-  guint val = 20;
-
   insert_viewer((GtkWidget*)menuitem, (lttvwindow_viewer_constructor)user_data);
-  //  selected_hook(&val);
 }
 
 
@@ -663,13 +660,13 @@ MainWindow * get_window_data_struct(GtkWidget * widget)
 
   mw = lookup_widget(widget, "MWindow");
   if(mw == NULL){
-    g_printf("Main window does not exist\n");
+    g_info("Main window does not exist\n");
     return NULL;
   }
   
   mw_data = (MainWindow *) g_object_get_data(G_OBJECT(mw),"main_window_data");
   if(mw_data == NULL){
-    g_printf("Main window data does not exist\n");
+    g_warning("Main window data does not exist\n");
     return NULL;
   }
   return mw_data;
@@ -684,10 +681,10 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
   MainWindow * parent = get_window_data_struct(widget);
 
   if(clone){
-    g_printf("Clone : use the same traceset\n");
+    g_info("Clone : use the same traceset\n");
     construct_main_window(parent);
   }else{
-    g_printf("Empty : traceset is set to NULL\n");
+    g_info("Empty : traceset is set to NULL\n");
     construct_main_window(NULL);
   }
 }
@@ -726,7 +723,8 @@ gint viewer_container_position(GtkWidget *container, GtkWidget *child)
   if(child == NULL) return -1;
 
   gint pos;
-  GValue value = { 0, };
+  GValue value;
+  memset(&value, 0, sizeof(GValue));
   g_value_init(&value, G_TYPE_INT);
   gtk_container_child_get_property(GTK_CONTAINER(container),
                                    child,
@@ -861,7 +859,7 @@ void open_traceset(GtkWidget * widget, gpointer user_data)
     case GTK_RESPONSE_OK:
       dir = gtk_file_selection_get_selections (file_selector);
       traceset = lttv_traceset_load(dir[0]);
-      g_printf("Open a trace set %s\n", dir[0]); 
+      g_info("Open a trace set %s\n", dir[0]); 
       //Not finished yet
       g_strfreev(dir);
     case GTK_RESPONSE_REJECT:
@@ -936,9 +934,6 @@ static void events_request_free(EventsRequest *events_request)
 
 gboolean lttvwindow_process_pending_requests(Tab *tab)
 {
-  unsigned max_nb_events;
-  GdkWindow * win;
-  GdkCursor * new;
   GtkWidget* widget;
   LttvTracesetContext *tsc;
   LttvTracefileContext *tfc;
@@ -1052,7 +1047,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
           ltime = g_slist_append(ltime, g_slist_nth_data(list_out, 0));
         for(iter=g_slist_nth(list_out,1);iter!=NULL;iter=g_slist_next(iter)) {
           /* Find all time requests with the lowest start time in list_out */
-          guint index_ltime = g_array_index(ltime, guint, 0);
           EventsRequest *event_request_ltime = (EventsRequest*)g_slist_nth_data(ltime, 0);
           EventsRequest *event_request_list_out = (EventsRequest*)iter->data;
 
@@ -1236,7 +1230,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                 events_request->event_by_id);
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
-            g_assert(events_request->trace < nb_trace &&
+            g_assert((guint)events_request->trace < nb_trace &&
                       events_request->trace > -1);
             LttvTraceContext *tc = tsc->traces[events_request->trace];
 
@@ -1273,7 +1267,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                 events_request->event_by_id);
           else {
             guint nb_trace = lttv_traceset_number(tsc->ts);
-            g_assert(events_request->trace < nb_trace &&
+            g_assert((guint)events_request->trace < nb_trace &&
                       events_request->trace > -1);
             LttvTraceContext *tc = tsc->traces[events_request->trace];
 
@@ -1337,7 +1331,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                   events_request->event_by_id);
             else {
               guint nb_trace = lttv_traceset_number(tsc->ts);
-              g_assert(events_request->trace < nb_trace &&
+              g_assert((guint)events_request->trace < nb_trace &&
                         events_request->trace > -1);
               LttvTraceContext *tc = tsc->traces[events_request->trace];
 
@@ -1450,7 +1444,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
     {
       /* 4. Call process traceset middle */
-      g_debug("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
+      g_debug("Calling process traceset middle with %p, %lu sec %lu nsec, %u nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
       count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position);
 
       tfc = lttv_traceset_context_get_current_tfc(tsc);
@@ -1829,7 +1823,6 @@ void add_trace(GtkWidget * widget, gpointer user_data)
   const char * dir;
   char abs_path[PATH_MAX];
   gint id;
-  gint i;
   MainWindow * mw_data = get_window_data_struct(widget);
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
 
@@ -2241,12 +2234,12 @@ void stop_processing(GtkWidget *widget, gpointer user_data)
 
 void save(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Save\n");
+  g_info("Save\n");
 }
 
 void save_as(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Save as\n");
+  g_info("Save as\n");
 }
 
 
@@ -2259,7 +2252,7 @@ void zoom(GtkWidget * widget, double size)
 {
   TimeInterval time_span;
   TimeWindow new_time_window;
-  LttTime    current_time, time_delta, time_s, time_e, time_tmp;
+  LttTime    current_time, time_delta;
   MainWindow * mw_data = get_window_data_struct(widget);
   LttvTracesetContext *tsc;
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
@@ -2355,12 +2348,12 @@ void zoom_extended(GtkWidget * widget, gpointer user_data)
 
 void go_to_time(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Go to time\n");  
+  g_info("Go to time\n");  
 }
 
 void show_time_frame(GtkWidget * widget, gpointer user_data)
 {
-  g_printf("Show time frame\n");  
+  g_info("Show time frame\n");  
 }
 
 
@@ -2391,7 +2384,7 @@ Tab *create_new_tab(GtkWidget* widget, gpointer user_data){
 
   GtkNotebook * notebook = (GtkNotebook *)lookup_widget(widget, "MNotebook");
   if(notebook == NULL){
-    g_printf("Notebook does not exist\n");
+    g_info("Notebook does not exist\n");
     return NULL;
   }
   GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
@@ -2447,7 +2440,7 @@ on_close_tab_activate                  (GtkWidget       *widget,
   MainWindow * mw_data = get_window_data_struct(widget);
   notebook = lookup_widget(widget, "MNotebook");
   if(notebook == NULL){
-    g_printf("Notebook does not exist\n");
+    g_info("Notebook does not exist\n");
     return;
   }
 
@@ -2464,7 +2457,7 @@ on_close_tab_X_clicked                 (GtkWidget       *widget,
   gint page_num;
   GtkWidget *notebook = lookup_widget(widget, "MNotebook");
   if(notebook == NULL){
-    g_printf("Notebook does not exist\n");
+    g_info("Notebook does not exist\n");
     return;
   }
  
@@ -2518,7 +2511,7 @@ void
 on_cut_activate                        (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Cut\n");
+  g_info("Cut\n");
 }
 
 
@@ -2526,7 +2519,7 @@ void
 on_copy_activate                       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Copye\n");
+  g_info("Copye\n");
 }
 
 
@@ -2534,7 +2527,7 @@ void
 on_paste_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Paste\n");
+  g_info("Paste\n");
 }
 
 
@@ -2542,7 +2535,7 @@ void
 on_delete_activate                     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Delete\n");
+  g_info("Delete\n");
 }
 
 
@@ -2633,7 +2626,7 @@ on_trace_filter_activate              (GtkMenuItem     *menuitem,
   
   s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
   if(!s){
-    g_printf("There is no viewer yet\n");      
+    g_info("There is no viewer yet\n");      
     return;
   }
   if(get_filter_selection(s, "Configure trace and tracefile filter", "Select traces and tracefiles")){
@@ -2649,7 +2642,7 @@ void
 on_trace_facility_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Trace facility selector: %s\n");  
+  g_info("Trace facility selector: %s\n");  
 }
 
 
@@ -2742,8 +2735,8 @@ on_load_library_activate                (GtkMenuItem     *menuitem,
         lttv_module_require(str1, &error);
 #endif //0   
         lttv_library_load(str1, &error);
-        if(error != NULL) g_warning(error->message);
-        else g_printf("Load library: %s\n", str);
+        if(error != NULL) g_warning("%s", error->message);
+        else g_info("Load library: %s\n", str);
         g_strfreev(dir);
       case GTK_RESPONSE_REJECT:
       case GTK_RESPONSE_CANCEL:
@@ -2769,40 +2762,39 @@ on_unload_library_activate              (GtkMenuItem     *menuitem,
 {
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
 
-  LttvLibrary *library;
-  {
-    GPtrArray *name;
-    guint nb,i;
-    gchar *lib_name;
-    name = g_ptr_array_new();
-    nb = lttv_library_number();
-    LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb);
-    /* ask for the library name */
+  LttvLibrary *library = NULL;
+
+  GPtrArray *name;
+  guint nb,i;
+  gchar *lib_name;
+  name = g_ptr_array_new();
+  nb = lttv_library_number();
+  LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb);
+  /* ask for the library name */
 
+  for(i=0;i<nb;i++){
+    LttvLibrary *iter_lib = lttv_library_get(i);
+    lttv_library_info(iter_lib, &lib_info[i]);
+    
+    gchar *path = lib_info[i].name;
+    g_ptr_array_add(name, path);
+  }
+  lib_name = get_selection((char **)(name->pdata), name->len,
+                           "Select a library", "Libraries");
+  if(lib_name != NULL) {
     for(i=0;i<nb;i++){
-      LttvLibrary *iter_lib = lttv_library_get(i);
-      lttv_library_info(iter_lib, &lib_info[i]);
-      
-      gchar *path = lib_info[i].name;
-      g_ptr_array_add(name, lib_info[i].name);
-    }
-    lib_name = get_selection((char **)(name->pdata), name->len,
-                             "Select a library", "Libraries");
-    if(lib_name != NULL) {
-      for(i=0;i<nb;i++){
-        if(strcmp(lib_name, lib_info[i].name) == 0) {
-          library = lttv_library_get(i);
-          break;
-        }
+      if(strcmp(lib_name, lib_info[i].name) == 0) {
+        library = lttv_library_get(i);
+        break;
       }
     }
-    g_ptr_array_free(name, TRUE);
-    g_free(lib_info);
-
-    if(lib_name == NULL) return;
   }
-  
-  lttv_library_unload(library);
+  g_ptr_array_free(name, TRUE);
+  g_free(lib_info);
+
+  if(lib_name == NULL) return;
+
+  if(library != NULL) lttv_library_unload(library);
 }
 
 
@@ -2817,7 +2809,7 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
   GError *error = NULL;
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
 
-  LttvLibrary *library;
+  LttvLibrary *library = NULL;
   {
     GPtrArray *name;
     guint nb,i;
@@ -2857,9 +2849,9 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
     GPtrArray *name;
     guint nb,i;
     gchar *module_name;
+    nb = lttv_library_module_number(library);
     LttvModuleInfo *module_info = g_new(LttvModuleInfo,nb);
     name = g_ptr_array_new();
-    nb = lttv_library_module_number(library);
     /* ask for the module name */
 
     for(i=0;i<nb;i++){
@@ -2888,8 +2880,8 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
   }
   
   lttv_module_require(module_name_out, &error);
-  if(error != NULL) g_warning(error->message);
-  else g_printf("Load module: %s\n", module_name_out);
+  if(error != NULL) g_warning("%s", error->message);
+  else g_info("Load module: %s", module_name_out);
 
 
 #if 0
@@ -2936,7 +2928,7 @@ on_load_module_activate                (GtkMenuItem     *menuitem,
 #endif //0   
         lttv_library_load(str1, &error);
         if(error != NULL) g_warning(error->message);
-        else g_printf("Load library: %s\n", str);
+        else g_info("Load library: %s\n", str);
         g_strfreev(dir);
       case GTK_RESPONSE_REJECT:
       case GTK_RESPONSE_CANCEL:
@@ -2997,7 +2989,7 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
     if(lib_name == NULL) return;
   }
 
-  LttvModule *module;
+  LttvModule *module = NULL;
   {
     /* Ask for the module to load : list modules in the selected lib */
     GPtrArray *name;
@@ -3034,7 +3026,7 @@ on_unload_module_activate              (GtkMenuItem     *menuitem,
   
   LttvModuleInfo module_info;
   lttv_module_info(module, &module_info);
-  g_printf("Release module: %s\n", module_info.name);
+  g_info("Release module: %s\n", module_info.name);
  
   lttv_module_release(module);
 }
@@ -3109,7 +3101,7 @@ void
 on_color_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Color\n");
+  g_info("Color\n");
 }
 
 
@@ -3117,7 +3109,7 @@ void
 on_filter_activate                     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Filter\n");
+  g_info("Filter\n");
 }
 
 
@@ -3125,7 +3117,7 @@ void
 on_save_configuration_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Save configuration\n");
+  g_info("Save configuration\n");
 }
 
 
@@ -3133,7 +3125,7 @@ void
 on_content_activate                    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("Content\n");
+  g_info("Content\n");
 }
 
 
@@ -3184,23 +3176,27 @@ on_about_activate                      (GtkMenuItem     *menuitem,
   GtkWidget *label2 = gtk_label_new("");
   gtk_misc_set_padding(GTK_MISC(label2), 10, 20);
   gtk_label_set_markup(GTK_LABEL(label2), "\
-Project author: Karim Yaghmour\n\
-\n\
 Contributors :\n\
 \n\
 Michel Dagenais (New trace format, lttv main)\n\
 Mathieu Desnoyers (Directory structure, build with automake/conf,\n\
-                   lttv gui, control flow view, gui green threads\n\
-                   with interruptible foreground and background computation,\n\
-                   detailed event list)\n\
-Benoit Des Ligneris (Cluster adaptation)\n\
+                   lttv gui, control flow view, gui cooperative trace reading\n\
+                   scheduler with interruptible foreground and background\n\
+                   computation, detailed event list)\n\
+Benoit Des Ligneris, Eric Clement (Cluster adaptation, work in progress)\n\
 Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\
                detailed event list and statistics view)\n\
-Tom Zanussi (RelayFS)");
+Tom Zanussi (RelayFS)\n\
+\n\
+Strongly inspired from the original Linux Trace Toolkit Visualizer made by\n\
+Karim Yaghmour");
 
   GtkWidget *label3 = gtk_label_new("");
   gtk_label_set_markup(GTK_LABEL(label3), "\
-Linux Trace Toolkit, Copyright (C) 2004  Karim Yaghmour\n\
+Linux Trace Toolkit Viewer, Copyright (C) 2004\n\
+                                                Michel Dagenais\n\
+                                                Mathieu Desnoyers\n\
+                                                Xang-Xiu Yang\n\
 Linux Trace Toolkit comes with ABSOLUTELY NO WARRANTY.\n\
 This is free software, and you are welcome to redistribute it\n\
 under certain conditions. See COPYING for details.");
@@ -3386,7 +3382,7 @@ on_MWindow_destroy                     (GtkWidget       *widget,
   g_object_unref(main_window->attributes);
   g_main_window_list = g_slist_remove(g_main_window_list, main_window);
 
-  g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
+  g_info("There are now : %d windows\n",g_slist_length(g_main_window_list));
   if(g_slist_length(g_main_window_list) == 0)
     gtk_main_quit ();
 }
@@ -3397,11 +3393,6 @@ on_MWindow_configure                   (GtkWidget         *widget,
                                         gpointer           user_data)
 {
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)widget);
-  float width = event->width;
-  TimeWindow time_win;
-  double ratio;
-  TimeInterval *time_span;
-  LttTime time;
 	
 	// MD : removed time width modification upon resizing of the main window.
 	// The viewers will redraw themselves completely, without time interval
@@ -4230,10 +4221,11 @@ char * get_selection(char ** loaded_module_name, int nb_module,
   }
 
   id = gtk_dialog_run(GTK_DIALOG(dialogue));
+  GtkTreeModel **store_model = (GtkTreeModel**)&store;  /* for strict aliasing */
   switch(id){
     case GTK_RESPONSE_ACCEPT:
     case GTK_RESPONSE_OK:
-      if (gtk_tree_selection_get_selected (select, (GtkTreeModel**)&store, &iter)){
+      if (gtk_tree_selection_get_selected (select, store_model, &iter)){
 	  gtk_tree_model_get ((GtkTreeModel*)store, &iter, MODULE_COLUMN, &unload_module_name, -1);
       }
     case GTK_RESPONSE_REJECT:
@@ -4254,7 +4246,7 @@ char * get_selection(char ** loaded_module_name, int nb_module,
 
 void add_all_menu_toolbar_constructors(MainWindow * mw, gpointer user_data)
 {
-  int i;
+  guint i;
   GdkPixbuf *pixbuf;
   lttvwindow_viewer_constructor constructor;
   LttvMenus * global_menu, * instance_menu;
@@ -4394,7 +4386,7 @@ void construct_main_window(MainWindow * parent)
   //create a default tab
   notebook = (GtkNotebook *)lookup_widget(new_m_window->mwindow, "MNotebook");
   if(notebook == NULL){
-    g_printf("Notebook does not exist\n");
+    g_info("Notebook does not exist\n");
     return;
   }
   //gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook));
@@ -4468,7 +4460,7 @@ void construct_main_window(MainWindow * parent)
     }
   }
 
-  g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
+  g_info("There are now : %d windows\n",g_slist_length(g_main_window_list));
 }
 
 
@@ -4527,7 +4519,6 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
 {
   GList * list;
   Tab * tab;
-  LttTime tmp_time;
   
   //create a new tab data structure
   tab = g_new(Tab,1);