X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=f762dbddf5d174e306175115682f4d94a8776444;hb=9d6cdb7be95c430c6ad61ffc7bff0f0942c95b71;hp=e26eb451f7dfc5f235556f76a2ec5998f21c22b6;hpb=b7b362420226be756a7e832353112f45114b9940;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index e26eb451..f762dbdd 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -1,9 +1,12 @@ #include #include #include -#include + #include "parser.h" +#include +#include "ltt-private.h" #include +#include /***************************************************************************** *Function name @@ -136,6 +139,7 @@ LttField *ltt_event_field(LttEvent *e) LttEventType * event_type = ltt_event_eventtype(e); if(!event_type) return NULL; field = event_type->root_field; + if(!field) return NULL; //check if the field need refresh if(e->which_block != event_type->latest_block || @@ -180,6 +184,64 @@ LttCycleCount ltt_event_cycle_count(LttEvent *e) return e->event_cycle_count; } +/***************************************************************************** + *Function name + * ltt_event_position : get the event's position + *Input params + * e : an instance of an event type + * ep : a pointer to event's position structure + ****************************************************************************/ + +void ltt_event_position(LttEvent *e, LttEventPosition *ep) +{ + ep->block_num = e->which_block; + ep->event_num = e->which_event; + ep->event_time = e->event_time; + ep->event_cycle_count = e->event_cycle_count; + ep->heart_beat_number = e->tracefile->cur_heart_beat_number; + ep->old_position = FALSE; + ep->event_offset = e->data - e->tracefile->buffer - EVENT_HEADER_SIZE ; + ep->tf = e->tracefile; +} + +LttEventPosition * ltt_event_position_new() +{ + return g_new(LttEventPosition, 1); +} + +/***************************************************************************** + *Function name + * ltt_event_position_get : get the block number and index of the event + *Input params + * ep : a pointer to event's position structure + * block_number : the block number of the event + * index_in_block : the index of the event within the block + ****************************************************************************/ + +void ltt_event_position_get(LttEventPosition *ep, + unsigned *block_number, unsigned *index_in_block, LttTracefile ** tf) +{ + *block_number = ep->block_num; + *index_in_block = ep->event_num; + *tf = ep->tf; +} + +/***************************************************************************** + *Function name + * ltt_event_position_set : set the block number and index of the event + *Input params + * ep : a pointer to event's position structure + * block_number : the block number of the event + * index_in_block : the index of the event within the block + ****************************************************************************/ + +void ltt_event_position_set(LttEventPosition *ep, + unsigned block_number, unsigned index_in_block) +{ + ep->block_num = block_number; + ep->event_num = index_in_block; +} + /***************************************************************************** *Function name * ltt_event_cpu_i: get the cpu id where the event happens @@ -190,8 +252,23 @@ LttCycleCount ltt_event_cycle_count(LttEvent *e) ****************************************************************************/ unsigned ltt_event_cpu_id(LttEvent *e) -{ - return (unsigned)atoi(e->tracefile->name); +{ + char * c1, * c2, * c3; + c1 = strrchr(e->tracefile->name,'\\'); + c2 = strrchr(e->tracefile->name,'/'); + if(c1 == NULL && c2 == NULL){ + return (unsigned)atoi(e->tracefile->name); + }else if(c1 == NULL){ + c2++; + return (unsigned)atoi(c2); + }else if(c2 == NULL){ + c1++; + return (unsigned)atoi(c1); + }else{ + c3 = (c1 > c2) ? c1 : c2; + c3++; + return (unsigned)atoi(c3); + } } /***************************************************************************** @@ -283,17 +360,26 @@ unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f) g_error("The type of the field is not unsigned int\n"); if(f->field_size == 1){ - uint8_t x = *(uint8_t*)(e->data + f->offset_root); + guint8 x = *(guint8 *)(e->data + f->offset_root); return (unsigned int) x; }else if(f->field_size == 2){ - uint16_t x = *(uint16_t*)(e->data + f->offset_root); - return (unsigned int) (revFlag ? BREV16(x): x); + guint16 x = *(guint16 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned int) (revFlag ? GUINT16_FROM_BE(x): x); + else + return (unsigned int) (revFlag ? GUINT16_FROM_LE(x): x); }else if(f->field_size == 4){ - uint32_t x = *(uint32_t*)(e->data + f->offset_root); - return (unsigned int) (revFlag ? BREV32(x): x); + guint32 x = *(guint32 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned int) (revFlag ? GUINT32_FROM_BE(x): x); + else + return (unsigned int) (revFlag ? GUINT32_FROM_LE(x): x); }else if(f->field_size == 8){ - uint64_t x = *(uint64_t*)(e->data + f->offset_root); - return (unsigned int) (revFlag ? BREV64(x): x); + guint64 x = *(guint64 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned int) (revFlag ? GUINT64_FROM_BE(x): x); + else + return (unsigned int) (revFlag ? GUINT64_FROM_LE(x): x); } } @@ -306,17 +392,26 @@ int ltt_event_get_int(LttEvent *e, LttField *f) g_error("The type of the field is not int\n"); if(f->field_size == 1){ - int8_t x = *(int8_t*)(e->data + f->offset_root); + gint8 x = *(gint8 *)(e->data + f->offset_root); return (int) x; }else if(f->field_size == 2){ - int16_t x = *(int16_t*)(e->data + f->offset_root); - return (int) (revFlag ? BREV16(x): x); + gint16 x = *(gint16 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (int) (revFlag ? GINT16_FROM_BE(x): x); + else + return (int) (revFlag ? GINT16_FROM_LE(x): x); }else if(f->field_size == 4){ - int32_t x = *(int32_t*)(e->data + f->offset_root); - return (int) (revFlag ? BREV32(x): x); + gint32 x = *(gint32 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (int) (revFlag ? GINT32_FROM_BE(x): x); + else + return (int) (revFlag ? GINT32_FROM_LE(x): x); }else if(f->field_size == 8){ - int64_t x = *(int64_t*)(e->data + f->offset_root); - return (int) (revFlag ? BREV64(x): x); + gint64 x = *(gint64 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (int) (revFlag ? GINT64_FROM_BE(x): x); + else + return (int) (revFlag ? GINT64_FROM_LE(x): x); } } @@ -330,17 +425,26 @@ unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f) g_error("The type of the field is not unsigned long\n"); if(f->field_size == 1){ - uint8_t x = *(uint8_t*)(e->data + f->offset_root); + guint8 x = *(guint8 *)(e->data + f->offset_root); return (unsigned long) x; }else if(f->field_size == 2){ - uint16_t x = *(uint16_t*)(e->data + f->offset_root); - return (unsigned long) (revFlag ? BREV16(x): x); + guint16 x = *(guint16 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned long) (revFlag ? GUINT16_FROM_BE(x): x); + else + return (unsigned long) (revFlag ? GUINT16_FROM_LE(x): x); }else if(f->field_size == 4){ - uint32_t x = *(uint32_t*)(e->data + f->offset_root); - return (unsigned long) (revFlag ? BREV32(x): x); + guint32 x = *(guint32 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned long) (revFlag ? GUINT32_FROM_BE(x): x); + else + return (unsigned long) (revFlag ? GUINT32_FROM_LE(x): x); }else if(f->field_size == 8){ - uint64_t x = *(uint64_t*)(e->data + f->offset_root); - return (unsigned long) (revFlag ? BREV64(x): x); + guint64 x = *(guint64 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (unsigned long) (revFlag ? GUINT64_FROM_BE(x): x); + else + return (unsigned long) (revFlag ? GUINT64_FROM_LE(x): x); } } @@ -353,17 +457,26 @@ long int ltt_event_get_long_int(LttEvent *e, LttField *f) g_error("The type of the field is not long int\n"); if(f->field_size == 1){ - int8_t x = *(int8_t*)(e->data + f->offset_root); + gint8 x = *(gint8 *)(e->data + f->offset_root); return (long) x; }else if(f->field_size == 2){ - int16_t x = *(int16_t*)(e->data + f->offset_root); - return (long) (revFlag ? BREV16(x): x); + gint16 x = *(gint16 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (long) (revFlag ? GINT16_FROM_BE(x): x); + else + return (long) (revFlag ? GINT16_FROM_LE(x): x); }else if(f->field_size == 4){ - int32_t x = *(int32_t*)(e->data + f->offset_root); - return (long) (revFlag ? BREV32(x): x); + gint32 x = *(gint32 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (long) (revFlag ? GINT32_FROM_BE(x): x); + else + return (long) (revFlag ? GINT32_FROM_LE(x): x); }else if(f->field_size == 8){ - int64_t x = *(int64_t*)(e->data + f->offset_root); - return (long) (revFlag ? BREV64(x): x); + gint64 x = *(gint64 *)(e->data + f->offset_root); + if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) + return (long) (revFlag ? GINT64_FROM_BE(x): x); + else + return (long) (revFlag ? GINT64_FROM_LE(x): x); } } @@ -378,7 +491,7 @@ float ltt_event_get_float(LttEvent *e, LttField *f) if(revFlag == 0) return *(float *)(e->data + f->offset_root); else{ - uint32_t aInt; + guint32 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 4); aInt = ___swab32(aInt); return *((float*)&aInt); @@ -396,7 +509,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f) if(revFlag == 0) return *(double *)(e->data + f->offset_root); else{ - uint64_t aInt; + guint64 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 8); aInt = ___swab64(aInt); return *((double *)&aInt);