From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Thu, 12 Jul 2012 20:22:37 +0000 (-0400)
Subject: Process state in gui
X-Git-Tag: v1.5-beta1~56
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a7598d50739159e9f33f60d3b23980db447f6d5d;p=lttv.git

Process state in gui

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

diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c
index 40f95c41..7e9ce546 100644
--- a/lttv/lttv/state.c
+++ b/lttv/lttv/state.c
@@ -3434,11 +3434,16 @@ void lttv_state_add_event_hooks(LttvTraceset *traceset)
 	
 	LttvAttributeValue value;
 	LttvHooks*event_hook;
+#ifdef BABEL_CLEANUP	
 	LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
 	result = lttv_iattribute_find_by_path(attributes, "hooks/event",
 					      LTTV_POINTER, &value);
 	g_assert(result);
 	event_hook = *(value.v_pointer);
+#endif
+	//TODO ybrosseau 2012-07-12: Validate that using traceset hooks instead of the global one is valid
+	//Use traceset hooks 
+	event_hook = lttv_traceset_get_hooks(traceset);
 	g_assert(event_hook);
 
 	lttv_hooks_add(event_hook,syscall_entry , NULL, LTTV_PRIO_STATE);	
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index a8a7ad9e..123cb7a2 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -313,6 +313,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset)
     new_time_window.end_time = ltt_time_add(new_time_window.start_time,
                                             new_time_window.time_width) ;
   }
+  lttv_state_add_event_hooks(traceset);
 
   /* Finally, call the update hooks of the viewers */
   gint retval = update_traceset(tab, traceset);
@@ -3998,9 +3999,10 @@ void init_tab(Tab *tab, MainWindow * mw, Tab *copy_tab,
   tab->traceset_info->traceset_context =
     g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
   //add state update hooks
-  lttv_state_add_event_hooks(
-       (LttvTracesetState*)tab->traceset_info->traceset_context);
 #endif //BABEL_CLEANUP
+  lttv_state_add_event_hooks(
+       tab->traceset_info->traceset);
+
   //determine the current_time and time_window of the tab
 #if 0
   if(copy_tab != NULL){