X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=297b2a3b25fcee9fb3f1b101de40e2c81c3f6b5f;hb=0c5dbe3b7a45055b7ed07cd497b51801b3e8310e;hp=e121714437dd6fe936640b8109ea7004103a5bf3;hpb=84ddf5c933843f7b313a6dc4347ea6b5fb834557;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index e1217144..297b2a3b 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -256,13 +256,13 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); + LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time); g_object_set(G_OBJECT(adjustment), "lower", - ltt_time_to_double(time_span.start_time) - * NANOSECONDS_PER_SECOND, /* lower */ + 0.0, /* lower */ "upper", - ltt_time_to_double(time_span.end_time) + ltt_time_to_double(upper) * NANOSECONDS_PER_SECOND, /* upper */ "step_increment", ltt_time_to_double(tab->time_window.time_width) @@ -279,8 +279,9 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) g_object_set(G_OBJECT(adjustment), "value", - ltt_time_to_double(tab->time_window.start_time) - * NANOSECONDS_PER_SECOND, /* value */ + ltt_time_to_double( + ltt_time_sub(tab->time_window.start_time, time_span.start_time)) + * NANOSECONDS_PER_SECOND, /* value */ NULL); gtk_adjustment_value_changed(adjustment); @@ -740,10 +741,13 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* Events processing algorithm implementation */ + /* Warning : the gtk_events_pending takes a LOT of cpu time. So what we do + * instead is to leave the control to GTK and take it back. + */ /* A. Servicing loop */ - while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { - /* && !gtk_events_pending() ) */ - + //while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { + if((g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { + /* Servicing */ /* 1. If list_in is empty (need a seek) */ if( g_slist_length(list_in) == 0 ) { @@ -1011,7 +1015,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->event, events_request->event_by_id); } - + /* Go to next */ if(remove) { @@ -1113,8 +1117,11 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position); tfc = lttv_traceset_context_get_current_tfc(tsc); - g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec, + if(tfc != NULL) + g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec, tfc->timestamp.tv_nsec); + else + g_debug("End of trace reached after middle."); } { @@ -1231,9 +1238,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } } - - if(gtk_events_pending()) break; } + /* End of removed servicing loop : leave control to GTK instead. */ + // if(gtk_events_pending()) break; + //} /* B. When interrupted between chunks */ @@ -1988,15 +1996,15 @@ void zoom(GtkWidget * widget, double size) // // + LttTime rel_time = + ltt_time_sub(new_time_window.start_time, time_span.start_time); if( ltt_time_to_double(new_time_window.time_width) * NANOSECONDS_PER_SECOND / SCROLL_STEP_PER_PAGE/* step increment */ + - ltt_time_to_double(new_time_window.start_time) - * NANOSECONDS_PER_SECOND /* page size */ + ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */ == - ltt_time_to_double(new_time_window.start_time) - * NANOSECONDS_PER_SECOND /* page size */ + ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */ ) { g_warning("Can not zoom that far due to scrollbar precision"); } else if( @@ -2016,10 +2024,10 @@ void zoom(GtkWidget * widget, double size) //ltt_time_to_double(new_time_window.start_time) // * NANOSECONDS_PER_SECOND, /* value */ "lower", - ltt_time_to_double(time_span.start_time) - * NANOSECONDS_PER_SECOND, /* lower */ + 0.0, /* lower */ "upper", - ltt_time_to_double(time_span.end_time) + 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(new_time_window.time_width) @@ -2037,7 +2045,8 @@ void zoom(GtkWidget * widget, double size) //gtk_adjustment_value_changed(adjustment); g_object_set(G_OBJECT(adjustment), "value", - ltt_time_to_double(new_time_window.start_time) + ltt_time_to_double( + ltt_time_sub(new_time_window.start_time, time_span.start_time)) * NANOSECONDS_PER_SECOND, /* value */ NULL); gtk_adjustment_value_changed(adjustment); @@ -3082,17 +3091,16 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, { Tab *tab = (Tab *)user_data; TimeWindow time_window; - TimeInterval *time_span; LttTime time; GtkAdjustment *adjust = gtk_range_get_adjustment(GTK_RANGE(scrollbar)); gdouble value = gtk_adjustment_get_value(adjust); gdouble upper, lower, ratio, page_size; LttvTracesetContext * tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; //time_window = tab->time_window; - time_span = &tsc->time_span ; lower = adjust->lower; upper = adjust->upper; ratio = (value - lower) / (upper - lower); @@ -3101,7 +3109,8 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, //time = ltt_time_sub(time_span->end_time, time_span->start_time); //time = ltt_time_mul(time, (float)ratio); //time = ltt_time_add(time_span->start_time, time); - time = ltt_time_from_double(value/NANOSECONDS_PER_SECOND); + time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time_span.start_time); time_window.start_time = time; @@ -3109,7 +3118,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, time_window.time_width = ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); - //time = ltt_time_sub(time_span->end_time, time); + //time = ltt_time_sub(time_span.end_time, time); //if(ltt_time_compare(time,time_window.time_width) < 0){ // time_window.time_width = time; //} @@ -3756,8 +3765,8 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); - tab->vbox = gtk_vbox_new(FALSE, 0); - tab->viewer_container = gtk_vbox_new(TRUE, 0); + tab->vbox = gtk_vbox_new(FALSE, 2); + tab->viewer_container = gtk_vbox_new(TRUE, 2); tab->scrollbar = gtk_hscrollbar_new(NULL); //tab->multivpaned = gtk_multi_vpaned_new();