X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=e3829fbfbe6ca5006fa7390739ee3b03c88cbc7a;hb=b445142a71748192520cfd645b4963e23070a486;hp=4819d5d1f1f64c97da3d4bbf7c000df4439d05bf;hpb=963b5f2df23dc1c70bdc70d4aecb76f50651997b;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 4819d5d1..e3829fbf 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -13,12 +13,12 @@ /* set the offset of the fields belonging to the event, need the information of the archecture */ -void setFieldsOffset(LttTracefile * t, LttEventType *evT, void *evD); +void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace *t); /* get the size of the field type according to the archtecture's size and endian type(info of the archecture) */ -int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, - int offsetParent, LttField * fld, void * evD ); +int getFieldtypeSize(LttTracefile * tf, LttEventType * evT, int offsetRoot, + int offsetParent, LttField *fld, void *evD, LttTrace* t); /* read a fixed size or a block information from the file (fd) */ int readFile(int fd, void * buf, size_t size, char * mesg); @@ -36,37 +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); - - -/* 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) - /***************************************************************************** @@ -102,7 +71,11 @@ 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_error("The input data file %s does not contain a trace\n", fileName); + 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; } //store the size of the file @@ -129,6 +102,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); } @@ -144,18 +118,21 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name) int i; tf = ltt_tracefile_open(t,control_name); + if(!tf) return; t->control_tracefile_number++; g_ptr_array_add(t->control_tracefiles,tf); //parse facilities tracefile to get base_id - if(strcmp(control_name,"facilities") ==0){ + if(strcmp(&control_name[strlen(control_name)-10],"facilities") ==0){ while(1){ - evId = *(uint16_t*)tf->cur_event_pos; - if(evId == TRACE_FACILITY_LOAD){ - pos = tf->cur_event_pos + EVENT_HEADER_SIZE; + ev = ltt_tracefile_read(tf); + if(!ev)return; // end of file + + if(ev->event_id == TRACE_FACILITY_LOAD){ + pos = ev->data; fLoad.name = (char*)pos; - fLoad.checksum = *(LttChecksum*)(pos + sizeof(pos)); - fLoad.base_code = *(uint32_t*)(pos + sizeof(pos) + sizeof(LttChecksum)); + fLoad.checksum = *(LttChecksum*)(pos + strlen(fLoad.name)); + fLoad.base_code = *(uint32_t*)(pos + strlen(fLoad.name) + sizeof(LttChecksum)); for(i=0;ifacility_number;i++){ f = (LttFacility*)g_ptr_array_index(t->facilities,i); @@ -167,12 +144,10 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name) if(i==t->facility_number) g_error("Facility: %s, checksum: %d is not founded\n", fLoad.name,fLoad.checksum); - - ev = ltt_tracefile_read(tf); //get next event - if(!ev) break; //end of tracefile - }else if(evId == TRACE_BLOCK_END){ - //can only reach here if it is the first event - g_error("Facilities does not contain any facility_load event\n"); + }else if(ev->event_id == TRACE_BLOCK_START){ + continue; + }else if(ev->event_id == TRACE_BLOCK_END){ + break; }else g_error("Not valid facilities trace file\n"); } } @@ -189,6 +164,7 @@ void ltt_tracefile_close(LttTracefile *t) { g_free(t->name); g_free(t->buffer); + close(t->fd); g_free(t); } @@ -223,6 +199,7 @@ void getSystemInfo(LttSystemDescription* des, char * pathname) for(i=0;iltt_major_version = (unsigned)atoi(ptr); break; case 13: if(strncmp("ltt_minor_version=",ptr,18)!=0) g_error("Not a valid file: %s\n", pathname); ptr += 18; - ptr++;//skip begining " - ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " + // ptr++;//skip begining " + // ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " des->ltt_minor_version = (unsigned)atoi(ptr); break; case 14: if(strncmp("ltt_block_size=",ptr,15)!=0) g_error("Not a valid file: %s\n", pathname); ptr += 15; - ptr++;//skip begining " - ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " + // ptr++;//skip begining " + // ptr[strlen(ptr)-1] = '\0'; //get rid of the ending " des->ltt_block_size = (unsigned)atoi(ptr); break; default: @@ -354,7 +331,7 @@ void getFacilityInfo(LttTrace *t, char* eventdefs) int i,j; LttFacility * f; LttEventType * et; - LttTracefile * tracefile; + char name[DIR_NAME_SIZE]; dir = opendir(eventdefs); if(!dir) g_error("Can not open directory: %s\n", eventdefs); @@ -362,16 +339,17 @@ void getFacilityInfo(LttTrace *t, char* eventdefs) while((entry = readdir(dir)) != NULL){ ptr = &entry->d_name[strlen(entry->d_name)-4]; if(strcmp(ptr,".xml") != 0) continue; - ltt_facility_open(t,entry->d_name); + strcpy(name,eventdefs); + strcat(name,entry->d_name); + ltt_facility_open(t,name); } closedir(dir); - tracefile = (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles,0); for(j=0;jfacility_number;j++){ - f = (LttFacility*)g_ptr_array_index(t->facilities, i); + f = (LttFacility*)g_ptr_array_index(t->facilities, j); for(i=0; ievent_number; i++){ et = f->events[i]; - setFieldsOffset(tracefile, et, NULL); + setFieldsOffset(NULL, et, NULL, t); } } } @@ -380,16 +358,19 @@ void getControlFileInfo(LttTrace *t, char* control) { DIR * dir; struct dirent *entry; + char name[DIR_NAME_SIZE]; dir = opendir(control); if(!dir) g_error("Can not open directory: %s\n", control); while((entry = readdir(dir)) != NULL){ - if(strcmp(entry->d_name,"facilities") != 0 || - strcmp(entry->d_name,"interrupts") != 0 || + if(strcmp(entry->d_name,"facilities") != 0 && + strcmp(entry->d_name,"interrupts") != 0 && strcmp(entry->d_name,"processes") != 0) continue; - ltt_tracefile_open_control(t,entry->d_name); + strcpy(name,control); + strcat(name,entry->d_name); + ltt_tracefile_open_control(t,name); } closedir(dir); } @@ -398,14 +379,17 @@ void getCpuFileInfo(LttTrace *t, char* cpu) { DIR * dir; struct dirent *entry; + char name[DIR_NAME_SIZE]; dir = opendir(cpu); if(!dir) g_error("Can not open directory: %s\n", cpu); while((entry = readdir(dir)) != NULL){ - if(strcmp(entry->d_name,".") != 0 || + if(strcmp(entry->d_name,".") != 0 && strcmp(entry->d_name,"..") != 0 ){ - ltt_tracefile_open_cpu(t,entry->d_name); + strcpy(name,cpu); + strcat(name,entry->d_name); + ltt_tracefile_open_cpu(t,name); }else continue; } closedir(dir); @@ -467,15 +451,15 @@ LttTrace *ltt_trace_open(char *pathname) strcat(tmp,"system.xml"); getSystemInfo(sys_description, tmp); + //get facilities info + getFacilityInfo(t,eventdefs); + //get control tracefile info getControlFileInfo(t,control); //get cpu tracefile info getCpuFileInfo(t,cpu); - //get facilities info - getFacilityInfo(t,eventdefs); - return t; } @@ -505,23 +489,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(); } @@ -564,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++; @@ -585,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; } @@ -667,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) @@ -675,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 ****************************************************************************/ @@ -684,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 @@ -699,33 +740,40 @@ 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); - if(err > 0){ - if(t->which_event==1 || timecmp(&t->prev_event_time,&time)<0){ - return; - }else{ - updateTracefile(t); - return ltt_tracefile_seek_time(t, time); - } - }else if(err < 0){ - err = t->which_block; - if(ltt_tracefile_read(t) == NULL){ - g_printf("End of file\n"); - return; - } - if(t->which_block == err) - return ltt_tracefile_seek_time(t,time); - }else return; - }else if(headTime > 0){ + 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); + } + }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{ - if( (t->prev_block_end_time.tv_sec == 0 && - t->prev_block_end_time.tv_nsec == 0 ) || - timecmp(&(t->prev_block_end_time),&time) > 0 ){ + if(timecmp(&(t->prev_block_end_time),&time) >= 0 ){ err=readBlock(t,t->which_block-1); if(err) g_error("Can not read tracefile: %s\n", t->name); return ltt_tracefile_seek_time(t, time) ; @@ -733,23 +781,54 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) updateTracefile(t); } } - }else if(tailTime <= 0){ + }else if(tailTime < 0){ if(t->which_block != t->block_number){ err=readBlock(t,t->which_block+1); if(err) g_error("Can not read tracefile: %s\n", t->name); }else { - g_printf("End of file\n"); + g_print("End of file\n"); 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->last_event_pos; + 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; } } +/***************************************************************************** + * 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 next event + * ltt_tracefile_read : read the current event, set the pointer to the next *Input params * t : tracefile *Return value @@ -758,29 +837,37 @@ 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; - //update the fields of the current event and go to the next event - err = skipEvent(t); - if(err == ENOENT) return NULL; - if(err == ERANGE) g_error("event id is out of range\n"); - if(err)g_error("Can not read tracefile\n"); + 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++; - t->current_event_time = getEventTime(t); + t->prev_event_time = t->current_event_time; + // 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; - 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 == ERANGE) g_error("event id is out of range\n"); + + lttEvent->event_cycle_count = t->cur_cycle_count; return lttEvent; } @@ -828,12 +915,13 @@ 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; }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->prev_event_time.tv_sec = 0; - tf->prev_event_time.tv_nsec = 0; nbBytes=lseek(tf->fd,(off_t)((whichBlock-1)*tf->block_size), SEEK_SET); if(nbBytes == -1) return EINVAL; @@ -845,16 +933,17 @@ 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; - tf->cur_event_pos = tf->a_block_start + sizeof(BlockStart); //first event + tf->cur_event_pos = tf->buffer;//the beginning of the block, block start ev tf->cur_heart_beat_number = 0; - tf->current_event_time = getEventTime(tf); - getCyclePerNsec(tf); + tf->current_event_time = getEventTime(tf); + return 0; } @@ -869,7 +958,7 @@ int readBlock(LttTracefile * tf, int whichBlock) void updateTracefile(LttTracefile * tf) { tf->which_event = 1; - tf->cur_event_pos = tf->a_block_start + sizeof(BlockStart); + tf->cur_event_pos = tf->buffer; tf->current_event_time = getEventTime(tf); tf->cur_heart_beat_number = 0; @@ -884,9 +973,6 @@ void updateTracefile(LttTracefile * tf) * t : tracefile *return value * 0 : success - * EINVAL : lseek fail - * EIO : can not read from the file - * ENOENT : end of file * ERANGE : event id is out of range ****************************************************************************/ @@ -899,30 +985,30 @@ int skipEvent(LttTracefile * t) evId = (int)(*(uint16_t *)(t->cur_event_pos)); evData = t->cur_event_pos + EVENT_HEADER_SIZE; - 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; - - t->prev_event_time = getEventTime(t); - //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->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_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) 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); } return 0; @@ -945,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; } @@ -970,22 +1058,49 @@ LttTime getEventTime(LttTracefile * tf) LttCycleCount lEventTotalCycle; // Total cycles from start for event 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){ + 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){ + 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; } @@ -998,12 +1113,13 @@ LttTime getEventTime(LttTracefile * tf) * evD : event data, it may be NULL ****************************************************************************/ -void setFieldsOffset(LttTracefile * t, LttEventType * evT, void * evD) +void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace* t) { LttField * rootFld = evT->root_field; // rootFld->base_address = evD; - rootFld->field_size = getFieldtypeSize(t, evT, 0,0,rootFld, evD); + if(rootFld) + rootFld->field_size = getFieldtypeSize(tf, evT, 0,0,rootFld, evD,t); } /***************************************************************************** @@ -1021,12 +1137,12 @@ void setFieldsOffset(LttTracefile * t, LttEventType * evT, void * evD) ****************************************************************************/ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, - int offsetParent, LttField * fld, void * evD) + int offsetParent, LttField * fld, void *evD, LttTrace *trace) { int size, size1, element_number, i, offset1, offset2; LttType * type = fld->field_type; - if(!t){ + if(t){ if(evT->latest_block==t->which_block && evT->latest_event==t->which_event){ return fld->field_size; } @@ -1039,14 +1155,14 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, if(type->type_class != LTT_STRUCT && type->type_class != LTT_ARRAY && type->type_class != LTT_SEQUENCE && type->type_class != LTT_STRING){ if(fld->field_fixed == -1){ - size = (int) ltt_type_size(t->trace, type); + size = (int) ltt_type_size(trace, type); fld->field_fixed = 1; }else size = fld->field_size; }else if(type->type_class == LTT_ARRAY){ element_number = (int) type->element_number; if(fld->field_fixed == -1){ - size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL); + size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace); if(size == 0){ //has string or sequence fld->field_fixed = 0; }else{ @@ -1057,15 +1173,16 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, size = 0; for(i=0;ichild[0], evD+size); + fld->child[0], evD+size, trace); } }else size = fld->field_size; }else if(type->type_class == LTT_SEQUENCE){ - size1 = (int) ltt_type_size(t->trace, type); + 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); + size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace); fld->element_size = size; }else{//0: sequence element_number = getIntNumber(size1,evD); @@ -1076,7 +1193,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, size = 0; for(i=0;ichild[0], evD+size+size1); + fld->child[0], evD+size+size1, trace); } } size += size1; @@ -1087,7 +1204,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, if(fld->field_fixed == -1){ fld->field_fixed = 0; }else{//0: string - size = sizeof((char*)evD) + 1; //include end : '\0' + size = strlen((char*)evD) + 1; //include end : '\0' } }else if(type->type_class == LTT_STRUCT){ @@ -1097,7 +1214,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, offset1 = offsetRoot; offset2 = 0; for(i=0;ichild[i], NULL); + size1=getFieldtypeSize(t, evT,offset1,offset2, fld->child[i], NULL, trace); if(size1 > 0 && size >= 0){ size += size1; if(offset1 >= 0) offset1 += size1; @@ -1116,7 +1233,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, offset1 = offsetRoot; offset2 = 0; for(i=0;ichild[i],evD+offset2); + size=getFieldtypeSize(t,evT,offset1,offset2,fld->child[i],evD+offset2, trace); offset1 += size; offset2 += size; } @@ -1147,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; } /*****************************************************************************