X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=e3829fbfbe6ca5006fa7390739ee3b03c88cbc7a;hb=b445142a71748192520cfd645b4963e23070a486;hp=43334ed366d727fcb1527ed7ef7b411ed178004e;hpb=487ad18102bd5f8a398f3c14ed3a489d3c89a181;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 43334ed3..e3829fbf 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -571,7 +571,7 @@ unsigned ltt_trace_eventtype_number(LttTrace *t) int i; unsigned count = 0; LttFacility * f; - for(i=0;i=t->facility_number;i++){ + for(i=0;ifacility_number;i++){ f = (LttFacility*)g_ptr_array_index(t->facilities, i); count += f->event_number; } @@ -743,28 +743,33 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) LttEvent * ev; if(headTime < 0 && tailTime > 0){ - lttTime = getEventTime(t); - err = timecmp(<tTime, &time); - if(err > 0){ - if(t->which_event==2 || timecmp(&t->prev_event_time,&time)<0){ - return; - }else{ - updateTracefile(t); - return ltt_tracefile_seek_time(t, time); - } - }else if(err < 0){ - while(1){ - ev = ltt_tracefile_read(t); - if(ev == NULL){ - g_print("End of file\n"); + if(timecmp(&(t->a_block_end->time),&(t->current_event_time)) !=0){ + lttTime = getEventTime(t); + err = timecmp(<tTime, &time); + if(err > 0){ + if(t->which_event==2 || timecmp(&t->prev_event_time,&time)<0){ return; + }else{ + updateTracefile(t); + return ltt_tracefile_seek_time(t, time); } - lttTime = getEventTime(t); - err = timecmp(<tTime, &time); - if(err >= 0)return; - } - }else return; - }else if(headTime > 0){ + }else if(err < 0){ + while(1){ + ev = ltt_tracefile_read(t); + if(ev == NULL){ + g_print("End of file\n"); + return; + } + lttTime = getEventTime(t); + err = timecmp(<tTime, &time); + if(err >= 0)return; + } + }else return; + }else{//we are at the end of the block + updateTracefile(t); + return ltt_tracefile_seek_time(t, time); + } + }else if(headTime >= 0){ if(t->which_block == 1){ updateTracefile(t); }else{ @@ -785,10 +790,8 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) return; } if(tailTime < 0) return ltt_tracefile_seek_time(t, time); - }else if(headTime == 0){ - updateTracefile(t); }else if(tailTime == 0){ - t->cur_event_pos = t->a_block_end - EVENT_HEADER_SIZE; + t->cur_event_pos = t->last_event_pos; t->current_event_time = time; t->cur_heart_beat_number = 0; t->prev_event_time.tv_sec = 0; @@ -855,9 +858,6 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) lttEvent->time_delta = *(uint32_t*)(t->cur_event_pos + EVENT_ID_SIZE); lttEvent->event_time = t->current_event_time; - lttEvent->event_cycle_count = ((uint64_t)1)<<32 * t->cur_heart_beat_number - + lttEvent->time_delta; - lttEvent->tracefile = t; lttEvent->data = t->cur_event_pos + EVENT_HEADER_SIZE; lttEvent->which_block = t->which_block; @@ -867,6 +867,8 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) err = skipEvent(t); if(err == ERANGE) g_error("event id is out of range\n"); + lttEvent->event_cycle_count = t->cur_cycle_count; + return lttEvent; } @@ -931,6 +933,7 @@ int readBlock(LttTracefile * tf, int whichBlock) lostSize = *(uint32_t*)(tf->buffer + tf->block_size - sizeof(uint32_t)); tf->a_block_end=(BlockEnd *)(tf->buffer + tf->block_size - lostSize + EVENT_HEADER_SIZE); + tf->last_event_pos = tf->buffer + tf->block_size - lostSize; tf->which_block = whichBlock; tf->which_event = 1; @@ -1028,11 +1031,13 @@ void getCyclePerNsec(LttTracefile * t) TimeSub(lBufTotalTime,t->a_block_end->time, t->a_block_start->time); /* Calculate the total cycles for this bufffer */ - lBufTotalCycle = t->a_block_end->cycle_count - - t->a_block_start->cycle_count; + lBufTotalCycle = t->a_block_end->cycle_count; + lBufTotalCycle -= t->a_block_start->cycle_count; /* Convert the total time to nsecs */ - lBufTotalNSec = lBufTotalTime.tv_sec * 1000000000 + lBufTotalTime.tv_nsec; + lBufTotalNSec = lBufTotalTime.tv_sec; + lBufTotalNSec *= NANSECOND_CONST; + lBufTotalNSec += lBufTotalTime.tv_nsec; t->cycle_per_nsec = (double)lBufTotalCycle / (double)lBufTotalNSec; } @@ -1054,29 +1059,48 @@ LttTime getEventTime(LttTracefile * tf) double lEventNSec; // Total usecs from start for event LttTime lTimeOffset; // Time offset in struct LttTime uint16_t evId; - + int64_t nanoSec, tmpCycleCount = (((uint64_t)1)<<32); + static LttCycleCount preCycleCount = 0; + static int count = 0; + evId = *(uint16_t*)tf->cur_event_pos; - if(evId == TRACE_BLOCK_START) + if(evId == TRACE_BLOCK_START){ + count = 0; + preCycleCount = 0; + tf->cur_cycle_count = tf->a_block_start->cycle_count; return tf->a_block_start->time; - else if(evId == TRACE_BLOCK_END) + }else if(evId == TRACE_BLOCK_END){ + count = 0; + preCycleCount = 0; + tf->cur_cycle_count = tf->a_block_end->cycle_count; return tf->a_block_end->time; + } - - // Calculate total time in cycles from start of buffer for this event + // Calculate total time in cycles from start of buffer for this event cycle_count = (LttCycleCount)*(uint32_t*)(tf->cur_event_pos + EVENT_ID_SIZE); - if(tf->cur_heart_beat_number) - cycle_count += ((uint64_t)1)<<32 * tf->cur_heart_beat_number; - lEventTotalCycle = cycle_count - tf->a_block_start->cycle_count; + + if(cycle_count < preCycleCount)count++; + preCycleCount = cycle_count; + cycle_count += tmpCycleCount * count; + + if(tf->cur_heart_beat_number > count) + cycle_count += tmpCycleCount * (tf->cur_heart_beat_number - count); + + tf->cur_cycle_count = cycle_count; + + lEventTotalCycle = cycle_count; + lEventTotalCycle -= tf->a_block_start->cycle_count; // Convert it to nsecs lEventNSec = lEventTotalCycle / tf->cycle_per_nsec; - + nanoSec = lEventNSec; + // Determine offset in struct LttTime - lTimeOffset.tv_nsec = (long)lEventNSec % 1000000000; - lTimeOffset.tv_sec = (long)lEventNSec / 1000000000; + lTimeOffset.tv_nsec = nanoSec % NANSECOND_CONST; + lTimeOffset.tv_sec = nanoSec / NANSECOND_CONST; TimeAdd(time, tf->a_block_start->time, lTimeOffset); - + return time; }