X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ftracecontext.c;h=e0ddd00616f8ebc88931e68210f25bfad718c075;hb=dbd243b1b5f764129ae8bcf95432df750bec4a8b;hp=dd52153f589ed6454141f3036c6f6bcf427087bf;hpb=4d39be09fda397de58798c73a8273517767e3e93;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c index dd52153f..e0ddd006 100644 --- a/ltt/branches/poly/lttv/lttv/tracecontext.c +++ b/ltt/branches/poly/lttv/lttv/tracecontext.c @@ -16,7 +16,7 @@ * MA 02111-1307, USA. */ - +#include #include #include #include @@ -30,9 +30,9 @@ gint compare_tracefile(gconstpointer a, gconstpointer b) { gint comparison; - LttvTracefileContext *trace_a = (LttvTracefileContext *)a; + const LttvTracefileContext *trace_a = (const LttvTracefileContext *)a; - LttvTracefileContext *trace_b = (LttvTracefileContext *)b; + const LttvTracefileContext *trace_b = (const LttvTracefileContext *)b; if(trace_a == trace_b) return 0; comparison = ltt_time_compare(trace_a->timestamp, trace_b->timestamp); @@ -41,7 +41,9 @@ gint compare_tracefile(gconstpointer a, gconstpointer b) else if(trace_a->index > trace_b->index) return 1; if(trace_a->t_context->index < trace_b->t_context->index) return -1; else if(trace_a->t_context->index > trace_b->t_context->index) return 1; + g_assert(FALSE); + return 0; /* This should never happen */ } struct _LttvTraceContextPosition { @@ -184,6 +186,7 @@ init(LttvTracesetContext *self, LttvTraceset *ts) tfc->tf = ltt_trace_per_cpu_tracefile_get(tc->t, j - nb_control); } tfc->t_context = tc; + tfc->e = ltt_event_new(); tfc->event = lttv_hooks_new(); tfc->event_by_id = lttv_hooks_by_id_new(); tfc->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); @@ -223,6 +226,7 @@ void fini(LttvTracesetContext *self) for(j = 0 ; j < nb_tracefile ; j++) { tfc = tc->tracefiles[j]; + ltt_event_destroy(tfc->e); lttv_hooks_destroy(tfc->event); lttv_hooks_by_id_destroy(tfc->event_by_id); g_object_unref(tfc->a); @@ -463,7 +467,8 @@ lttv_traceset_context_get_type(void) NULL, /* class_data */ sizeof (LttvTracesetContext), 0, /* n_preallocs */ - (GInstanceInitFunc) traceset_context_instance_init /* instance_init */ + (GInstanceInitFunc) traceset_context_instance_init, /* instance_init */ + NULL /* Value handling */ }; type = g_type_register_static (G_TYPE_OBJECT, "LttvTracesetContextType", @@ -511,7 +516,8 @@ lttv_trace_context_get_type(void) NULL, /* class_data */ sizeof (LttvTraceContext), 0, /* n_preallocs */ - (GInstanceInitFunc) trace_context_instance_init /* instance_init */ + (GInstanceInitFunc) trace_context_instance_init, /* instance_init */ + NULL /* Value handling */ }; type = g_type_register_static (G_TYPE_OBJECT, "LttvTraceContextType", @@ -559,7 +565,8 @@ lttv_tracefile_context_get_type(void) NULL, /* class_data */ sizeof (LttvTracefileContext), 0, /* n_preallocs */ - (GInstanceInitFunc) tracefile_context_instance_init /* instance_init */ + (GInstanceInitFunc) tracefile_context_instance_init, /* instance_init */ + NULL /* Value handling */ }; type = g_type_register_static (G_TYPE_OBJECT, "LttvTracefileContextType", @@ -576,6 +583,44 @@ gboolean get_first(gpointer key, gpointer value, gpointer user_data) { } +/* Put all the tracefiles at the tracefile context position */ +void lttv_process_traceset_synchronize_tracefiles(LttvTracesetContext *self) +{ + guint iter_trace, nb_trace; + + LttvTraceContext *tc; + + nb_trace = lttv_traceset_number(self->ts); + + for(iter_trace = 0 ; iter_trace < nb_trace ; iter_trace++) { + tc = self->traces[iter_trace]; + { + /* each trace */ + guint iter_tf, nb_tracefile; + + LttvTracefileContext *tfc; + + nb_tracefile = ltt_trace_control_tracefile_number(tc->t) + + ltt_trace_per_cpu_tracefile_number(tc->t); + + for(iter_tf = 0 ; iter_tf < nb_tracefile ; iter_tf++) { + tfc = tc->tracefiles[iter_tf]; + { + /* each tracefile */ + //ltt_tracefile_copy(tfc->tf_sync_data, tfc->tf); + LttEventPosition *ep = ltt_event_position_new(); + + ltt_event_position(tfc->e, ep); + + ltt_tracefile_seek_position(tfc->tf, ep); + g_free(ep); + } + } + } + } +} + + void lttv_process_traceset_begin(LttvTracesetContext *self, LttvHooks *before_traceset, @@ -608,8 +653,6 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, LttvTracefileContext *tfc; - LttEvent *event; - unsigned count = 0; gboolean last_ret = FALSE; /* return value of the last hook list called */ @@ -638,8 +681,8 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, if(last_ret == TRUE || count >= nb_events || - ((end_position==NULL)?FALSE:(lttv_traceset_context_ctx_pos_compare(self, - end_position) >= 0))|| + (end_position!=NULL&<tv_traceset_context_ctx_pos_compare(self, + end_position) == 0)|| ltt_time_compare(tfc->timestamp, end) >= 0) { return count; @@ -656,10 +699,8 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self, last_ret = lttv_hooks_call_merge(tfc->event, tfc, lttv_hooks_by_id_get(tfc->event_by_id, id), tfc); - event = ltt_tracefile_read(tfc->tf); - if(event != NULL) { - tfc->e = event; - tfc->timestamp = ltt_event_time(event); + if(ltt_tracefile_read(tfc->tf, tfc->e) != NULL) { + tfc->timestamp = ltt_event_time(tfc->e); g_tree_insert(pqueue, tfc, tfc); } } @@ -689,8 +730,6 @@ void lttv_process_trace_seek_time(LttvTraceContext *self, LttTime start) LttvTracefileContext *tfc; - LttEvent *event; - GTree *pqueue = self->ts_context->pqueue; nb_tracefile = ltt_trace_control_tracefile_number(self->t) + @@ -700,10 +739,8 @@ void lttv_process_trace_seek_time(LttvTraceContext *self, LttTime start) tfc = self->tracefiles[i]; ltt_tracefile_seek_time(tfc->tf, start); g_tree_remove(pqueue, tfc); - event = ltt_tracefile_read(tfc->tf); - tfc->e = event; - if(event != NULL) { - tfc->timestamp = ltt_event_time(event); + if(ltt_tracefile_read(tfc->tf, tfc->e) != NULL) { + tfc->timestamp = ltt_event_time(tfc->e); g_tree_insert(pqueue, tfc, tfc); } } @@ -716,8 +753,6 @@ void lttv_process_traceset_seek_time(LttvTracesetContext *self, LttTime start) LttvTraceContext *tc; - LttvTracefileContext *tfc; - nb_trace = lttv_traceset_number(self->ts); for(i = 0 ; i < nb_trace ; i++) { tc = self->traces[i]; @@ -731,20 +766,16 @@ gboolean lttv_process_tracefile_seek_position(LttvTracefileContext *self, { LttvTracefileContext *tfc = self; - LttEvent *event; - GTree *pqueue = self->t_context->ts_context->pqueue; ltt_tracefile_seek_position(tfc->tf, pos); g_tree_remove(pqueue, tfc); - event = ltt_tracefile_read(tfc->tf); - tfc->e = event; - if(event != NULL) { - tfc->timestamp = ltt_event_time(event); + if(ltt_tracefile_read(tfc->tf, tfc->e) != NULL) { + tfc->timestamp = ltt_event_time(tfc->e); g_tree_insert(pqueue, tfc, tfc); } - + return TRUE; } gboolean lttv_process_trace_seek_position(LttvTraceContext *self, @@ -754,8 +785,6 @@ gboolean lttv_process_trace_seek_position(LttvTraceContext *self, LttvTracefileContext *tfc; - LttEvent *event; - nb_tracefile = ltt_trace_control_tracefile_number(self->t) + ltt_trace_per_cpu_tracefile_number(self->t); @@ -780,8 +809,6 @@ gboolean lttv_process_traceset_seek_position(LttvTracesetContext *self, LttvTraceContext *tc; - LttvTracefileContext *tfc; - nb_trace = lttv_traceset_number(self->ts); if(nb_trace != pos->nb_trace) @@ -831,9 +858,7 @@ lttv_trace_find_hook(LttTrace *t, char *facility, char *event_type, LttEventType *et; - guint nb, pos, i; - - char *name; + guint nb, pos; nb = ltt_trace_facility_find(t, facility, &pos); if(nb < 1) g_error("No %s facility", facility); @@ -849,7 +874,7 @@ lttv_trace_find_hook(LttTrace *t, char *facility, char *event_type, } -LttvTracesetContextPosition *ltt_traceset_context_position_new() +LttvTracesetContextPosition *lttv_traceset_context_position_new() { return g_new(LttvTracesetContextPosition,1); } @@ -899,7 +924,7 @@ void lttv_traceset_context_position_save(const LttvTracesetContext *self, void lttv_traceset_context_position_destroy(LttvTracesetContextPosition *pos) { - guint nb_trace, nb_tracefile; + guint nb_trace; guint iter_trace, iter_tracefile; nb_trace = pos->nb_trace; @@ -975,11 +1000,9 @@ gint lttv_traceset_context_ctx_pos_compare(const LttvTracesetContext *self, for(iter_tracefile = 0; iter_tracefile < nb_tracefile; iter_tracefile++) { tfc = tc->tracefiles[iter_tracefile]; event = tfc->e; - if( - ret = - ltt_event_event_position_compare(event, - pos->t_pos[iter_trace].tf_pos[iter_tracefile]) - != 0) + ret = ltt_event_event_position_compare(event, + pos->t_pos[iter_trace].tf_pos[iter_tracefile]); + if(ret != 0) return ret; } } @@ -1007,11 +1030,10 @@ gint lttv_traceset_context_pos_pos_compare( g_error("lttv_traceset_context_ctx_pos_compare : nb_tracefile does not match."); for(iter_tracefile = 0; iter_tracefile < nb_tracefile; iter_tracefile++) { - if(ret = - ltt_event_position_compare( + ret = ltt_event_position_compare( pos1->t_pos[iter_trace].tf_pos[iter_tracefile], - pos2->t_pos[iter_trace].tf_pos[iter_tracefile]) - != 0) + pos2->t_pos[iter_trace].tf_pos[iter_tracefile]); + if(ret != 0) return ret; } } @@ -1029,7 +1051,7 @@ LttTime lttv_traceset_context_position_get_time( LttvTracefileContext *lttv_traceset_context_get_current_tfc(LttvTracesetContext *self) { GTree *pqueue = self->pqueue; - LttvTracefileContext *tfc; + LttvTracefileContext *tfc = NULL; g_tree_foreach(pqueue, get_first, &tfc);