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;i<t->facility_number;i++){
f = (LttFacility*)g_ptr_array_index(t->facilities,i);
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;
}
//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");
* 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
****************************************************************************/
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{
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){