X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=f1751514d51f85bf090665744596f1ade3bc7db6;hb=b333a76ba95c2cf818eda8d96a925f0e3712edb5;hp=0bef060a5c79e7e7f7ba919d553ed6c80b734466;hpb=25975c93256ee34b4c16b8cd96871ca9f63b7a07;p=lttv.git diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 0bef060a..f1751514 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 @@ -144,6 +145,7 @@ 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); @@ -156,8 +158,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 +225,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: @@ -369,7 +372,7 @@ void getFacilityInfo(LttTrace *t, char* eventdefs) 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); @@ -387,8 +390,8 @@ void getControlFileInfo(LttTrace *t, char* 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; strcpy(name,control); @@ -408,7 +411,7 @@ void getCpuFileInfo(LttTrace *t, char* 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 ){ strcpy(name,cpu); strcat(name,entry->d_name); @@ -474,15 +477,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; } @@ -787,7 +790,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"); @@ -901,7 +905,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 ****************************************************************************/ @@ -911,27 +916,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{ @@ -1024,7 +1053,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); } /***************************************************************************** @@ -1047,7 +1077,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; } @@ -1108,7 +1138,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){