X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=e0e677fceb3db170f724b80d2902ac6c29d95416;hb=c74e0cf9bdbda21d13d48be89bc9fd3e257c9b9e;hp=273207da007bda0ed98840e7c71bf34cc4179a58;hpb=e025a729300a06b0de77a8c63d7256fed2658ccb;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 273207da..e0e677fc 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -879,6 +879,8 @@ static void events_request_free(EventsRequest *events_request) lttv_traceset_context_position_destroy(events_request->start_position); if(events_request->end_position != NULL) lttv_traceset_context_position_destroy(events_request->end_position); + if(events_request->hooks != NULL) + g_array_free(events_request->hooks, TRUE); if(events_request->before_chunk_traceset != NULL) lttv_hooks_destroy(events_request->before_chunk_traceset); if(events_request->before_chunk_trace != NULL) @@ -1223,11 +1225,27 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* 1.3.2 call before chunk * 1.3.3 events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } } } } else { @@ -1244,11 +1262,27 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Call before chunk * - events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, events_request->before_chunk_trace, events_request->before_chunk_tracefile, events_request->event, events_request->event_by_id); + } iter = g_slist_next(iter); } @@ -1292,11 +1326,29 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* call before chunk * events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } + + } /* Go to next */ @@ -1426,11 +1478,31 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + + + } + /* - Call end request for req */ lttv_hooks_call(events_request->after_request, (gpointer)tsc); @@ -1465,12 +1537,29 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + } + /* - req.num -= count */ g_assert(events_request->num_events >= count); events_request->num_events -= count; @@ -3365,18 +3454,15 @@ void time_change_manager (Tab *tab, "lower", 0.0, /* lower */ "upper", - ltt_time_to_double(upper) - * NANOSECONDS_PER_SECOND, /* upper */ + ltt_time_to_double(upper), /* upper */ "step_increment", ltt_time_to_double(new_time_window.time_width) - / SCROLL_STEP_PER_PAGE - * NANOSECONDS_PER_SECOND, /* step increment */ + / SCROLL_STEP_PER_PAGE, /* step increment */ "page_increment", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page increment */ + ltt_time_to_double(new_time_window.time_width), + /* page increment */ "page_size", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page size */ + ltt_time_to_double(new_time_window.time_width), /* page size */ NULL); gtk_adjustment_changed(adjustment); @@ -3384,13 +3470,12 @@ void time_change_manager (Tab *tab, // "value", // ltt_time_to_double( // ltt_time_sub(start_time, time_span.start_time)) - // * NANOSECONDS_PER_SECOND, /* value */ + // , /* value */ // NULL); //gtk_adjustment_value_changed(adjustment); gtk_range_set_value(GTK_RANGE(tab->scrollbar), ltt_time_to_double( - ltt_time_sub(start_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND /* value */); + ltt_time_sub(start_time, time_span.start_time)) /* value */); /* set the time bar. */ /* start seconds */ @@ -3752,7 +3837,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; - time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); new_time_window.start_time = time; @@ -3760,7 +3845,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; new_time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); time_change_manager(tab, new_time_window); @@ -3775,7 +3860,7 @@ 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_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); time_window.start_time = time; @@ -3783,7 +3868,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); //time = ltt_time_sub(time_span.end_time, time); //if(ltt_time_compare(time,time_window.time_width) < 0){ // time_window.time_width = time; @@ -4367,7 +4452,7 @@ void tab_destructor(Tab * tab) int i, nb, ref_count; LttvTrace * trace; - g_object_unref(tab->tooltips); + gtk_object_destroy(GTK_OBJECT(tab->tooltips)); if(tab->attributes) g_object_unref(tab->attributes);