X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=bf2af685da903f8bdc30670b18ff888e58d89d9b;hb=f9334f6f7ef5e0b29fdc66d36d39ca164dfc27e5;hp=a44d81cdbf8fbe27e540b209c979db774d9f7bc7;hpb=8a3005f3a3baa99a6065edadca40985663b46c88;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index a44d81cd..bf2af685 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -654,7 +654,7 @@ int ltt_trace_per_cpu_tracefile_find(LttTrace *t, unsigned i) LttTracefile *ltt_trace_control_tracefile_get(LttTrace *t, unsigned i) { - return (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, i); + return (LttTracefile*)g_ptr_array_index(t->control_tracefiles, i); } LttTracefile *ltt_trace_per_cpu_tracefile_get(LttTrace *t, unsigned i) @@ -1162,11 +1162,11 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, int timecmp(LttTime * t1, LttTime * t2) { - LttTime T; - TimeSub(T, *t1, *t2); - if(T.tv_sec == 0 && T.tv_nsec == 0) return 0; - else if(T.tv_sec > 0 || (T.tv_sec==0 && T.tv_nsec > 0)) return 1; - else return -1; + if(t1->tv_sec < t2->tv_sec) return -1; + if(t1->tv_sec > t2->tv_sec) return 1; + if(t1->tv_nsec < t2->tv_nsec) return -1; + if(t1->tv_nsec > t2->tv_nsec) return 1; + return 0; } /*****************************************************************************