*
*/
+#define list_out tab->events_requests
gboolean lttvwindow_process_pending_requests(Tab *tab)
{
GtkWidget* widget;
LttvTracesetContext *tsc;
LttvTracefileContext *tfc;
- GSList *events_requests = tab->events_requests;
- GSList *list_out = events_requests;
GSList *list_in = NULL;
LttTime end_time;
guint end_nb_events;
guint count;
LttvTracesetContextPosition *end_position;
-
if(tab == NULL)
return FALSE;
/* There is no events requests pending : we should never have been called! */
- g_assert(g_slist_length(events_requests) != 0);
+ g_assert(g_slist_length(list_out) != 0);
tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
//set the cursor to be X shape, indicating that the computer is busy in doing its job
+#if 0
new = gdk_cursor_new(GDK_X_CURSOR);
widget = lookup_widget(tab->mw->mwindow, "MToolbar1");
win = gtk_widget_get_parent_window(widget);
gdk_cursor_unref(new);
gdk_window_stick(win);
gdk_window_unstick(win);
+#endif //0
+
+ g_debug("SIZE events req len : %d", g_slist_length(list_out));
+
+ /* Preliminary check for no trace in traceset */
+ /* Unregister the routine if empty, empty list_out too */
+ if(lttv_traceset_number(tsc->ts) == 0) {
+
+ /* - For each req in list_out */
+ GSList *iter = list_out;
+
+ while(iter != NULL) {
+
+ gboolean remove = FALSE;
+ gboolean free_data = FALSE;
+ EventsRequest *events_request = (EventsRequest *)iter->data;
+
+ /* - Call end request for req */
+ if(events_request->servicing == TRUE)
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
+
+ /* - remove req from list_out */
+ /* Destroy the request */
+ remove = TRUE;
+ free_data = TRUE;
+
+ /* Go to next */
+ if(remove)
+ {
+ GSList *remove_iter = iter;
- g_debug("SIZE events req len : %d", g_slist_length(events_requests));
+ iter = g_slist_next(iter);
+ if(free_data) g_free(remove_iter->data);
+ list_out = g_slist_remove_link(list_out, remove_iter);
+ } else { // not remove
+ iter = g_slist_next(iter);
+ }
+ }
+ }
/* Events processing algorithm implementation */
/* 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)) {
+ /* && !gtk_events_pending() ) */
/* 1. If list_in is empty (need a seek) */
if( g_slist_length(list_in) == 0 ) {
lpos = g_slist_append(lpos, g_slist_nth_data(list_out, 0));
for(iter=g_slist_nth(list_out,1);iter!=NULL;iter=g_slist_next(iter)) {
/* Find all position requests with the lowest position in list_out */
- guint index_lpos = g_array_index(lpos, guint, 0);
EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0);
EventsRequest *event_request_list_out = (EventsRequest*)iter->data;
}
}
- /* 1.1.3 If lpos.start time < ltime */
{
EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0);
EventsRequest *event_request_ltime = (EventsRequest*)g_slist_nth_data(ltime, 0);
if(event_request_lpos != NULL
&& event_request_lpos->start_position != NULL) {
-
lpos_start_time = lttv_traceset_context_position_get_time(
event_request_lpos->start_position);
- if(ltt_time_compare(lpos_start_time,
- event_request_ltime->start_time)<0) {
- /* Add lpos to list_in, remove them from list_out */
-
- for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) {
- /* Add to list_in */
- EventsRequest *event_request_lpos =
- (EventsRequest*)iter->data;
-
- g_slist_append(list_in, event_request_lpos);
- /* Remove from list_out */
- g_slist_remove(list_out, event_request_lpos);
- }
+ }
+
+ /* 1.1.3 If lpos.start time < ltime */
+ if(event_request_lpos != NULL
+ && event_request_lpos->start_position != NULL
+ && ltt_time_compare(lpos_start_time,
+ event_request_ltime->start_time)<0) {
+ /* Add lpos to list_in, remove them from list_out */
+ for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) {
+ /* Add to list_in */
+ EventsRequest *event_request_lpos =
+ (EventsRequest*)iter->data;
+
+ list_in = g_slist_append(list_in, event_request_lpos);
+ /* Remove from list_out */
+ list_out = g_slist_remove(list_out, event_request_lpos);
}
} else {
/* 1.1.4 (lpos.start time >= ltime) */
EventsRequest *event_request_ltime =
(EventsRequest*)iter->data;
- g_slist_append(list_in, event_request_ltime);
+ list_in = g_slist_append(list_in, event_request_ltime);
/* Remove from list_out */
- g_slist_remove(list_out, event_request_ltime);
+ list_out = g_slist_remove(list_out, event_request_ltime);
}
}
}
tfc = lttv_traceset_context_get_current_tfc(tsc);
g_assert(g_slist_length(list_in)>0);
EventsRequest *events_request = g_slist_nth_data(list_in, 0);
+ guint seek_count;
/* 1.2.1 If first request in list_in is a time request */
if(events_request->start_position == NULL) {
/* - If first req in list_in start time != current time */
- if(tfc != NULL && ltt_time_compare(events_request->start_time,
+ if(tfc == NULL || ltt_time_compare(events_request->start_time,
tfc->timestamp) != 0)
/* - Seek to that time */
- lttv_process_traceset_seek_time(tsc, events_request->start_time);
+ g_debug("SEEK TIME : %lu, %lu", events_request->start_time.tv_sec,
+ events_request->start_time.tv_nsec);
+ //lttv_process_traceset_seek_time(tsc, events_request->start_time);
+ lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc),
+ events_request->start_time);
+
+ /* Process the traceset with only state hooks */
+ seek_count =
+ lttv_process_traceset_middle(tsc,
+ events_request->start_time,
+ G_MAXUINT, NULL);
+
+
} else {
+ LttTime pos_time;
/* Else, the first request in list_in is a position request */
/* If first req in list_in pos != current pos */
g_assert(events_request->start_position != NULL);
+ g_debug("SEEK POS time : %lu, %lu",
+ lttv_traceset_context_position_get_time(events_request->start_position).tv_sec,
+ lttv_traceset_context_position_get_time(events_request->start_position).tv_nsec);
+
+ g_debug("SEEK POS context time : %lu, %lu",
+ lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_sec,
+ lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_nsec);
if(lttv_traceset_context_ctx_pos_compare(tsc,
events_request->start_position) != 0) {
/* 1.2.2.1 Seek to that position */
- lttv_process_traceset_seek_position(tsc, events_request->start_position);
+ g_debug("SEEK POSITION");
+ //lttv_process_traceset_seek_position(tsc, events_request->start_position);
+ pos_time = lttv_traceset_context_position_get_time(events_request->start_position);
+
+ lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc),
+ pos_time);
+
+ /* Process the traceset with only state hooks */
+ seek_count =
+ lttv_process_traceset_middle(tsc,
+ ltt_time_infinite,
+ G_MAXUINT,
+ events_request->start_position);
+
+
}
}
}
/* - begin request hooks called
* - servicing = TRUE
*/
- lttv_hooks_call(events_request->before_request, NULL);
+ lttv_hooks_call(events_request->before_request, (gpointer)tsc);
events_request->servicing = TRUE;
}
/* 1.3.2 call before chunk
}
} else {
/* 2. Else, list_in is not empty, we continue a read */
- GSList *iter = NULL;
- tfc = lttv_traceset_context_get_current_tfc(tsc);
+
+ {
+ /* 2.0 For each req of list_in */
+ GSList *iter = list_in;
- /* 2.1 For each req of list_out */
- for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) {
- EventsRequest *events_request = (EventsRequest*)iter->data;
+ while(iter != NULL) {
- /* if req.start time == current context time
- * or req.start position == current position*/
- if( ltt_time_compare(events_request->start_time,
- tfc->timestamp) == 0
- ||
- (events_request->start_position != NULL
- &&
- lttv_traceset_context_ctx_pos_compare(tsc,
- events_request->start_position) == 0)
- ) {
- /* - Add to list_in, remove from list_out */
- g_slist_append(list_in, events_request);
- g_slist_remove(list_out, events_request);
-
- /* - If !servicing */
- if(events_request->servicing == FALSE) {
- /* - begin request hooks called
- * - servicing = TRUE
- */
- lttv_hooks_call(events_request->before_request, NULL);
- events_request->servicing = TRUE;
- }
- /* call before chunk
- * events hooks added
+ EventsRequest *events_request = (EventsRequest *)iter->data;
+
+ /* - 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);
+ events_request->before_chunk_trace,
+ events_request->before_chunk_tracefile,
+ events_request->event,
+ events_request->event_by_id);
+
+ iter = g_slist_next(iter);
+ }
+ }
+
+ {
+ tfc = lttv_traceset_context_get_current_tfc(tsc);
+
+ /* 2.1 For each req of list_out */
+ GSList *iter = list_out;
+
+ while(iter != NULL) {
+
+ gboolean remove = FALSE;
+ gboolean free_data = FALSE;
+ EventsRequest *events_request = (EventsRequest *)iter->data;
+
+ /* if req.start time == current context time
+ * or req.start position == current position*/
+ if( ltt_time_compare(events_request->start_time,
+ tfc->timestamp) == 0
+ ||
+ (events_request->start_position != NULL
+ &&
+ lttv_traceset_context_ctx_pos_compare(tsc,
+ events_request->start_position) == 0)
+ ) {
+ /* - Add to list_in, remove from list_out */
+ list_in = g_slist_append(list_in, events_request);
+ remove = TRUE;
+ free_data = FALSE;
+
+ /* - If !servicing */
+ if(events_request->servicing == FALSE) {
+ /* - begin request hooks called
+ * - servicing = TRUE
+ */
+ lttv_hooks_call(events_request->before_request, (gpointer)tsc);
+ events_request->servicing = TRUE;
+ }
+ /* 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);
+ }
+
+ /* Go to next */
+ if(remove)
+ {
+ GSList *remove_iter = iter;
+
+ iter = g_slist_next(iter);
+ if(free_data) g_free(remove_iter->data);
+ list_out = g_slist_remove_link(list_out, remove_iter);
+ } else { // not remove
+ iter = g_slist_next(iter);
+ }
}
}
}
{
/* 4. Call process traceset middle */
+ g_critical("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position);
+
+ tfc = lttv_traceset_context_get_current_tfc(tsc);
+ g_critical("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
+ tfc->timestamp.tv_nsec);
+
}
{
/* 5. After process traceset middle */
events_request->event,
events_request->event_by_id);
/* - Call end request for req */
- lttv_hooks_call(events_request->after_request, NULL);
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
/* - remove req from list_in */
/* Destroy the request */
}
}
}
-
{
/* 5.1 For each req in list_in */
GSList *iter = list_in;
g_assert(tfc != NULL);
/* - if req.num == 0
* or
- * current context time > req.end time
+ * current context time >= req.end time
* or
* req.end pos == current pos
* or
events_request->stop_flag == TRUE
||
ltt_time_compare(tfc->timestamp,
- events_request->end_time) > 0
+ events_request->end_time) >= 0
||
- (events_request->start_position != NULL
+ (events_request->end_position != NULL
&&
lttv_traceset_context_ctx_pos_compare(tsc,
- events_request->start_position) != 0)
+ events_request->end_position) != 0)
) {
+ g_assert(events_request->servicing == TRUE);
/* - Call end request for req
* - remove req from list_in */
- lttv_hooks_call(events_request->after_request, NULL);
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
/* - remove req from list_in */
/* Destroy the request */
remove = TRUE;
}
}
}
+
+ if(gtk_events_pending()) break;
}
/* B. When interrupted between chunks */
}
+#if 0
//set the cursor back to normal
gdk_window_set_cursor(win, NULL);
-
+#endif //0
g_assert(g_slist_length(list_in) == 0);
+
if( g_slist_length(list_out) == 0 ) {
/* Put tab's request pending flag back to normal */
tab->events_request_pending = FALSE;
+ g_critical("remove the idle fct");
return FALSE; /* Remove the idle function */
}
+ g_critical("leave the idle fct");
return TRUE; /* Leave the idle function */
}
+#undef list_out
/* add_trace_into_traceset_selector, each instance of a viewer has an associated
LTTV_TRACESET_CONTEXT(tab->traceset_info->
traceset_context),
traceset);
+
+ /* Set the tab's time window and current time if currently 0, 0 */
+ if(tab->time_window.start_time.tv_sec == 0 &&
+ tab->time_window.start_time.tv_nsec == 0)
+ tab->time_window.start_time =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time;
+ if(tab->time_window.time_width.tv_sec == 0 &&
+ tab->time_window.time_width.tv_nsec == 0) {
+ LttTime tmp_time;
+
+ if(DEFAULT_TIME_WIDTH_S <
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.end_time.tv_sec)
+ tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
+ else
+ tmp_time.tv_sec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.end_time.tv_sec;
+ tmp_time.tv_nsec = 0;
+ tab->time_window.time_width = tmp_time ;
+ }
+ if(tab->current_time.tv_sec == 0 && tab->current_time.tv_nsec == 0) {
+ tab->current_time.tv_sec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time.tv_sec;
+ tab->current_time.tv_nsec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time.tv_nsec;
+ }
+
+
//add state update hooks
lttv_state_add_event_hooks(
(LttvTracesetState*)tab->traceset_info->traceset_context);
trace_v = lttvwindowtraces_get_trace_by_name(abs_path);
if(trace_v == NULL) {
trace = ltt_trace_open(abs_path);
- if(trace == NULL) g_critical("cannot open trace %s", abs_path);
- trace_v = lttv_trace_new(trace);
- lttvwindowtraces_add_trace(trace_v);
+ if(trace == NULL) {
+ g_warning("cannot open trace %s", abs_path);
+ } else {
+ trace_v = lttv_trace_new(trace);
+ lttvwindowtraces_add_trace(trace_v);
+ lttvwindow_add_trace(tab, trace_v);
+ }
+ } else {
+ lttvwindow_add_trace(tab, trace_v);
}
- lttvwindow_add_trace(tab, trace_v);
-
gtk_widget_destroy((GtkWidget*)file_selector);
//update current tab
} else {
tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
}
- GSList *events_requests = tab->events_requests;
-
- GSList *iter = events_requests;
+ GSList *iter = tab->events_requests;
while(iter != NULL) {
GSList *remove_iter = iter;
iter = g_slist_next(iter);
g_free(remove_iter->data);
- events_requests = g_slist_remove_link(events_requests, remove_iter);
+ tab->events_requests =
+ g_slist_remove_link(tab->events_requests, remove_iter);
}
- g_assert(g_slist_length(events_requests) == 0);
+ tab->events_request_pending = FALSE;
+ g_idle_remove_by_data(tab);
+ g_assert(g_slist_length(tab->events_requests) == 0);
}
else
{
/* Center the image on the current time */
- g_critical("update is HERE");
new_time_window.start_time =
ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0));
/* If on borders, don't fall off */
gtk_widget_show((GtkWidget*)tab->multi_vpaned);
tab->mw = mw;
- {
- /* Display a label with a X */
+ /*{
+ // Display a label with a X
GtkWidget *w_hbox = gtk_hbox_new(FALSE, 4);
GtkWidget *w_label = gtk_label_new (label);
GtkWidget *pixmap = create_pixmap(GTK_WIDGET(notebook), "close.png");
G_CALLBACK (on_close_tab_X_clicked),
tab->multi_vpaned);
+ gtk_widget_set_state(w_button, GTK_STATE_ACTIVE);
+
gtk_widget_show (w_label);
gtk_widget_show (pixmap);
gtk_widget_show (w_button);
gtk_widget_show (w_hbox);
tab->label = w_hbox;
- }
+ }*/
+
+
+ tab->label = gtk_label_new (label);
+ gtk_widget_show (tab->label);
+
+
/* Start with empty events requests list */
tab->events_requests = NULL;
tab->events_request_pending = FALSE;
projects / lttv.git / blobdiff