X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ftracecontext.c;h=8634b1be564dc835ebddcac73495b71e586e6670;hb=78b82ded59fb3f65ed0829cd1cad36475ae4d0fb;hp=cb7d41857097f76030ae4b85b72d64396d8145f7;hpb=d448fce24840c50fbd998d06a7daa595859df2ff;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c index cb7d4185..8634b1be 100644 --- a/ltt/branches/poly/lttv/lttv/tracecontext.c +++ b/ltt/branches/poly/lttv/lttv/tracecontext.c @@ -681,7 +681,7 @@ void lttv_process_traceset_begin(LttvTracesetContext *self, } -enum read_state { LAST_NONE, LAST_OK, LAST_EMPTY }; +//enum read_state { LAST_NONE, LAST_OK, LAST_EMPTY }; /* Note : a _middle must be preceded from a _seek or another middle */ guint lttv_process_traceset_middle(LttvTracesetContext *self, @@ -701,9 +701,9 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, guint read_ret; - enum read_state last_read_state = LAST_NONE; + //enum read_state last_read_state = LAST_NONE; - gboolean last_ret = FALSE; /* return value of the last hook list called */ + gint last_ret = 0; /* return value of the last hook list called */ /* Get the next event from the pqueue, call its hooks, reinsert in the pqueue the following event from the same tracefile @@ -755,22 +755,32 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, g_tree_foreach(pqueue, test_tree, tfc); #endif //DEBUG + e = ltt_tracefile_get_event(tfc->tf); - if(last_read_state != LAST_EMPTY) { - /* Only call hooks if the last read has given an event or if we are at the - * first pass (not if last read returned end of tracefile) */ - count++; - - fac_id = ltt_event_facility_id(e); - ev_id = ltt_event_eventtype_id(e); - id = GET_HOOK_ID(fac_id, ev_id); - last_ret = lttv_hooks_call_merge(tfc->event, tfc, - lttv_hooks_by_id_get(tfc->event_by_id, id), tfc); + //if(last_read_state != LAST_EMPTY) { + /* Only call hooks if the last read has given an event or if we are at the + * first pass (not if last read returned end of tracefile) */ + count++; + + fac_id = ltt_event_facility_id(e); + ev_id = ltt_event_eventtype_id(e); + id = GET_HOOK_ID(fac_id, ev_id); + /* Hooks : + * return values : 0 : continue read, 1 : go to next position and stop read, + * 2 : stay at the current position and stop read */ + last_ret = lttv_hooks_call_merge(tfc->event, tfc, + lttv_hooks_by_id_get(tfc->event_by_id, id), tfc); + + if(unlikely(last_ret == 2)) { + /* This is a case where we want to stay at this position and stop read. */ + g_tree_insert(pqueue, tfc, tfc); + return count - 1; } read_ret = ltt_tracefile_read(tfc->tf); - + + if(likely(!read_ret)) { //g_debug("An event is ready"); tfc->timestamp = ltt_event_time(e); @@ -783,12 +793,12 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, g_tree_foreach(pqueue, test_tree, NULL); #endif //DEBUG - last_read_state = LAST_OK; + //last_read_state = LAST_OK; } else { tfc->timestamp = ltt_time_infinite; if(read_ret == ERANGE) { - last_read_state = LAST_EMPTY; + // last_read_state = LAST_EMPTY; g_debug("End of trace"); } else g_error("Error happened in lttv_process_traceset_middle"); @@ -1248,13 +1258,15 @@ gint lttv_traceset_context_pos_pos_compare( const LttvTracesetContextPosition *pos2) { int i, j; - int ret; + int ret = 0; - if(pos1->tfcp->len == 0) { - if(pos2->tfcp->len == 0) return 0; - else return 1; + if(ltt_time_compare(pos1->timestamp, ltt_time_infinite) == 0) { + if(ltt_time_compare(pos2->timestamp, ltt_time_infinite) == 0) + return 0; + else + return 1; } - if(pos2->tfcp->len == 0) + if(ltt_time_compare(pos2->timestamp, ltt_time_infinite) == 0) return -1; for(i=0;itfcp->len;i++) { @@ -1345,7 +1357,7 @@ static gint seek_back_event_hook(void *hook_data, void* call_data) LttvTracesetContext *tsc = tfc->t_context->ts_context; LttvTracesetContextPosition *pos; - if(sd->filter != NULL) { + if(sd->filter != NULL && sd->filter->head != NULL) { if(!lttv_filter_tree_parse(sd->filter->head, ltt_tracefile_get_event(tfc->tf), tfc->tf, @@ -1409,6 +1421,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self, LttvTracesetContextPosition *saved_pos = lttv_traceset_context_position_new(self); LttTime time; + LttTime asked_time; LttTime time_offset; struct seek_back_data sd; LttvHooks *hooks = lttv_hooks_new(); @@ -1431,6 +1444,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self, if(ltt_time_compare(time, self->time_span.end_time) > 0) { time = self->time_span.end_time; } + asked_time = time; time_offset = first_offset; lttv_hooks_add(hooks, seek_back_event_hook, &sd, LTTV_PRIO_DEFAULT); @@ -1439,14 +1453,15 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self, while(1) { /* stop criteria : - n events found - * - time < beginning of trace */ - if(ltt_time_compare(time, self->time_span.start_time) < 0) break; + * - asked_time < beginning of trace */ + if(ltt_time_compare(asked_time, self->time_span.start_time) < 0) break; lttv_traceset_context_position_copy(end_pos, next_iter_end_pos); /* We must seek the traceset back to time - time_offset */ /* this time becomes the new reference time */ time = ltt_time_sub(time, time_offset); + asked_time = time; time_seeker(self, time); lttv_traceset_context_position_save(self, next_iter_end_pos); @@ -1538,12 +1553,13 @@ static gint seek_forward_event_hook(void *hook_data, void* call_data) return FALSE; } - sd->event_count++; if(sd->event_count >= sd->n) - return TRUE; - else + return 2; /* Stay at the same position */ + else { + sd->event_count++; return FALSE; + } } /* Seek back n events forward from the current position