main window quit remove loops before gtk_main_quit

[lttv.git] / ltt / branches / poly / lttv / modules / gui / lttvwindow / lttvwindow / init_module.c

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 7b2d8c7def60aa095ec740243466901a56bbace1..42489de76c90403662a9a4bad97932adedb7c078 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
@@ -50,6 +50,7 @@
 
 LttvTraceInfo LTTV_TRACES,
        LTTV_COMPUTATION,
+       LTTV_VIEWER_CONSTRUCTORS,
        LTTV_REQUESTS_QUEUE,
        LTTV_REQUESTS_CURRENT,
        LTTV_NOTIFY_QUEUE,
@@ -88,7 +89,7 @@ static char *a_trace;
 void lttv_trace_option(void *hook_data)
 { 
   LttTrace *trace;
-  gchar *abs_path;
+  gchar abs_path[PATH_MAX];
 
   get_absolute_pathname(a_trace, abs_path);
   g_init_trace = lttvwindowtraces_get_trace_by_name(abs_path);
@@ -144,6 +145,7 @@ static void init() {
   
   LTTV_TRACES = g_quark_from_string("traces");
   LTTV_COMPUTATION = g_quark_from_string("computation");
+  LTTV_VIEWER_CONSTRUCTORS = g_quark_from_string("viewer_constructors");
   LTTV_REQUESTS_QUEUE = g_quark_from_string("requests_queue");
   LTTV_REQUESTS_CURRENT = g_quark_from_string("requests_current");
   LTTV_NOTIFY_QUEUE = g_quark_from_string("notify_queue");
@@ -180,16 +182,45 @@ static void init() {
 
   lttv_hooks_add(main_hooks, window_creation_hook, NULL, LTTV_PRIO_DEFAULT);
 
-  LttvHooks *hook_adder = lttv_hooks_new();
-  lttv_hooks_add(hook_adder, lttv_state_save_hook_add_event_hooks, NULL,
-                 LTTV_PRIO_DEFAULT);
-  LttvHooks *hook_remover = lttv_hooks_new();
-  lttv_hooks_add(hook_remover, lttv_state_save_hook_remove_event_hooks,
-                                  NULL, LTTV_PRIO_DEFAULT);
-  /* Add state computation background hook adder to attributes */
-  lttvwindowtraces_register_computation_hooks(g_quark_from_string("state"),
-      NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      hook_adder, hook_remover);
+  {
+    /* Register state calculator */
+    LttvHooks *hook_adder = lttv_hooks_new();
+    lttv_hooks_add(hook_adder, lttv_state_save_hook_add_event_hooks, NULL,
+                   LTTV_PRIO_DEFAULT);
+    lttv_hooks_add(hook_adder, lttv_state_hook_add_event_hooks, NULL,
+                   LTTV_PRIO_DEFAULT);
+    LttvHooks *hook_remover = lttv_hooks_new();
+    lttv_hooks_add(hook_remover, lttv_state_save_hook_remove_event_hooks,
+                                    NULL, LTTV_PRIO_DEFAULT);
+    lttv_hooks_add(hook_remover, lttv_state_hook_remove_event_hooks,
+                                    NULL, LTTV_PRIO_DEFAULT);
+    /* Add state computation background hook adder to attributes */
+    lttvwindowtraces_register_computation_hooks(g_quark_from_string("state"),
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        hook_adder, hook_remover);
+  }
+
+  {
+    /* Register statistics calculator */
+    LttvHooks *hook_adder = lttv_hooks_new();
+    lttv_hooks_add(hook_adder, lttv_stats_hook_add_event_hooks, NULL,
+                   LTTV_PRIO_DEFAULT);
+    lttv_hooks_add(hook_adder, lttv_state_hook_add_event_hooks, NULL,
+                   LTTV_PRIO_DEFAULT);
+    LttvHooks *hook_remover = lttv_hooks_new();
+    lttv_hooks_add(hook_remover, lttv_stats_hook_remove_event_hooks,
+                                    NULL, LTTV_PRIO_DEFAULT);
+    lttv_hooks_add(hook_remover, lttv_state_hook_remove_event_hooks,
+                                    NULL, LTTV_PRIO_DEFAULT);
+    LttvHooks *after_request = lttv_hooks_new();
+    lttv_hooks_add(after_request, lttv_stats_sum_traceset_hook, NULL,
+        LTTV_PRIO_DEFAULT);
+    /* Add state computation background hook adder to attributes */
+    lttvwindowtraces_register_computation_hooks(g_quark_from_string("stats"),
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
+        after_request, NULL, NULL,
+        hook_adder, hook_remover);
+  }
 }
 
 void
@@ -212,9 +243,6 @@ static void destroy() {
   LttvTrace *trace;
   GSList *iter = NULL;
   
-  lttvwindowtraces_unregister_requests(g_quark_from_string("state"));
-  lttvwindowtraces_unregister_computation_hooks(g_quark_from_string("state"));
-
   lttv_option_remove("trace");
 
   lttv_hooks_remove_data(main_hooks, window_creation_hook, NULL);