return comparison;
}
+typedef struct _LttvTracefileContextPosition {
+ LttEventPosition *event;
+ LttvTracefileContext *tfc;
+ gboolean used; /* Tells if the tfc is at end of traceset position */
+} LttvTracefileContextPosition;
+
+
struct _LttvTracesetContextPosition {
- GArray *ep; /* Array of LttEventPosition */
- GArray *tfc; /* Array of corresponding
- TracefileContext* */
+ GArray *tfcp; /* Array of LttvTracefileContextPosition */
LttTime timestamp; /* Current time at the saved position */
/* If ltt_time_infinite : no position is
* set, else, a position is set (may be end
trace = tc->t;
ltt_trace_time_span_get(trace, &s, &e);
+ tc->time_span.start_time = s;
+ tc->time_span.end_time = e;
if(i==0){
time_span->start_time = s;
self->traces = g_new(LttvTraceContext *, nb_trace);
self->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
self->ts_a = lttv_traceset_attribute(ts);
- self->sync_position = lttv_traceset_context_position_new();
for(i = 0 ; i < nb_trace ; i++) {
tc = LTTV_TRACESET_CONTEXT_GET_CLASS(self)->new_trace_context(self);
self->traces[i] = tc;
#endif //0
}
+ self->sync_position = lttv_traceset_context_position_new(self);
self->pqueue = g_tree_new(compare_tracefile);
lttv_process_traceset_seek_time(self, ltt_time_zero);
lttv_traceset_context_compute_time_span(self, &self->time_span);
}
-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,
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 */
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);
+ last_ret = lttv_hooks_call_merge(tfc->event, tfc,
+ lttv_hooks_by_id_get(tfc->event_by_id, id), tfc);
read_ret = ltt_tracefile_read(tfc->tf);
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");
for(i = 0 ; i < nb_tracefile ; i++) {
tfc = &g_array_index(self->tracefiles, LttvTracefileContext*, i);
- //g_tree_remove(pqueue, *tfc);
+ g_tree_remove(pqueue, *tfc);
ret = ltt_tracefile_seek_time((*tfc)->tf, start);
if(ret == EPERM) g_error("error in lttv_process_trace_seek_time seek");
LttvTraceContext *tc;
- g_tree_destroy(self->pqueue);
- self->pqueue = g_tree_new(compare_tracefile);
+ //g_tree_destroy(self->pqueue);
+ //self->pqueue = g_tree_new(compare_tracefile);
nb_trace = lttv_traceset_number(self->ts);
for(i = 0 ; i < nb_trace ; i++) {
const LttvTracesetContextPosition *pos)
{
guint i;
-
- /* If a position is set, seek the traceset to this position */
+ /* If a position is set, seek the traceset to this position */
if(ltt_time_compare(pos->timestamp, ltt_time_infinite) != 0) {
- g_tree_destroy(self->pqueue);
- self->pqueue = g_tree_new(compare_tracefile);
+
+ /* Test to see if the traces has been added to the trace set :
+ * It should NEVER happen. Clear all positions if a new trace comes in. */
+ /* FIXME I know this test is not optimal : should keep a number of
+ * tracefiles variable in the traceset.. eventually */
+ guint num_traces = lttv_traceset_number(self->ts);
+ guint tf_count = 0;
+ for(i=0; i<num_traces;i++) {
+ GArray * tracefiles = self->traces[i]->tracefiles;
+ guint j;
+ guint num_tracefiles = tracefiles->len;
+ for(j=0;j<num_tracefiles;j++)
+ tf_count++;
+ }
+ g_assert(tf_count == pos->tfcp->len);
+
+
+ //g_tree_destroy(self->pqueue);
+ //self->pqueue = g_tree_new(compare_tracefile);
- for(i=0;i<pos->ep->len; i++) {
- LttEventPosition **ep = &g_array_index(pos->ep, LttEventPosition*, i);
- LttvTracefileContext **tfc =
- &g_array_index(pos->tfc, LttvTracefileContext*, i);
- if(*ep != NULL) {
- if(ltt_tracefile_seek_position((*tfc)->tf, *ep) != 0)
+ for(i=0;i<pos->tfcp->len; i++) {
+ LttvTracefileContextPosition *tfcp =
+ &g_array_index(pos->tfcp, LttvTracefileContextPosition, i);
+
+ g_tree_remove(self->pqueue, tfcp->tfc);
+
+ if(tfcp->used == TRUE) {
+ if(ltt_tracefile_seek_position(tfcp->tfc->tf, tfcp->event) != 0)
return 1;
- (*tfc)->timestamp = ltt_event_time(ltt_tracefile_get_event((*tfc)->tf));
- g_assert(ltt_time_compare((*tfc)->timestamp, ltt_time_infinite) != 0);
- g_tree_insert(self->pqueue, (*tfc), (*tfc));
+ tfcp->tfc->timestamp =
+ ltt_event_time(ltt_tracefile_get_event(tfcp->tfc->tf));
+ g_assert(ltt_time_compare(tfcp->tfc->timestamp,
+ ltt_time_infinite) != 0);
+ g_tree_insert(self->pqueue, tfcp->tfc, tfcp->tfc);
+
} else {
- (*tfc)->timestamp = ltt_time_infinite;
+ tfcp->tfc->timestamp = ltt_time_infinite;
}
}
}
}
-LttvTracesetContextPosition *lttv_traceset_context_position_new()
+
+
+LttvTracesetContextPosition *lttv_traceset_context_position_new(
+ const LttvTracesetContext *self)
{
- LttvTracesetContextPosition *pos = g_new(LttvTracesetContextPosition,1);
- pos->ep = g_array_sized_new(FALSE, TRUE, sizeof(LttEventPosition*),
- 10);
- pos->tfc = g_array_sized_new(FALSE, TRUE, sizeof(LttvTracefileContext*),
- 10);
+ guint num_traces = lttv_traceset_number(self->ts);
+ guint tf_count = 0;
+ guint i;
+
+ for(i=0; i<num_traces;i++) {
+ GArray * tracefiles = self->traces[i]->tracefiles;
+ guint j;
+ guint num_tracefiles = tracefiles->len;
+ for(j=0;j<num_tracefiles;j++)
+ tf_count++;
+ }
+ LttvTracesetContextPosition *pos =
+ g_new(LttvTracesetContextPosition, 1);
+ pos->tfcp = g_array_sized_new(FALSE, TRUE,
+ sizeof(LttvTracefileContextPosition),
+ tf_count);
+ g_array_set_size(pos->tfcp, tf_count);
+ for(i=0;i<pos->tfcp->len;i++) {
+ LttvTracefileContextPosition *tfcp =
+ &g_array_index(pos->tfcp, LttvTracefileContextPosition, i);
+ tfcp->event = ltt_event_position_new();
+ }
+
pos->timestamp = ltt_time_infinite;
return pos;
}
/* Save all positions, the ones with infinite time will have NULL
* ep. */
+/* note : a position must be destroyed when a trace is added/removed from a
+ * traceset */
void lttv_traceset_context_position_save(const LttvTracesetContext *self,
LttvTracesetContextPosition *pos)
{
guint i;
guint num_traces = lttv_traceset_number(self->ts);
+ guint tf_count = 0;
- for(i=0;i<pos->ep->len;i++){
- LttEventPosition *ep = g_array_index(pos->ep, LttEventPosition*, i);
- if(ep != NULL) g_free(ep);
- }
-
- pos->tfc = g_array_set_size(pos->tfc, 0);
- pos->ep = g_array_set_size(pos->ep, 0);
-
pos->timestamp = ltt_time_infinite;
for(i=0; i<num_traces;i++) {
guint num_tracefiles = tracefiles->len;
for(j=0;j<num_tracefiles;j++) {
+ g_assert(tf_count < pos->tfcp->len);
LttvTracefileContext **tfc = &g_array_index(tracefiles,
LttvTracefileContext*, j);
+ LttvTracefileContextPosition *tfcp =
+ &g_array_index(pos->tfcp, LttvTracefileContextPosition, tf_count);
- LttEvent *event = ltt_tracefile_get_event((*tfc)->tf);
- LttEventPosition *ep;
+ tfcp->tfc = *tfc;
if(ltt_time_compare((*tfc)->timestamp, ltt_time_infinite) != 0) {
- ep = ltt_event_position_new();
- ltt_event_position(event, ep);
+ LttEvent *event = ltt_tracefile_get_event((*tfc)->tf);
+ ltt_event_position(event, tfcp->event);
if(ltt_time_compare((*tfc)->timestamp, pos->timestamp) < 0)
pos->timestamp = (*tfc)->timestamp;
+ tfcp->used = TRUE;
} else {
- ep = NULL;
+ tfcp->used = FALSE;
}
- g_array_append_val(pos->tfc, *tfc);
- g_array_append_val(pos->ep, ep);
+
+ //g_array_append_val(pos->tfc, *tfc);
+ //g_array_append_val(pos->ep, ep);
+ tf_count++;
}
}
void lttv_traceset_context_position_destroy(LttvTracesetContextPosition *pos)
{
int i;
- LttEventPosition **ep;
- for(i=0;i<pos->ep->len;i++) {
- ep = &g_array_index(pos->ep, LttEventPosition*, i);
- if(*ep != NULL)
- g_free(*ep);
+ for(i=0;i<pos->tfcp->len;i++) {
+ LttvTracefileContextPosition *tfcp =
+ &g_array_index(pos->tfcp, LttvTracefileContextPosition, i);
+ g_free(tfcp->event);
+ tfcp->event = NULL;
+ tfcp->used = FALSE;
}
- g_array_free(pos->ep, TRUE);
- g_array_free(pos->tfc, TRUE);
+ g_array_free(pos->tfcp, TRUE);
g_free(pos);
}
const LttvTracesetContextPosition *src)
{
int i;
- LttEventPosition **src_ep, **dest_ep;
+ LttvTracefileContextPosition *src_tfcp, *dest_tfcp;
- dest->ep = g_array_set_size(dest->ep, src->ep->len);
- dest->tfc = g_array_set_size(dest->tfc, src->tfc->len);
+ g_assert(src->tfcp->len == src->tfcp->len);
- for(i=0;i<src->ep->len;i++) {
- src_ep = &g_array_index(src->ep, LttEventPosition*, i);
- dest_ep = &g_array_index(dest->ep, LttEventPosition*, i);
- if(*src_ep != NULL) {
- if(*dest_ep == NULL) *dest_ep = ltt_event_position_new();
+ for(i=0;i<src->tfcp->len;i++) {
+ src_tfcp =
+ &g_array_index(src->tfcp, LttvTracefileContextPosition, i);
+ dest_tfcp =
+ &g_array_index(dest->tfcp, LttvTracefileContextPosition, i);
+
+ dest_tfcp->used = src_tfcp->used;
+ dest_tfcp->tfc = src_tfcp->tfc;
+
+ if(src_tfcp->used) {
ltt_event_position_copy(
- *dest_ep,
- *src_ep);
- } else
- *dest_ep = NULL;
- }
- for(i=0;i<src->tfc->len;i++) {
- g_array_index(dest->tfc, LttvTracefileContext*, i) =
- g_array_index(src->tfc, LttvTracefileContext*, i);
+ dest_tfcp->event,
+ src_tfcp->event);
+ }
}
dest->timestamp = src->timestamp;
}
int i;
int ret = 0;
- if(pos->ep->len == 0) {
+ if(pos->tfcp->len == 0) {
if(lttv_traceset_number(self->ts) == 0) return 0;
else return 1;
}
if(lttv_traceset_number(self->ts) == 0)
return -1;
- for(i=0;i<pos->ep->len;i++) {
- LttEventPosition *ep = g_array_index(pos->ep, LttEventPosition*, i);
- LttvTracefileContext *tfc =
- g_array_index(pos->tfc, LttvTracefileContext*, i);
+ for(i=0;i<pos->tfcp->len;i++) {
+ LttvTracefileContextPosition *tfcp =
+ &g_array_index(pos->tfcp, LttvTracefileContextPosition, i);
- if(ep == NULL) {
- if(ltt_time_compare(tfc->timestamp, ltt_time_infinite) != 0) {
+ if(tfcp->used == FALSE) {
+ if(ltt_time_compare(tfcp->tfc->timestamp, ltt_time_infinite) < 0) {
ret = -1;
}
} else {
- if(ltt_time_compare(tfc->timestamp, ltt_time_infinite) == 0) {
+ if(ltt_time_compare(tfcp->tfc->timestamp, ltt_time_infinite) == 0) {
ret = 1;
} else {
- LttEvent *event = ltt_tracefile_get_event(tfc->tf);
+ LttEvent *event = ltt_tracefile_get_event(tfcp->tfc->tf);
ret = ltt_event_position_compare((LttEventPosition*)event,
- ep);
+ tfcp->event);
}
}
if(ret != 0) return ret;
const LttvTracesetContextPosition *pos2)
{
int i, j;
- int ret;
+ int ret = 0;
- if(pos1->ep->len == 0) {
- if(pos2->ep->len == 0) return 0;
+ if(pos1->tfcp->len == 0) {
+ if(pos2->tfcp->len == 0) return 0;
else return 1;
}
- if(pos2->ep->len == 0)
+ if(pos2->tfcp->len == 0)
return -1;
- for(i=0;i<pos1->ep->len;i++) {
- LttEventPosition *ep1 = g_array_index(pos1->ep, LttEventPosition*, i);
- LttvTracefileContext *tfc1 = g_array_index(pos1->tfc,
- LttvTracefileContext*, i);
+ for(i=0;i<pos1->tfcp->len;i++) {
+ LttvTracefileContextPosition *tfcp1 =
+ &g_array_index(pos1->tfcp, LttvTracefileContextPosition, i);
- if(ep1 != NULL) {
- for(j=0;j<pos2->ep->len;j++) {
- LttEventPosition *ep2 = g_array_index(pos2->ep, LttEventPosition*, j);
- LttvTracefileContext *tfc2 = g_array_index(pos2->tfc,
- LttvTracefileContext*, j);
- if(tfc1 == tfc2) {
- if(ep2 != NULL)
- ret = ltt_event_position_compare(ep1, ep2);
+ if(tfcp1->used == TRUE) {
+ for(j=0;j<pos2->tfcp->len;j++) {
+ LttvTracefileContextPosition *tfcp2 =
+ &g_array_index(pos2->tfcp, LttvTracefileContextPosition, j);
+
+ if(tfcp1->tfc == tfcp2->tfc) {
+ if(tfcp2->used == TRUE)
+ ret = ltt_event_position_compare(tfcp1->event, tfcp2->event);
else
ret = -1;
if(ret != 0) return ret;
}
}
+
} else {
- for(j=0;j<pos2->ep->len;j++) {
- LttEventPosition *ep2 = g_array_index(pos2->ep, LttEventPosition*, j);
- LttvTracefileContext *tfc2 = g_array_index(pos2->tfc,
- LttvTracefileContext*, j);
- if(tfc1 == tfc2) {
- if(ep2 != NULL) ret = 1;
- }
+ for(j=0;j<pos2->tfcp->len;j++) {
+ LttvTracefileContextPosition *tfcp2 =
+ &g_array_index(pos2->tfcp, LttvTracefileContextPosition, j);
+
+ if(tfcp1->tfc == tfcp2->tfc)
+ if(tfcp2->used == TRUE) ret = 1;
+ if(ret != 0) return ret;
}
}
}
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,
* Parameters :
* @self The trace set context
* @n number of events to jump over
- * @first_offset The initial offset value used. Hint : try about 100000ns.
+ * @first_offset The initial offset value used.
* never put first_offset at ltt_time_zero.
* @time_seeker Function pointer of the function to use to seek time :
* either lttv_process_traceset_seek_time
guint i;
LttvTracesetContextPosition *next_iter_end_pos =
- lttv_traceset_context_position_new();
- LttvTracesetContextPosition *end_pos = lttv_traceset_context_position_new();
- LttvTracesetContextPosition *saved_pos = lttv_traceset_context_position_new();
+ lttv_traceset_context_position_new(self);
+ LttvTracesetContextPosition *end_pos =
+ lttv_traceset_context_position_new(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();
sd.n = n;
g_ptr_array_set_size(sd.array, n);
for(i=0;i<n;i++) {
- g_ptr_array_index (sd.array, i) = lttv_traceset_context_position_new();
+ g_ptr_array_index (sd.array, i) = lttv_traceset_context_position_new(self);
}
lttv_traceset_context_position_save(self, next_iter_end_pos);
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);
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);
projects / lttv.git / blobdiff