X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=5ff1c55c31f515ef7a3e1469028b61725eb80879;hb=167bee50bc90a840ad8d8bb0b57d7fc6a276f05f;hp=92705b2b997be2d9fcacd597f41c0b0512631dab;hpb=e140c5b36400c978e2a58cd402425a7f50739e9c;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index 92705b2b..5ff1c55c 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@ -51,6 +51,8 @@
 
 extern GSList * g_main_window_list;
 
+__EXPORT gint lttvwindow_preempt_count = 0;
+
 /* set_time_window 
  *
  * It updates the time window of the tab, then calls the updatetimewindow
@@ -203,7 +205,6 @@ void remove_toolbar_constructor(MainWindow *mw, lttvwindow_viewer_constructor vi
   LttvIAttribute *attributes = mw->attributes;
   LttvAttributeValue value;
   LttvToolbars * instance_toolbar;
-  lttvwindow_viewer_constructor constructor;
   GtkWidget * tool_menu_title_menu, *widget;
 
   g_assert(lttv_iattribute_find_by_path(attributes,
@@ -224,9 +225,7 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe
   LttvIAttribute *attributes = mw->attributes;
   LttvAttributeValue value;
   LttvMenus * instance_menu;
-  lttvwindow_viewer_constructor constructor;
   GtkWidget * tool_menu_title_menu, *widget;
-  LttvMenuClosure *menu_item_i;
 
   g_assert(lttv_iattribute_find_by_path(attributes,
 	   "viewers/menu", LTTV_POINTER, &value));
@@ -261,7 +260,7 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe
  * @param view_constructor constructor of the viewer. 
  */
 
-void lttvwindow_register_constructor
+__EXPORT void lttvwindow_register_constructor
                             (char *  name,
                              char *  menu_path, 
                              char *  menu_text,
@@ -312,13 +311,16 @@ void lttvwindow_register_constructor
   }
   {
     LttvAttribute *attribute;
-    g_assert(attribute = 
-      LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
-                                LTTV_IATTRIBUTE(attributes_global),
-                                LTTV_VIEWER_CONSTRUCTORS)));
+    gboolean result;
+
+    attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+                  LTTV_IATTRIBUTE(attributes_global),
+                  LTTV_VIEWER_CONSTRUCTORS));
+    g_assert(attribute);
   
-    g_assert(lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute),
-                            name, LTTV_POINTER, &value));
+    result = lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute),
+                            name, LTTV_POINTER, &value);
+    g_assert(result);
 
     *(value.v_pointer) = view_constructor;
 
@@ -337,13 +339,14 @@ void lttvwindow_register_constructor
  */
 
 
-void lttvwindow_unregister_constructor
+__EXPORT void lttvwindow_unregister_constructor
                   (lttvwindow_viewer_constructor view_constructor)
 {
   LttvIAttribute *attributes_global = LTTV_IATTRIBUTE(lttv_global_attributes());
   LttvToolbars * toolbar;
   LttvMenus * menu;
   LttvAttributeValue value;
+	gboolean is_named;
 
   g_assert(lttv_iattribute_find_by_path(attributes_global,
      "viewers/toolbar", LTTV_POINTER, &value));
@@ -369,10 +372,10 @@ void lttvwindow_unregister_constructor
 
   {
     LttvAttribute *attribute;
-    g_assert(attribute = 
-      LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
-                                LTTV_IATTRIBUTE(attributes_global),
-                                LTTV_VIEWER_CONSTRUCTORS)));
+    attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+         LTTV_IATTRIBUTE(attributes_global),
+         LTTV_VIEWER_CONSTRUCTORS));
+    g_assert(attribute);
   
     guint num = lttv_iattribute_get_number(LTTV_IATTRIBUTE(attribute));
     guint i;
@@ -381,7 +384,8 @@ void lttvwindow_unregister_constructor
     LttvAttributeType type;
     
     for(i=0;i<num;i++) {
-      type = lttv_iattribute_get(LTTV_IATTRIBUTE(attribute), i, &name, &value);
+      type = lttv_iattribute_get(LTTV_IATTRIBUTE(attribute), i, &name, &value,
+					&is_named);
       g_assert(type == LTTV_POINTER);
       if(*(value.v_pointer) == view_constructor) {
         lttv_iattribute_remove(LTTV_IATTRIBUTE(attribute), i);
@@ -399,7 +403,7 @@ void lttvwindow_unregister_constructor
  * @param hook hook function of the viewer.
  * @param hook_data hook data associated with the hook function.
  */
-void lttvwindow_register_time_window_notify(Tab *tab,
+__EXPORT void lttvwindow_register_time_window_notify(Tab *tab,
     LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -423,7 +427,7 @@ void lttvwindow_register_time_window_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_time_window_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_time_window_notify(Tab *tab,
     LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -443,7 +447,7 @@ void lttvwindow_unregister_time_window_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_traceset_notify(Tab *tab,
+__EXPORT void lttvwindow_register_traceset_notify(Tab *tab,
     LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -467,7 +471,7 @@ void lttvwindow_register_traceset_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_traceset_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_traceset_notify(Tab *tab,
               LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -487,7 +491,7 @@ void lttvwindow_unregister_traceset_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_redraw_notify(Tab *tab,
+__EXPORT void lttvwindow_register_redraw_notify(Tab *tab,
     LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -511,7 +515,7 @@ void lttvwindow_register_redraw_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_redraw_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_redraw_notify(Tab *tab,
               LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -537,7 +541,7 @@ void lttvwindow_unregister_redraw_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_continue_notify(Tab *tab,
+__EXPORT void lttvwindow_register_continue_notify(Tab *tab,
     LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -562,7 +566,7 @@ void lttvwindow_register_continue_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_continue_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_continue_notify(Tab *tab,
               LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -583,7 +587,7 @@ void lttvwindow_unregister_continue_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_filter_notify(Tab *tab,
+__EXPORT void lttvwindow_register_filter_notify(Tab *tab,
       LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -607,7 +611,7 @@ void lttvwindow_register_filter_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_filter_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_filter_notify(Tab *tab,
                                          LttvHook hook,
                                          gpointer hook_data)
 {
@@ -628,7 +632,7 @@ void lttvwindow_unregister_filter_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_current_time_notify(Tab *tab,
+__EXPORT void lttvwindow_register_current_time_notify(Tab *tab,
             LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -652,7 +656,7 @@ void lttvwindow_register_current_time_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_current_time_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_current_time_notify(Tab *tab,
             LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -672,7 +676,7 @@ void lttvwindow_unregister_current_time_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_register_current_position_notify(Tab *tab,
+__EXPORT void lttvwindow_register_current_position_notify(Tab *tab,
             LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -696,7 +700,7 @@ void lttvwindow_register_current_position_notify(Tab *tab,
  * @param hook_data hook data associated with the hook function.
  */
 
-void lttvwindow_unregister_current_position_notify(Tab *tab,
+__EXPORT void lttvwindow_unregister_current_position_notify(Tab *tab,
             LttvHook hook, gpointer hook_data)
 {
   LttvAttributeValue value;
@@ -807,8 +811,8 @@ void lttvwindow_unregister_dividor(Tab *tab,
  * @param time_interval a pointer where time interval is stored.
  */
 
-void lttvwindow_report_time_window(Tab *tab,
-                                   TimeWindow time_window)
+__EXPORT void lttvwindow_report_time_window(Tab *tab,
+                                            TimeWindow time_window)
 {
   //set_time_window(tab, time_window);
   //set_time_window_adjustment(tab, time_window);
@@ -866,12 +870,9 @@ void lttvwindow_report_time_window(Tab *tab,
  * @param time a pointer where time is stored.
  */
 
-void lttvwindow_report_current_time(Tab *tab,
+__EXPORT void lttvwindow_report_current_time(Tab *tab,
                                     LttTime time)
 {
-  LttvAttributeValue value;
-  LttvHooks * tmp;
-  
   current_time_change_manager(tab, time);
 }
 
@@ -883,12 +884,9 @@ void lttvwindow_report_current_time(Tab *tab,
  * @param time a pointer where time is stored.
  */
 
-void lttvwindow_report_current_position(Tab *tab,
+__EXPORT void lttvwindow_report_current_position(Tab *tab,
                                         LttvTracesetContextPosition *pos)
 {
-  LttvAttributeValue value;
-  LttvHooks * tmp;
-  
   current_position_change_manager(tab, pos);
 }
 
@@ -930,8 +928,8 @@ void lttvwindow_report_dividor(Tab *tab, gint position)
  * @param events_requested the structure of request from.
  */
 
-void lttvwindow_events_request(Tab *tab,
-                               EventsRequest  *events_request)
+__EXPORT void lttvwindow_events_request(Tab *tab,
+                                        EventsRequest  *events_request)
 {
   tab->events_requests = g_slist_append(tab->events_requests, events_request);
   
@@ -941,7 +939,7 @@ void lttvwindow_events_request(Tab *tab,
      * our job. Mathieu : test with high prio higher than events for better
      * scrolling. */
     //g_idle_add_full((G_PRIORITY_HIGH_IDLE + 21),
-    g_idle_add_full((G_PRIORITY_DEFAULT - 2),
+    g_idle_add_full((G_PRIORITY_DEFAULT + 2),
                     (GSourceFunc)execute_events_requests,
                     tab,
                     NULL);
@@ -966,7 +964,7 @@ gint find_viewer (const EventsRequest *a, gconstpointer b)
 }
 
 
-void lttvwindow_events_request_remove_all(Tab       *tab,
+__EXPORT void lttvwindow_events_request_remove_all(Tab       *tab,
                                           gconstpointer   viewer)
 {
   GSList *element = tab->events_requests;
@@ -995,6 +993,27 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
 
 }
 
+
+/**
+ * Function to see if there are events request pending.
+ *
+ * It tells if events requests are pending. Useful for checks in some events,
+ * i.e. detailed event list scrolling.
+ * 
+ * @param tab the tab the viewer belongs to.
+ * @param viewer a pointer to the viewer data structure
+ * @return : TRUE is events requests are pending, else FALSE.
+ */
+
+__EXPORT gboolean lttvwindow_events_request_pending(Tab            *tab)
+{
+  GSList *element = tab->events_requests;
+
+  if(element == NULL) return FALSE;
+  else return TRUE;
+}
+
+
 /**
  * Function to get the current time interval shown on the current tab.
  * It will be called by a viewer's hook function to update the 
@@ -1004,7 +1023,7 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
  * @return time window.
  */
 
-TimeWindow lttvwindow_get_time_window(Tab *tab)
+__EXPORT TimeWindow lttvwindow_get_time_window(Tab *tab)
 {
   return tab->time_window;
 }
@@ -1018,7 +1037,7 @@ TimeWindow lttvwindow_get_time_window(Tab *tab)
  * @return time
  */
 
-LttTime lttvwindow_get_current_time(Tab *tab)
+__EXPORT LttTime lttvwindow_get_current_time(Tab *tab)
 {
   return tab->current_time;
 }
@@ -1030,9 +1049,9 @@ LttTime lttvwindow_get_current_time(Tab *tab)
  *
  * returns the current filter
  */
-LttvFilter *lttvwindow_get_filter(Tab *tab)
+__EXPORT LttvFilter *lttvwindow_get_filter(Tab *tab)
 {
-  return tab->filter;
+  return g_object_get_data(G_OBJECT(tab->vbox), "filter");
 }
 
 /**
@@ -1047,14 +1066,13 @@ LttvFilter *lttvwindow_get_filter(Tab *tab)
  * @param main_win, the main window the viewer belongs to.
  * @param filter, a pointer to a filter.
  */
-
 void lttvwindow_report_filter(Tab *tab, LttvFilter *filter)
 {
   LttvAttributeValue value;
   LttvHooks * tmp;
 
-  lttv_filter_destroy(tab->filter);
-  tab->filter = filter;
+  //lttv_filter_destroy(tab->filter);
+  //tab->filter = filter;
   
   g_assert(lttv_iattribute_find_by_path(tab->attributes,
            "hooks/updatefilter", LTTV_POINTER, &value));
@@ -1070,13 +1088,12 @@ void lttvwindow_report_filter(Tab *tab, LttvFilter *filter)
  * @param tab viewer's tab 
  */
 
-LttvTracesetStats* lttvwindow_get_traceset_stats(Tab *tab)
+__EXPORT LttvTracesetStats* lttvwindow_get_traceset_stats(Tab *tab)
 {
   return tab->traceset_info->traceset_context;
 }
 
-
-LttvTracesetContext* lttvwindow_get_traceset_context(Tab *tab)
+__EXPORT LttvTracesetContext* lttvwindow_get_traceset_context(Tab *tab)
 {
   return (LttvTracesetContext*)tab->traceset_info->traceset_context;
 }
@@ -1093,9 +1110,7 @@ void events_request_free(EventsRequest *events_request)
   if(events_request->hooks != NULL) {
     guint i;
     GArray *hooks = events_request->hooks;
-    for(i=0;i<hooks->len;i++) {
-      lttv_trace_hook_destroy(&g_array_index(hooks, LttvTraceHook, i));
-    }
+    lttv_trace_hook_remove_all(&hooks);
     g_array_free(events_request->hooks, TRUE);
   }
   if(events_request->before_chunk_traceset != NULL)
@@ -1124,7 +1139,7 @@ void events_request_free(EventsRequest *events_request)
 
 
 
-GtkWidget *main_window_get_widget(Tab *tab)
+__EXPORT GtkWidget *main_window_get_widget(Tab *tab)
 {
   return tab->mw->mwindow;
 }