X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=268c8156f83c8647e926d4faeec7c18eeddb1109;hb=a7804dbc9bd7727d426e78c977511c36bfc6af1c;hp=a379df5d8152a03ffdafcb7baa53967a92a404b6;hpb=efcd775db82bb1fec940c8e3cc8dd00b8de794a0;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 a379df5d..268c8156 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
@@ -261,7 +263,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,
@@ -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));
@@ -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,7 +870,7 @@ 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;
@@ -883,7 +887,7 @@ 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;
@@ -930,8 +934,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);
   
@@ -966,7 +970,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;
@@ -1007,7 +1011,7 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
  * @return : TRUE is events requests are pending, else FALSE.
  */
 
-gboolean lttvwindow_events_request_pending(Tab            *tab)
+__EXPORT gboolean lttvwindow_events_request_pending(Tab            *tab)
 {
   GSList *element = tab->events_requests;
 
@@ -1016,8 +1020,6 @@ gboolean lttvwindow_events_request_pending(Tab            *tab)
 }
 
 
-
-
 /**
  * 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 
@@ -1027,7 +1029,7 @@ gboolean lttvwindow_events_request_pending(Tab            *tab)
  * @return time window.
  */
 
-TimeWindow lttvwindow_get_time_window(Tab *tab)
+__EXPORT TimeWindow lttvwindow_get_time_window(Tab *tab)
 {
   return tab->time_window;
 }
@@ -1041,7 +1043,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;
 }
@@ -1053,9 +1055,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");
 }
 
 /**
@@ -1070,14 +1072,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));
@@ -1093,13 +1094,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;
 }
@@ -1147,7 +1147,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;
 }