X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finit_module.c;h=8c3f97296167e33bb44db14f47f24e4b02744c82;hb=0be5d43de2734bacc37b4505237f064d57a474d0;hp=42489de76c90403662a9a4bad97932adedb7c078;hpb=d27948a397c1ff8a47b497ca07f5090c08e88628;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
index 42489de7..8c3f9729 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
@@ -27,6 +27,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <string.h>
 
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
@@ -57,6 +58,7 @@ LttvTraceInfo LTTV_TRACES,
        LTTV_NOTIFY_CURRENT,
        LTTV_COMPUTATION_TRACESET,
        LTTV_COMPUTATION_TRACESET_CONTEXT,
+       LTTV_COMPUTATION_SYNC_POSITION,
        LTTV_BEFORE_CHUNK_TRACESET,
        LTTV_BEFORE_CHUNK_TRACE,
        LTTV_BEFORE_CHUNK_TRACEFILE,
@@ -81,27 +83,17 @@ LttvHooks
   *main_hooks;
 
 /* Initial trace from command line */
-LttvTrace *g_init_trace = NULL;
+//LttvTrace *g_init_trace = NULL;
 
 static char *a_trace;
+static char g_init_trace[PATH_MAX] = "";
 
 
 void lttv_trace_option(void *hook_data)
 { 
   LttTrace *trace;
-  gchar abs_path[PATH_MAX];
-
-  get_absolute_pathname(a_trace, abs_path);
-  g_init_trace = lttvwindowtraces_get_trace_by_name(abs_path);
-  if(g_init_trace == NULL) {
-    trace = ltt_trace_open(abs_path);
-    if(trace == NULL) {
-      g_warning("cannot open trace %s", abs_path);
-    } else {
-      g_init_trace = lttv_trace_new(trace);
-      lttvwindowtraces_add_trace(g_init_trace);
-    }
-  }
+
+  get_absolute_pathname(a_trace, g_init_trace);
 }
 
 /*****************************************************************************
@@ -129,7 +121,12 @@ static gboolean window_creation_hook(void *hook_data, void *call_data)
   add_pixmap_directory ("pixmaps");
   add_pixmap_directory ("../modules/gui/main/pixmaps");
 
-  construct_main_window(NULL);
+  /* First window, use command line trace */
+  if(strcmp(g_init_trace, "") != 0){
+    create_main_window_with_trace(g_init_trace);
+  } else {
+    construct_main_window(NULL);
+  }
 
   gtk_main ();
 
@@ -153,6 +150,8 @@ static void init() {
   LTTV_COMPUTATION_TRACESET = g_quark_from_string("computation_traceset");
   LTTV_COMPUTATION_TRACESET_CONTEXT =
                         g_quark_from_string("computation_traceset_context");
+  LTTV_COMPUTATION_SYNC_POSITION =
+                        g_quark_from_string("computation_sync_position");
   LTTV_BEFORE_CHUNK_TRACESET = g_quark_from_string("before_chunk_traceset");
   LTTV_BEFORE_CHUNK_TRACE = g_quark_from_string("before_chunk_trace");
   LTTV_BEFORE_CHUNK_TRACEFILE = g_quark_from_string("before_chunk_tracefile");
@@ -230,6 +229,10 @@ main_window_destructor(MainWindow * mw)
   gtk_widget_destroy(mw->mwindow);
 }
 
+static void destroy_walk(gpointer data, gpointer user_data)
+{
+  main_window_destructor((MainWindow*)data);
+}
 
 /**
  * plugin's destroy function
@@ -249,12 +252,9 @@ static void destroy() {
 
   g_debug("GUI destroy()");
 
-  if(g_main_window_list){
-    for(iter=g_main_window_list;iter!=NULL;iter=g_slist_next(iter)) {
-        main_window_destructor((MainWindow*)iter->data);
-    }
-    g_slist_free(g_main_window_list);
-  }
+  g_slist_foreach(g_main_window_list, destroy_walk, NULL);
+  
+  g_slist_free(g_main_window_list);
   
 }