X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=f3ee2e20b8252c42cde495b4ae29250871ff5f6e;hb=4a6c8e36527c06c846bcd076c90b5935cf370477;hp=6c3d35f3b8aa04c9c689d745c87f7d6e08a7d509;hpb=40331ba8619dc3bbb00f735f90f68522ac788829;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 6c3d35f3..f3ee2e20 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -102,7 +102,8 @@ 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); + return NULL; } //store the size of the file @@ -129,6 +130,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,11 +146,12 @@ 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){ ev = ltt_tracefile_read(tf); if(!ev)return; // end of file @@ -156,8 +159,8 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name) 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); @@ -223,6 +226,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,6 +358,7 @@ void getFacilityInfo(LttTrace *t, char* eventdefs) int i,j; LttFacility * f; LttEventType * et; + char name[DIR_NAME_SIZE]; dir = opendir(eventdefs); if(!dir) g_error("Can not open directory: %s\n", eventdefs); @@ -361,12 +366,14 @@ 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); 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(NULL, et, NULL, t); @@ -378,16 +385,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); } @@ -396,14 +406,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); @@ -465,15 +478,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; } @@ -711,7 +724,7 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) }else if(err < 0){ err = t->which_block; if(ltt_tracefile_read(t) == NULL){ - g_printf("End of file\n"); + g_print("End of file\n"); return; } if(t->which_block == err) @@ -734,7 +747,7 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time) 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); @@ -778,7 +791,8 @@ LttEvent *ltt_tracefile_read(LttTracefile *t) //update the fields of the current event and go to the next event err = skipEvent(t); - if(err == ENOENT) return NULL; + if(err == ENOMEM) 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"); @@ -892,7 +906,8 @@ void updateTracefile(LttTracefile * tf) * 0 : success * EINVAL : lseek fail * EIO : can not read from the file - * ENOENT : end of file + * ENOMEM : end of file + * ENOENT : last event * ERANGE : event id is out of range ****************************************************************************/ @@ -902,27 +917,51 @@ 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; - evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId); - if(evT) rootFld = evT->root_field; - else return ERANGE; + //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); + + if(evT) rootFld = evT->root_field; + else return ERANGE; - //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); + 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; + } } - t->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_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; + 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; }else{ @@ -1015,7 +1054,8 @@ void setFieldsOffset(LttTracefile *tf,LttEventType *evT,void *evD,LttTrace* t) LttField * rootFld = evT->root_field; // rootFld->base_address = evD; - rootFld->field_size = getFieldtypeSize(tf, evT, 0,0,rootFld, evD,t); + if(rootFld) + rootFld->field_size = getFieldtypeSize(tf, evT, 0,0,rootFld, evD,t); } /***************************************************************************** @@ -1038,7 +1078,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot, 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; } @@ -1099,7 +1139,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){