X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=438c3597f2bbdedf18a495539b2ff362489c3aff;hb=2da616770cf1e686eafdca9f2b155826ad94ee46;hp=bd9a8fbe9eeaded3edb9e8f218c1b0cde8d8df02;hpb=96da5c0d83846884f7be822410209325a2dd0e51;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index bd9a8fbe..438c3597 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -17,6 +17,9 @@ */ #include +#include +#include + #include #include @@ -26,12 +29,24 @@ #include #include + +LttEvent *ltt_event_new() +{ + return g_new(LttEvent, 1); +} + +void ltt_event_destroy(LttEvent *event) +{ + g_free(event); +} + + /***************************************************************************** *Function name * ltt_event_refresh_fields : refresh fields of an event *Input params * offsetRoot : offset from the root - * offsetParent : offset from the parrent + * offsetParent : offset from the parent * fld : field * evD : event data *Return value @@ -44,6 +59,62 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, int size, size1, element_number, i, offset1, offset2; LttType * type = fld->field_type; + switch(type->type_class) { + case LTT_ARRAY: + element_number = (int) type->element_number; + if(fld->field_fixed == 0){// has string or sequence + size = 0; + for(i=0;ichild[0], evD+size); + } + }else size = fld->field_size; + break; + + case LTT_SEQUENCE: + size1 = fld->sequ_number_size; + element_number = getIntNumber(size1,evD); + type->element_number = element_number; + if(fld->element_size > 0){ + size = element_number * fld->element_size; + }else{//sequence has string or sequence + size = 0; + for(i=0;ichild[0], evD+size+size1); + } + size += size1; + } + break; + + case LTT_STRING: + size = strlen((char*)evD) + 1; //include end : '\0' + break; + + case LTT_STRUCT: + element_number = (int) type->element_number; + if(fld->field_fixed == 0){ + offset1 = offsetRoot; + offset2 = 0; + for(i=0;ichild[i],evD+offset2); + offset1 += size; + offset2 += size; + } + size = offset2; + }else size = fld->field_size; + break; + + case LTT_UNION: + size = fld->field_size; + break; + + default: + size = fld->field_size; + } + +#if 0 if(type->type_class != LTT_STRUCT && type->type_class != LTT_ARRAY && type->type_class != LTT_SEQUENCE && type->type_class != LTT_STRING){ size = fld->field_size; @@ -52,9 +123,9 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, if(fld->field_fixed == 0){// has string or sequence size = 0; for(i=0;ichild[0], evD+size); - } + } }else size = fld->field_size; }else if(type->type_class == LTT_SEQUENCE){ size1 = fld->sequ_number_size; @@ -65,8 +136,8 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, }else{//sequence has string or sequence size = 0; for(i=0;ichild[0], evD+size+size1); + size += ltt_event_refresh_fields(offsetRoot+size+size1,size+size1, + fld->child[0], evD+size+size1); } size += size1; } @@ -78,14 +149,15 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, offset1 = offsetRoot; offset2 = 0; for(i=0;ichild[i],evD+offset2); - offset1 += size; - offset2 += size; + size=ltt_event_refresh_fields(offset1,offset2, + fld->child[i],evD+offset2); + offset1 += size; + offset2 += size; } size = offset2; }else size = fld->field_size; } - +#endif //0 fld->offset_root = offsetRoot; fld->offset_parent = offsetParent; fld->fixed_root = (offsetRoot==-1) ? 0 : 1; @@ -155,21 +227,19 @@ LttField *ltt_event_field(LttEvent *e) { LttField * field; LttEventType * event_type = ltt_event_eventtype(e); - if(!event_type) return NULL; + if(unlikely(!event_type)) return NULL; field = event_type->root_field; - if(!field) return NULL; + if(unlikely(!field)) return NULL; //check if the field need refresh - if(e->which_block != event_type->latest_block || - e->which_event != event_type->latest_event){ + if(likely(e->which_block != event_type->latest_block || + e->which_event != event_type->latest_event)){ event_type->latest_block = e->which_block; event_type->latest_event = e->which_event; - if(field->field_fixed == 1)return field; - - //refresh the field - ltt_event_refresh_fields(0, 0, field, e->data); + if(unlikely(field->field_fixed != 1)) + ltt_event_refresh_fields(0, 0, field, e->data); } return field; } @@ -217,9 +287,19 @@ void ltt_event_position(LttEvent *e, LttEventPosition *ep) 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->old_position = TRUE; ep->event_offset = e->data - e->tracefile->buffer - EVENT_HEADER_SIZE ; ep->tf = e->tracefile; + ep->overflow_nsec = e->overflow_nsec; + /* This is a workaround for fast position seek */ + ep->last_event_pos = e->last_event_pos; + ep->prev_block_end_time = e->prev_block_end_time; + ep->prev_event_time = e->prev_event_time; + ep->pre_cycle_count = e->pre_cycle_count; + ep->count = e->count; + ep->last_heartbeat = e->last_heartbeat; + + /* end of workaround */ } LttEventPosition * ltt_event_position_new() @@ -247,6 +327,8 @@ void ltt_event_position_get(LttEventPosition *ep, /***************************************************************************** *Function name * ltt_event_position_set : set the block number and index of the event + * It does put the old_position gboolean to FALSE, as it is impossible + * to know the quick position to seek in the tracefile. *Input params * ep : a pointer to event's position structure * block_number : the block number of the event @@ -256,13 +338,18 @@ void ltt_event_position_get(LttEventPosition *ep, void ltt_event_position_set(LttEventPosition *ep, unsigned block_number, unsigned index_in_block) { + if(ep->block_num != block_number || ep->event_num != index_in_block) + ep->old_position = FALSE; + ep->block_num = block_number; - ep->event_num = index_in_block; + ep->event_num = index_in_block; + } /***************************************************************************** * Function name * ltt_event_position_compare : compare two positions + * A NULL value is infinite. * Input params * ep1 : a pointer to event's position structure * ep2 : a pointer to event's position structure @@ -278,6 +365,13 @@ gint ltt_event_position_compare(const LttEventPosition *ep1, { if(ep1->tf != ep2->tf) g_error("ltt_event_position_compare on different tracefiles makes no sense"); + if(ep1 == NULL && ep2 == NULL) + return 0; + if(ep1 != NULL && ep2 == NULL) + return -1; + if(ep1 == NULL && ep2 != NULL) + return 1; + if(ep1->block_num < ep2->block_num) return -1; if(ep1->block_num > ep2->block_num) @@ -305,19 +399,43 @@ gint ltt_event_position_compare(const LttEventPosition *ep1, gint ltt_event_event_position_compare(const LttEvent *event, const LttEventPosition *ep) { - if(event->tf != ep->tf) - g_error("ltt_event_position_compare on different tracefiles makes no sense"); - if(e->which_block < ep->block_num) + if(event == NULL && ep == NULL) + return 0; + if(event != NULL && ep == NULL) + return -1; + if(event == NULL && ep != NULL) + return 1; + + g_assert(event->tracefile == ep->tf); + + if(event->which_block < ep->block_num) return -1; - if(e->which_block > ep->block_num) + if(event->which_block > ep->block_num) return 1; - if(e->which_event < ep->event_num) + if(event->which_event < ep->event_num) return -1; - if(e->which_event > ep->event_num) + if(event->which_event > ep->event_num) return 1; return 0; } +/***************************************************************************** + * Function name + * ltt_event_position_copy : copy position + * Input params + * src : a pointer to event's position structure source + * dest : a pointer to event's position structure dest + * Return + * void + ****************************************************************************/ +void ltt_event_position_copy(LttEventPosition *dest, + const LttEventPosition *src) +{ + if(src == NULL) + dest = NULL; + else + *dest = *src; +} /***************************************************************************** @@ -402,7 +520,8 @@ void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) { unsigned element_number; LttField *fld; - int k, size; + unsigned int k; + int size; void *evD; if(f->field_type->type_class != LTT_ARRAY && @@ -410,7 +529,9 @@ void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) return ; element_number = ltt_event_field_element_number(e,f); - if((element_number-1) < i || i < 0) return; + /* Sanity check for i : 1..n only, and must be lower or equal element_number + */ + if(element_number < i || i == 0) return; fld = f->child[0]; @@ -419,7 +540,6 @@ void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) for(k=0;koffset_root+size,size, fld, evD+size); } - f->current_element = i - 1; } @@ -428,134 +548,144 @@ void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) * conversions ****************************************************************************/ -unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f) +guint32 ltt_event_get_unsigned(LttEvent *e, LttField *f) { int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; LttTypeEnum t = f->field_type->type_class; - if(t != LTT_UINT && t != LTT_ENUM) - g_error("The type of the field is not unsigned int\n"); + g_assert(t == LTT_UINT || t == LTT_ENUM); if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); - return (unsigned int) x; + return (guint32) x; }else if(f->field_size == 2){ 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); + return (guint32) (revFlag ? GUINT16_FROM_BE(x): x); else - return (unsigned int) (revFlag ? GUINT16_FROM_LE(x): x); + return (guint32) (revFlag ? GUINT16_FROM_LE(x): x); }else if(f->field_size == 4){ 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); + return (guint32) (revFlag ? GUINT32_FROM_BE(x): x); else - return (unsigned int) (revFlag ? GUINT32_FROM_LE(x): x); - }else if(f->field_size == 8){ + return (guint32) (revFlag ? GUINT32_FROM_LE(x): x); + } +#if 0 + else if(f->field_size == 8){ 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); } +#endif //0 + g_critical("ltt_event_get_unsigned : field size %i unknown", f->field_size); + return 0; } -int ltt_event_get_int(LttEvent *e, LttField *f) +gint32 ltt_event_get_int(LttEvent *e, LttField *f) { int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; - if(f->field_type->type_class != LTT_INT) - g_error("The type of the field is not int\n"); + g_assert(f->field_type->type_class == LTT_INT); if(f->field_size == 1){ gint8 x = *(gint8 *)(e->data + f->offset_root); - return (int) x; + return (gint32) x; }else if(f->field_size == 2){ 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); + return (gint32) (revFlag ? GINT16_FROM_BE(x): x); else - return (int) (revFlag ? GINT16_FROM_LE(x): x); + return (gint32) (revFlag ? GINT16_FROM_LE(x): x); }else if(f->field_size == 4){ 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); + return (gint32) (revFlag ? GINT32_FROM_BE(x): x); else - return (int) (revFlag ? GINT32_FROM_LE(x): x); - }else if(f->field_size == 8){ + return (gint32) (revFlag ? GINT32_FROM_LE(x): x); + } +#if 0 + else if(f->field_size == 8){ 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); } +#endif //0 + g_critical("ltt_event_get_int : field size %i unknown", f->field_size); + return 0; } -unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f) +guint64 ltt_event_get_long_unsigned(LttEvent *e, LttField *f) { int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; LttTypeEnum t = f->field_type->type_class; - if(t != LTT_UINT && t != LTT_ENUM) - g_error("The type of the field is not unsigned long\n"); + g_assert(t == LTT_UINT || t == LTT_ENUM); if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); - return (unsigned long) x; + return (guint64) x; }else if(f->field_size == 2){ 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); + return (guint64) (revFlag ? GUINT16_FROM_BE(x): x); else - return (unsigned long) (revFlag ? GUINT16_FROM_LE(x): x); + return (guint64) (revFlag ? GUINT16_FROM_LE(x): x); }else if(f->field_size == 4){ 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); + return (guint64) (revFlag ? GUINT32_FROM_BE(x): x); else - return (unsigned long) (revFlag ? GUINT32_FROM_LE(x): x); + return (guint64) (revFlag ? GUINT32_FROM_LE(x): x); }else if(f->field_size == 8){ 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); + return (guint64) (revFlag ? GUINT64_FROM_BE(x): x); else - return (unsigned long) (revFlag ? GUINT64_FROM_LE(x): x); + return (guint64) (revFlag ? GUINT64_FROM_LE(x): x); } + g_critical("ltt_event_get_long_unsigned : field size %i unknown", f->field_size); + return 0; } -long int ltt_event_get_long_int(LttEvent *e, LttField *f) +gint64 ltt_event_get_long_int(LttEvent *e, LttField *f) { int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; - if( f->field_type->type_class != LTT_INT) - g_error("The type of the field is not long int\n"); + g_assert( f->field_type->type_class == LTT_INT); if(f->field_size == 1){ gint8 x = *(gint8 *)(e->data + f->offset_root); - return (long) x; + return (gint64) x; }else if(f->field_size == 2){ 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); + return (gint64) (revFlag ? GINT16_FROM_BE(x): x); else - return (long) (revFlag ? GINT16_FROM_LE(x): x); + return (gint64) (revFlag ? GINT16_FROM_LE(x): x); }else if(f->field_size == 4){ 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); + return (gint64) (revFlag ? GINT32_FROM_BE(x): x); else - return (long) (revFlag ? GINT32_FROM_LE(x): x); + return (gint64) (revFlag ? GINT32_FROM_LE(x): x); }else if(f->field_size == 8){ 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); + return (gint64) (revFlag ? GINT64_FROM_BE(x): x); else - return (long) (revFlag ? GINT64_FROM_LE(x): x); + return (gint64) (revFlag ? GINT64_FROM_LE(x): x); } + g_critical("ltt_event_get_long_int : field size %i unknown", f->field_size); + return 0; } float ltt_event_get_float(LttEvent *e, LttField *f) @@ -563,16 +693,14 @@ float ltt_event_get_float(LttEvent *e, LttField *f) int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; - if(f->field_type->type_class != LTT_FLOAT || - (f->field_type->type_class == LTT_FLOAT && f->field_size != 4)) - g_error("The type of the field is not float\n"); + g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 4); if(revFlag == 0) return *(float *)(e->data + f->offset_root); else{ guint32 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 4); aInt = ___swab32(aInt); - return *((float*)&aInt); + return ((float)aInt); } } @@ -581,16 +709,14 @@ double ltt_event_get_double(LttEvent *e, LttField *f) int revFlag = e->tracefile->trace->my_arch_endian == e->tracefile->trace->system_description->endian ? 0:1; - if(f->field_type->type_class != LTT_FLOAT || - (f->field_type->type_class == LTT_FLOAT && f->field_size != 8)) - g_error("The type of the field is not double\n"); + g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 8); if(revFlag == 0) return *(double *)(e->data + f->offset_root); else{ guint64 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 8); aInt = ___swab64(aInt); - return *((double *)&aInt); + return ((double)aInt); } } @@ -601,7 +727,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f) char *ltt_event_get_string(LttEvent *e, LttField *f) { - if(f->field_type->type_class != LTT_STRING) - g_error("The field contains no string\n"); + g_assert(f->field_type->type_class == LTT_STRING); + return (char*)g_strdup((char*)(e->data + f->offset_root)); }