X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=076045bf24adbd3b0e80ef738befce1cdd1bf128;hb=34b12b7dae6bd07257749e62ff5166e75cebf8b0;hp=f7035ea35566f9599b8520ac2465af82205a796f;hpb=20fde85fa4660fbc6ec44101c8d7e9fe2aca94fa;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 f7035ea3..076045bf 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c @@ -41,91 +41,20 @@ #include // for execute_events_requests #include - /** * Internal function parts */ extern GSList * g_main_window_list; -/** - * Function to set/update traceset for the viewers - * @param tab viewer's tab - * @param traceset traceset of the main window. - * return value : - * -1 : error - * 0 : traceset updated - * 1 : no traceset hooks to update; not an error. - */ - -int SetTraceset(Tab * tab, LttvTraceset *traceset) -{ - LttvHooks * tmp; - LttvAttributeValue value; - - if( lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatetraceset", LTTV_POINTER, &value) != 0) - return -1; - - tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return 1; - - - lttv_hooks_call(tmp,traceset); - - return 0; -} - - -/** - * Function to set/update filter for the viewers - * @param tab viewer's tab - * @param filter filter of the main window. - * return value : - * -1 : error - * 0 : filters updated - * 1 : no filter hooks to update; not an error. - */ - -int SetFilter(Tab * tab, gpointer filter) -{ - LttvHooks * tmp; - LttvAttributeValue value; - - if(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatefilter", LTTV_POINTER, &value) != 0) - return -1; - - tmp = (LttvHooks*)*(value.v_pointer); - - if(tmp == NULL) return 1; - lttv_hooks_call(tmp,filter); - - return 0; -} - -/** - * Function to redraw each viewer belonging to the current tab - * @param tab viewer's tab +/* set_time_window + * + * It updates the time window of the tab, then calls the updatetimewindow + * hooks of each viewer. + * + * This is called whenever the scrollbar value changes. */ -void update_traceset(Tab *tab) -{ - LttvAttributeValue value; - LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatetraceset", LTTV_POINTER, &value)); - tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return; - lttv_hooks_call(tmp, NULL); -} - -void set_time_window_adjustment(Tab *tab, const TimeWindow* new_time_window) -{ - gtk_multi_vpaned_set_adjust(tab->multi_vpaned, new_time_window, FALSE); -} - - void set_time_window(Tab *tab, const TimeWindow *time_window) { LttvAttributeValue value; @@ -141,9 +70,9 @@ void set_time_window(Tab *tab, const TimeWindow *time_window) g_assert(lttv_iattribute_find_by_path(tab->attributes, "hooks/updatetimewindow", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return; - lttv_hooks_call(tmp, &time_window_notify_data); + if(tmp != NULL) lttv_hooks_call(tmp, &time_window_notify_data); + //gtk_multi_vpaned_set_adjust(tab->multi_vpaned, new_time_window, FALSE); } @@ -464,6 +393,102 @@ void lttvwindow_unregister_traceset_notify(Tab *tab, lttv_hooks_remove_data(tmp, hook, hook_data); } +/** + * Function to register a hook function for a viewer be completely redrawn. + * + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_register_redraw_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/redraw", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL){ + tmp = lttv_hooks_new(); + *(value.v_pointer) = tmp; + } + lttv_hooks_add(tmp, hook, hook_data, LTTV_PRIO_DEFAULT); +} + + +/** + * Function to unregister a hook function for a viewer be completely redrawn. + * + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_unregister_redraw_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/redraw", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) return; + lttv_hooks_remove_data(tmp, hook, hook_data); +} + +/** + * Function to register a hook function for a viewer to re-do the events + * requests for the needed interval. + * + * This action is typically done after a "stop". + * + * The typical hook will remove all current requests for the viewer + * and make requests for missing information. + * + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_register_continue_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/continue", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL){ + tmp = lttv_hooks_new(); + *(value.v_pointer) = tmp; + } + lttv_hooks_add(tmp, hook, hook_data, LTTV_PRIO_DEFAULT); +} + + +/** + * Function to unregister a hook function for a viewer to re-do the events + * requests for the needed interval. + * + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_unregister_continue_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/continue", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) return; + lttv_hooks_remove_data(tmp, hook, hook_data); +} + + /** * Function to register a hook function for a viewer to set/update its * filter. @@ -644,19 +669,6 @@ void lttvwindow_unregister_dividor(Tab *tab, } -/** - * Update the status bar whenever something changed in the viewer. - * @param tab viewer's tab - * @param info the message which will be shown in the status bar. - */ - -void lttvwindow_report_status(Tab *tab, const char *info) -{ - //FIXME - g_warning("update_status not implemented in viewer.c"); - // Use tab->mw for status -} - /** * Function to set the time interval of the current tab. * It will be called by a viewer's signal handle associated with @@ -668,8 +680,47 @@ void lttvwindow_report_status(Tab *tab, const char *info) void lttvwindow_report_time_window(Tab *tab, const TimeWindow *time_window) { - set_time_window(tab, time_window); - set_time_window_adjustment(tab, time_window); + //set_time_window(tab, time_window); + //set_time_window_adjustment(tab, time_window); + + /* Set scrollbar */ + LttvTracesetContext *tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); + + g_object_set(G_OBJECT(adjustment), + "lower", + 0.0, /* lower */ + "upper", + ltt_time_to_double( + ltt_time_sub(time_span.end_time, time_span.start_time)) + * NANOSECONDS_PER_SECOND, /* upper */ + "step_increment", + ltt_time_to_double(time_window->time_width) + / SCROLL_STEP_PER_PAGE + * NANOSECONDS_PER_SECOND, /* step increment */ + "page_increment", + ltt_time_to_double(time_window->time_width) + * NANOSECONDS_PER_SECOND, /* page increment */ + "page_size", + ltt_time_to_double(time_window->time_width) + * NANOSECONDS_PER_SECOND, /* page size */ + NULL); + gtk_adjustment_changed(adjustment); + + //g_object_set(G_OBJECT(adjustment), + // "value", + // ltt_time_to_double(time_window->start_time) + // * NANOSECONDS_PER_SECOND, /* value */ + // NULL); + /* Note : the set value will call set_time_window if scrollbar value changed + */ + gtk_adjustment_set_value(adjustment, + ltt_time_to_double( + ltt_time_sub(time_window->start_time, + time_span.start_time)) + * NANOSECONDS_PER_SECOND); } @@ -725,8 +776,9 @@ void lttvwindow_report_dividor(Tab *tab, gint position) void lttvwindow_report_focus(Tab *tab, GtkWidget *top_widget) { - gtk_multi_vpaned_set_focus((GtkWidget*)tab->multi_vpaned, - GTK_PANED(gtk_widget_get_parent(top_widget))); + //FIXME + //gtk_multi_vpaned_set_focus(tab->multivpaned, + // GTK_PANED(gtk_widget_get_parent(top_widget))); } @@ -755,8 +807,9 @@ void lttvwindow_events_request(Tab *tab, if(!tab->events_request_pending) { - /* Redraw has +20 priority. We want a prio higher than that, so +19 */ - g_idle_add_full((G_PRIORITY_HIGH_IDLE + 19), + /* Redraw has +20 priority. We want to let the redraw be done while we do + * our job. */ + g_idle_add_full((G_PRIORITY_HIGH_IDLE + 21), (GSourceFunc)execute_events_requests, tab, NULL); @@ -791,13 +844,20 @@ void lttvwindow_events_request_remove_all(Tab *tab, (GCompareFunc)find_viewer)) != NULL) { EventsRequest *events_request = (EventsRequest *)element->data; - if(events_request->servicing == TRUE) { - lttv_hooks_call(events_request->after_request, NULL); - } + // Modified so a viewer being destroyed won't have its after_request + // called. Not so important anyway. Note that a viewer that call this + // remove_all function will not get its after_request called. + //if(events_request->servicing == TRUE) { + // lttv_hooks_call(events_request->after_request, NULL); + //} g_free(events_request); tab->events_requests = g_slist_remove_link(tab->events_requests, element); - } + if(g_slist_length(tab->events_requests) == 0) { + tab->events_request_pending = FALSE; + g_idle_remove_by_data(tab); + } + } @@ -808,12 +868,12 @@ void lttvwindow_events_request_remove_all(Tab *tab, * shown time interval of the viewer and also be called by the constructor * of the viewer. * @param tab viewer's tab - * @param time_interval a pointer where time interval will be stored. + * @return time window. */ -const TimeWindow *lttvwindow_get_time_window(Tab *tab) +TimeWindow lttvwindow_get_time_window(Tab *tab) { - return &(tab->time_window); + return tab->time_window; } @@ -823,12 +883,12 @@ const TimeWindow *lttvwindow_get_time_window(Tab *tab) * It will be called by a viewer's hook function to update the * current time/event of the viewer. * @param tab viewer's tab - * @param time a pointer where time will be stored. + * @return time */ -const LttTime *lttvwindow_get_current_time(Tab *tab) +LttTime lttvwindow_get_current_time(Tab *tab) { - return &(tab->current_time); + return tab->current_time; }