const LttvTracefileContext *trace_b = (const LttvTracefileContext *)b;
if(likely(trace_a != trace_b)) {
- comparison = ltt_time_compare(trace_b->timestamp, trace_a->timestamp);
+ comparison = ltt_time_compare(trace_a->timestamp, trace_b->timestamp);
if(unlikely(comparison == 0)) {
if(trace_a->index < trace_b->index) comparison = -1;
else if(trace_a->index > trace_b->index) comparison = 1;
GArray *ep; /* Array of LttEventPosition */
GArray *tfc; /* Array of corresponding
TracefileContext* */
- LttTime timestamp; /* Current time at the saved position */
+ LttTime timestamp; /* Current time at the saved position */
+ /* If ltt_time_infinite : no position is
+ * set, else, a position is set (may be end
+ * of trace, with ep->len == 0) */
};
void lttv_context_init(LttvTracesetContext *self, LttvTraceset *ts)
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;
g_tree_destroy(self->pqueue);
g_object_unref(self->a);
+ lttv_traceset_context_position_destroy(self->sync_position);
nb_trace = lttv_traceset_number(ts);
}
+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,
LttTime end,
unsigned count = 0;
- guint read_ret = FALSE;
+ guint read_ret;
+
+ enum read_state last_read_state = LAST_NONE;
gboolean last_ret = FALSE; /* return value of the last hook list called */
{
return count;
}
-
+
/* Get the tracefile with an event for the smallest time found. If two
or more tracefiles have events for the same time, hope that lookup
and remove are consistent. */
g_tree_foreach(pqueue, test_tree, tfc);
#endif //DEBUG
- count++;
-
e = ltt_tracefile_get_event(tfc->tf);
- 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);
if(likely(!read_ret)) {
tfc->timestamp = ltt_event_time(e);
g_tree_insert(pqueue, tfc, tfc);
+ last_read_state = LAST_OK;
} else {
tfc->timestamp = ltt_time_infinite;
- if(read_ret == ERANGE)
+ if(read_ret == ERANGE) {
+ last_read_state = LAST_EMPTY;
g_debug("End of trace");
- else
+ } else
g_error("Error happened in lttv_process_traceset_middle");
}
}
const LttvTracesetContextPosition *pos)
{
guint i;
-
- 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) {
- g_assert(ltt_tracefile_seek_position((*tfc)->tf, *ep) == 0);
- (*tfc)->timestamp = ltt_event_time(ltt_tracefile_get_event((*tfc)->tf));
- g_tree_insert(self->pqueue, (*tfc), (*tfc));
- } else {
- (*tfc)->timestamp = ltt_time_infinite;
+ /* 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);
+
+ 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)
+ return 1;
+ (*tfc)->timestamp = ltt_event_time(ltt_tracefile_get_event((*tfc)->tf));
+ g_tree_insert(self->pqueue, (*tfc), (*tfc));
+ } else {
+ (*tfc)->timestamp = ltt_time_infinite;
+ }
}
}
- return TRUE;
+ return 0;
}
/* Returns 0 on success, -1 if fails. */
gint
lttv_trace_find_hook(LttTrace *t, GQuark facility, GQuark event,
- GQuark field1, GQuark field2, GQuark field3, LttvHook h, LttvTraceHook *th)
+ GQuark field1, GQuark field2, GQuark field3, LttvHook h, gpointer hook_data,
+ LttvTraceHook *th)
{
LttFacility *f;
thf->f1 = find_field(et, field1);
thf->f2 = find_field(et, field2);
thf->f3 = find_field(et, field3);
+ thf->hook_data = hook_data;
first_thf = thf;
first_et = et;
if(check_fields_compatibility(first_et, et,
first_thf->f3, thf->f3))
goto type_error;
+ thf->hook_data = hook_data;
}
return 0;
{
int i;
int ret = 0;
-
+
+ if(pos->ep->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 =
int i, j;
int ret;
+ if(pos1->ep->len == 0) {
+ if(pos2->ep->len == 0) return 0;
+ else return 1;
+ }
+ if(pos2->ep->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,
return tfc;
}
+
+/* lttv_process_traceset_synchronize_tracefiles
+ *
+ * Use the sync_position field of the trace set context to synchronize each
+ * tracefile with the previously saved position.
+ *
+ * If no previous position has been saved, it simply does nothing.
+ */
+void lttv_process_traceset_synchronize_tracefiles(LttvTracesetContext *tsc)
+{
+ g_assert(lttv_process_traceset_seek_position(tsc, tsc->sync_position) == 0);
+}
+
+
+
+
+void lttv_process_traceset_get_sync_data(LttvTracesetContext *tsc)
+{
+ lttv_traceset_context_position_save(tsc, tsc->sync_position);
+}
+
projects / lttv.git / blobdiff