X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=395d46b114ef68d9ded7a7456f7f5f91effe99ec;hb=1d1df11d0582bef07ef2b33e8e82a75b08f32be4;hp=d83c62c043a4d87bf8abfcfd3accd1db07d43bca;hpb=18206708bafbba3198bfb82cca97f17d70a05666;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index d83c62c0..395d46b1 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,6 +29,18 @@ #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 @@ -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; } @@ -255,6 +325,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 @@ -264,8 +336,12 @@ 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; + } /***************************************************************************** @@ -442,7 +518,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 && @@ -450,7 +527,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]; @@ -459,7 +538,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; } @@ -498,6 +576,8 @@ unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f) else return (unsigned int) (revFlag ? GUINT64_FROM_LE(x): x); } + g_critical("ltt_event_get_unsigned : field size %i unknown", f->field_size); + return 0; } int ltt_event_get_int(LttEvent *e, LttField *f) @@ -529,6 +609,8 @@ int ltt_event_get_int(LttEvent *e, LttField *f) else return (int) (revFlag ? GINT64_FROM_LE(x): x); } + 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) @@ -561,6 +643,8 @@ unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f) else return (unsigned long) (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) @@ -592,6 +676,8 @@ long int ltt_event_get_long_int(LttEvent *e, LttField *f) else return (long) (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) @@ -606,7 +692,7 @@ float ltt_event_get_float(LttEvent *e, LttField *f) guint32 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 4); aInt = ___swab32(aInt); - return *((float*)&aInt); + return ((float)aInt); } } @@ -622,7 +708,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f) guint64 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 8); aInt = ___swab64(aInt); - return *((double *)&aInt); + return ((double)aInt); } }