X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=8edeb54cb44c692848b66848139c89f69c809118;hb=d25b4e2b09d3704b52522f8d75b34885b2a83c80;hp=808649173801afb16cf468180e861bf12e1512bc;hpb=542ceddd71b4a9e5d603009632a60fdf4e77fd91;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 80864917..8edeb54c 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -40,34 +40,6 @@ int timecmp(LttTime * t1, LttTime * t2); int getIntNumber(int size1, void *evD); -/* Time operation macros for LttTime (struct timespec) */ -/* (T3 = T2 - T1) */ -#define TimeSub(T3, T2, T1) \ -do \ -{\ - (T3).tv_sec = (T2).tv_sec - (T1).tv_sec; \ - (T3).tv_nsec = (T2).tv_nsec - (T1).tv_nsec; \ - if((T3).tv_nsec < 0)\ - {\ - (T3).tv_sec--;\ - (T3).tv_nsec += 1000000000;\ - }\ -} while(0) - -/* (T3 = T2 + T1) */ -#define TimeAdd(T3, T2, T1) \ -do \ -{\ - (T3).tv_sec = (T2).tv_sec + (T1).tv_sec; \ - (T3).tv_nsec = (T2).tv_nsec + (T1).tv_nsec; \ - if((T3).tv_nsec >= 1000000000)\ - {\ - (T3).tv_sec += (T3).tv_nsec / 1000000000;\ - (T3).tv_nsec = (T3).tv_nsec % 1000000000;\ - }\ -} while(0) - - /***************************************************************************** *Function name @@ -103,6 +75,9 @@ LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName) // Is the file large enough to contain a trace if(lTDFStat.st_size < sizeof(BlockStart) + EVENT_HEADER_SIZE){ g_print("The input data file %s does not contain a trace\n", fileName); + g_free(tf->name); + close(tf->fd); + g_free(tf); return NULL; } @@ -130,6 +105,7 @@ void ltt_tracefile_open_cpu(LttTrace *t, char * tracefile_name) { LttTracefile * tf; tf = ltt_tracefile_open(t,tracefile_name); + if(!tf) return; t->per_cpu_tracefile_number++; g_ptr_array_add(t->per_cpu_tracefiles, tf); } @@ -176,6 +152,7 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name) }else if(ev->event_id == TRACE_BLOCK_END){ break; }else g_error("Not valid facilities trace file\n"); + g_free(ev); } } } @@ -191,6 +168,7 @@ void ltt_tracefile_close(LttTracefile *t) { g_free(t->name); g_free(t->buffer); + close(t->fd); g_free(t); } @@ -515,23 +493,25 @@ void ltt_trace_close(LttTrace *t) tf = (LttTracefile*)g_ptr_array_index(t->control_tracefiles,i); ltt_tracefile_close(tf); } - g_ptr_array_free(t->control_tracefiles, FALSE); + g_ptr_array_free(t->control_tracefiles, TRUE); //free per_cpu_tracefiles for(i=0;iper_cpu_tracefile_number;i++){ tf = (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles,i); ltt_tracefile_close(tf); } - g_ptr_array_free(t->per_cpu_tracefiles, FALSE); + g_ptr_array_free(t->per_cpu_tracefiles, TRUE); //free facilities for(i=0;ifacility_number;i++){ f = (LttFacility*)g_ptr_array_index(t->facilities,i); ltt_facility_close(f); } - g_ptr_array_free(t->facilities, FALSE); + g_ptr_array_free(t->facilities, TRUE); g_free(t); + + g_blow_chunks(); } @@ -709,7 +689,8 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) LttTime lttTime; int headTime = timecmp(&(t->a_block_start->time), &time); int tailTime = timecmp(&(t->a_block_end->time), &time); - + LttEvent * ev; + if(headTime < 0 && tailTime > 0){ lttTime = getEventTime(t); err = timecmp(<tTime, &time); @@ -721,13 +702,17 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) return ltt_tracefile_seek_time(t, time); } }else if(err < 0){ - err = t->which_block; - if(ltt_tracefile_read(t) == NULL){ - g_print("End of file\n"); - return; + while(1){ + ev = ltt_tracefile_read(t); + if(ev == NULL){ + g_print("End of file\n"); + return; + } + g_free(ev); + lttTime = getEventTime(t); + err = timecmp(<tTime, &time); + if(err >= 0)return; } - if(t->which_block == err) - return ltt_tracefile_seek_time(t,time); }else return; }else if(headTime > 0){ if(t->which_block == 1){ @@ -754,6 +739,10 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) updateTracefile(t); }else if(tailTime == 0){ t->cur_event_pos = t->a_block_end - EVENT_HEADER_SIZE; + t->current_event_time = time; + t->cur_heart_beat_number = 0; + t->prev_event_time.tv_sec = 0; + t->prev_event_time.tv_nsec = 0; return; } } @@ -777,7 +766,7 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) t->cur_heart_beat_number++; t->prev_event_time = t->current_event_time; - t->current_event_time = getEventTime(t); + // t->current_event_time = getEventTime(t); lttEvent->time_delta = *(uint32_t*)(t->cur_event_pos + EVENT_ID_SIZE); lttEvent->event_time = t->current_event_time; @@ -790,7 +779,10 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) //update the fields of the current event and go to the next event err = skipEvent(t); - if(err == ENOMEM) return NULL; + if(err == ENOMEM){ + g_free(lttEvent); + return NULL; + } if(err == ENOENT) return lttEvent; if(err == ERANGE) g_error("event id is out of range\n"); if(err)g_error("Can not read tracefile\n"); @@ -842,14 +834,11 @@ int readBlock(LttTracefile * tf, int whichBlock) if(whichBlock - tf->which_block == 1 && tf->which_block != 0){ tf->prev_block_end_time = tf->a_block_end->time; tf->prev_event_time = tf->a_block_end->time; - tf->current_event_time = tf->a_block_end->time; }else{ tf->prev_block_end_time.tv_sec = 0; tf->prev_block_end_time.tv_nsec = 0; tf->prev_event_time.tv_sec = 0; tf->prev_event_time.tv_nsec = 0; - tf->current_event_time.tv_sec = 0; - tf->current_event_time.tv_nsec = 0; } nbBytes=lseek(tf->fd,(off_t)((whichBlock-1)*tf->block_size), SEEK_SET); @@ -870,7 +859,7 @@ int readBlock(LttTracefile * tf, int whichBlock) getCyclePerNsec(tf); - // tf->current_event_time = getEventTime(tf); + tf->current_event_time = getEventTime(tf); return 0; } @@ -887,9 +876,7 @@ void updateTracefile(LttTracefile * tf) { tf->which_event = 1; tf->cur_event_pos = tf->buffer; - // tf->current_event_time = getEventTime(tf); - tf->current_event_time.tv_sec = 0; - tf->current_event_time.tv_nsec = 0; + tf->current_event_time = getEventTime(tf); tf->cur_heart_beat_number = 0; tf->prev_event_time.tv_sec = 0; @@ -965,6 +952,7 @@ int skipEvent(LttTracefile * t) if(err) return err; }else{ t->which_event++; + t->current_event_time = getEventTime(t); } return 0;