X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=e3829fbfbe6ca5006fa7390739ee3b03c88cbc7a;hb=b445142a71748192520cfd645b4963e23070a486;hp=8edeb54cb44c692848b66848139c89f69c809118;hpb=d25b4e2b09d3704b52522f8d75b34885b2a83c80;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 8edeb54c..e3829fbf 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -36,9 +36,6 @@ int skipEvent(LttTracefile * t); /* compare two time (LttTime), 0:t1=t2, -1:t1t2 */ int timecmp(LttTime * t1, LttTime * t2); -/* get an integer number */ -int getIntNumber(int size1, void *evD); - /***************************************************************************** @@ -152,7 +149,6 @@ 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); } } } @@ -554,7 +550,7 @@ unsigned ltt_trace_facility_find(LttTrace *t, char *name, unsigned *position) { int i, 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); if(strcmp(f->name,name)==0){ count++; @@ -575,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; } @@ -657,7 +653,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) @@ -665,6 +661,52 @@ LttTracefile *ltt_trace_per_cpu_tracefile_get(LttTrace *t, unsigned i) return (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, i); } +/***************************************************************************** + * Get the start time and end time of the trace + ****************************************************************************/ + +void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end) +{ + LttTime startSmall, startTmp, endBig, endTmp; + int i, j=0; + LttTracefile * tf; + + for(i=0;icontrol_tracefile_number;i++){ + tf = g_ptr_array_index(t->control_tracefiles, i); + readBlock(tf,1); + startTmp = tf->a_block_start->time; + readBlock(tf,tf->block_number); + endTmp = tf->a_block_end->time; + if(i==0){ + startSmall = startTmp; + endBig = endTmp; + j = 1; + continue; + } + if(timecmp(&startSmall,&startTmp) > 0) startSmall = startTmp; + if(timecmp(&endBig,&endTmp) < 0) endBig = endTmp; + } + + for(i=0;iper_cpu_tracefile_number;i++){ + tf = g_ptr_array_index(t->per_cpu_tracefiles, i); + readBlock(tf,1); + startTmp = tf->a_block_start->time; + readBlock(tf,tf->block_number); + endTmp = tf->a_block_end->time; + if(j == 0 && i==0){ + startSmall = startTmp; + endBig = endTmp; + continue; + } + if(timecmp(&startSmall,&startTmp) > 0) startSmall = startTmp; + if(timecmp(&endBig,&endTmp) < 0) endBig = endTmp; + } + + *start = startSmall; + *end = endBig; +} + + /***************************************************************************** *Get the name of a tracefile ****************************************************************************/ @@ -674,6 +716,15 @@ char *ltt_tracefile_name(LttTracefile *tf) return tf->name; } +/***************************************************************************** + * Get the number of blocks in the tracefile + ****************************************************************************/ + +unsigned ltt_tracefile_block_number(LttTracefile *tf) +{ + return tf->block_number; +} + /***************************************************************************** *Function name * ltt_tracefile_seek_time: seek to the first event of the trace with time @@ -692,29 +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); } - g_free(ev); - 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{ @@ -735,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; @@ -747,6 +800,32 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) } } +/***************************************************************************** + * Seek to the first event with position equal or larger to ep + ****************************************************************************/ + +void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep) +{ + //if we are at the right place, just return + if(t->which_block == ep->block_num && t->which_event == ep->event_num) + return; + + if(t->which_block == ep->block_num) updateTracefile(t); + else readBlock(t,ep->block_num); + + //event offset is availiable + if(ep->old_position){ + t->cur_heart_beat_number = ep->heart_beat_number; + t->cur_event_pos = t->buffer + ep->event_offset; + return; + } + + //only block number and event index are availiable + while(t->which_event < ep->event_num) ltt_tracefile_read(t); + + return; +} + /***************************************************************************** *Function name * ltt_tracefile_read : read the current event, set the pointer to the next @@ -758,9 +837,17 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) LttEvent *ltt_tracefile_read(LttTracefile *t) { - LttEvent * lttEvent = (LttEvent *)g_new(LttEvent, 1); + LttEvent * lttEvent = &t->an_event; int err; + if(t->cur_event_pos == t->buffer + t->block_size){ + if(t->which_block == t->block_number){ + return NULL; + } + err = readBlock(t, t->which_block + 1); + if(err)g_error("Can not read tracefile"); + } + lttEvent->event_id = (int)(*(uint16_t *)(t->cur_event_pos)); if(lttEvent->event_id == TRACE_TIME_HEARTBEAT) t->cur_heart_beat_number++; @@ -771,21 +858,16 @@ 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; + lttEvent->which_event = t->which_event; //update the fields of the current event and go to the next event err = skipEvent(t); - 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"); + + lttEvent->event_cycle_count = t->cur_cycle_count; return lttEvent; } @@ -851,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; @@ -890,10 +973,6 @@ void updateTracefile(LttTracefile * tf) * t : tracefile *return value * 0 : success - * EINVAL : lseek fail - * EIO : can not read from the file - * ENOMEM : end of file - * ENOENT : last event * ERANGE : event id is out of range ****************************************************************************/ @@ -903,53 +982,30 @@ int skipEvent(LttTracefile * t) void * evData; LttEventType * evT; LttField * rootFld; - static int evCount = 0; - - if(evCount){ - if(t->which_block == t->block_number && - evCount == t->which_event){ - return ENOMEM; - }else evCount = 0; - } evId = (int)(*(uint16_t *)(t->cur_event_pos)); evData = t->cur_event_pos + EVENT_HEADER_SIZE; - //regard BLOCK_START, END and HEARTBEAT as special case, there are buildin events - if(evId != TRACE_BLOCK_START && evId != TRACE_BLOCK_END && evId != TRACE_TIME_HEARTBEAT){ - evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId); + evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId); - if(evT) rootFld = evT->root_field; - else return ERANGE; + if(evT) rootFld = evT->root_field; + else return ERANGE; - if(rootFld){ - //event has string/sequence or the last event is not the same event - if((evT->latest_block!=t->which_block || evT->latest_event!=t->which_event) - && rootFld->field_fixed == 0){ - setFieldsOffset(t, evT, evData, t->trace); - } - t->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_size; - }else t->cur_event_pos += EVENT_HEADER_SIZE; - - evT->latest_block = t->which_block; - evT->latest_event = t->which_event; - }else{ - if(evId == TRACE_BLOCK_START || evId == TRACE_BLOCK_END){ - t->cur_event_pos += sizeof(BlockStart) + EVENT_HEADER_SIZE; - }else{ - t->cur_event_pos += sizeof(TimeHeartbeat) + EVENT_HEADER_SIZE; + if(rootFld){ + //event has string/sequence or the last event is not the same event + if((evT->latest_block!=t->which_block || evT->latest_event!=t->which_event) + && rootFld->field_fixed == 0){ + setFieldsOffset(t, evT, evData, t->trace); } - } - + t->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_size; + }else t->cur_event_pos += EVENT_HEADER_SIZE; + + evT->latest_block = t->which_block; + evT->latest_event = t->which_event; + //the next event is in the next block if(evId == TRACE_BLOCK_END){ - if(t->which_block == t->block_number){ - t->which_event++; - evCount = t->which_event; - return ENOENT; - } - err = readBlock(t, t->which_block + 1); - if(err) return err; + t->cur_event_pos = t->buffer + t->block_size; }else{ t->which_event++; t->current_event_time = getEventTime(t); @@ -975,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; } @@ -1001,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; } @@ -1103,6 +1180,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, }else if(type->type_class == LTT_SEQUENCE){ size1 = (int) ltt_type_size(trace, type); if(fld->field_fixed == -1){ + fld->sequ_number_size = size1; fld->field_fixed = 0; size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace); fld->element_size = size; @@ -1186,11 +1264,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; } /*****************************************************************************