X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=0e87646e258c41d03500884144f2f76f0b709fc2;hb=3c165eaf5aa1e60ce88c036cfb692ce3e1d81585;hp=2827cff9aaf7fd1b038f643b0d96088eff671d09;hpb=d421441814ae10380308a411418c53ea5f05d858;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index 2827cff9..0e87646e 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -1,19 +1,20 @@ /* This file is part of the Linux Trace Toolkit viewer * Copyright (C) 2003-2004 Xiangxiu Yang + * 2006 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation; + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License Version 2.1 as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -34,6 +35,13 @@ #include #include #include +#include + + +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root, + guint is_compact); + LttEvent *ltt_event_new() { @@ -46,137 +54,6 @@ void ltt_event_destroy(LttEvent *event) } -#if 0 -/* Use get_field_type_size instead */ -/***************************************************************************** - *Function name - * ltt_event_refresh_fields : refresh fields of an event - *Input params - * offsetRoot : offset from the root - * offsetParent : offset from the parent - * fld : field - * evD : event data - * reverse_byte_order : 1 or 0 - *Return value - * int : size of the field - ****************************************************************************/ - -int ltt_event_refresh_fields(int offsetRoot,int offsetParent, - LttField * fld, void *evD, gboolean reverse_byte_order) -{ - 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, reverse_byte_order); - } - }else size = fld->field_size; - break; - - case LTT_SEQUENCE: - size1 = fld->sequ_number_size; - element_number = getIntNumber(reverse_byte_order,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, reverse_byte_order); - } - size += size1; - } - break; - - case LTT_STRING: - size = strlen((gchar*)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, reverse_byte_order); - 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; - }else if(type->type_class == 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; - }else if(type->type_class == 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; - } - }else if(type->type_class == LTT_STRING){ - size = strlen((char*)evD) + 1; //include end : '\0' - }else if(type->type_class == 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; - } -#endif //0 - fld->offset_root = offsetRoot; - fld->offset_parent = offsetParent; - fld->fixed_root = (offsetRoot==-1) ? 0 : 1; - fld->fixed_parent = (offsetParent==-1) ? 0 : 1; - fld->field_size = size; - - return size; -} -#endif //0 - - /***************************************************************************** *Function name * ltt_event_eventtype_id: get event type id @@ -187,9 +64,9 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, * unsigned : event type id ****************************************************************************/ -unsigned ltt_event_eventtype_id(const LttEvent *e) +uint16_t ltt_event_eventtype_id(const LttEvent *e) { - return (unsigned) e->event_id; + return e->event_id; } /***************************************************************************** @@ -198,71 +75,12 @@ unsigned ltt_event_eventtype_id(const LttEvent *e) *Input params * e : an instance of an event type *Return value - * LttFacility * : the facility of the event + * struct marker_info *: the marker associated with the event ****************************************************************************/ -LttFacility *ltt_event_facility(const LttEvent *e) +struct marker_info *ltt_event_marker(const LttEvent *e) { - LttTrace * trace = e->tracefile->trace; - unsigned id = e->facility_id; - LttFacility *facility = ltt_trace_facility_by_id(trace,id); - - g_assert(facility->exists); - - return facility; -} - -/***************************************************************************** - *Function name - * ltt_event_facility_id : get the facility id of the event - *Input params - * e : an instance of an event type - *Return value - * unsigned : the facility of the event - ****************************************************************************/ - -unsigned ltt_event_facility_id(const LttEvent *e) -{ - return e->facility_id; -} - -/***************************************************************************** - *Function name - * ltt_event_eventtype : get the event type of the event - *Input params - * e : an instance of an event type - *Return value - * LttEventType * : the event type of the event - ****************************************************************************/ - -LttEventType *ltt_event_eventtype(const LttEvent *e) -{ - LttFacility* facility = ltt_event_facility(e); - if(!facility) return NULL; - return &g_array_index(facility->events, LttEventType, e->event_id); -} - -/***************************************************************************** - *Function name - * ltt_event_field : get the root field of the event - *Input params - * e : an instance of an event type - *Return value - * LttField * : the root field of the event - ****************************************************************************/ - -LttField *ltt_event_field(LttEvent *e) -{ - LttField * field; - LttEventType * event_type = ltt_event_eventtype(e); - if(unlikely(!event_type)) return NULL; - field = event_type->root_field; - if(unlikely(!field)) return NULL; - - get_field_type_size(e->tracefile, event_type, 0, 0, - field, e->data); - - return field; + return marker_get_info_from_id(e->tracefile->trace, e->event_id); } /***************************************************************************** @@ -293,8 +111,6 @@ LttCycleCount ltt_event_cycle_count(const LttEvent *e) return e->tsc; } - - /***************************************************************************** *Function name * ltt_event_position_get : get the event position data @@ -316,6 +132,16 @@ void ltt_event_position_get(LttEventPosition *ep, LttTracefile **tf, } +void ltt_event_position_set(LttEventPosition *ep, LttTracefile *tf, + guint block, guint offset, guint64 tsc) +{ + ep->tracefile = tf; + ep->block = block; + ep->offset = offset; + ep->tsc = tsc; +} + + /***************************************************************************** *Function name * ltt_event_position : get the event's position @@ -443,14 +269,14 @@ void *ltt_event_data(LttEvent *e) ****************************************************************************/ guint64 ltt_event_field_element_number(LttEvent *e, LttField *f) { - if(f->field_type->type_class != LTT_ARRAY && - f->field_type->type_class != LTT_SEQUENCE) + if(f->field_type.type_class != LTT_ARRAY && + f->field_type.type_class != LTT_SEQUENCE) return 0; - if(f->field_type->type_class == LTT_ARRAY) - return f->field_type->element_number; - return ltt_get_uint(LTT_GET_BO(e->tracefile), f->sequ_number_size, - e + f->offset_root); + if(f->field_type.type_class == LTT_ARRAY) + return f->field_type.size; + return ltt_event_get_long_unsigned(e, &g_array_index(f->field_type.fields, + LttField, 0)); } /***************************************************************************** @@ -458,191 +284,229 @@ guint64 ltt_event_field_element_number(LttEvent *e, LttField *f) * ltt_event_field_element_select * : Set the currently selected element for a sequence or * array field - * O(1) if fields are of fixed size, else O(n) if fields are - * of variable size. + * O(1) because of offset array. *Input params * e : an instance of an event type * f : a field of the instance * i : the ith element (0, ...) + *returns : the child field, at the right index, updated. ****************************************************************************/ -void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) +LttField *ltt_event_field_element_select(LttEvent *e, LttField *f, gulong i) { - unsigned element_number; + gulong element_number; LttField *field; unsigned int k; size_t size; LttEventType *event_type; + off_t new_offset; - if(f->field_type->type_class != LTT_ARRAY && - f->field_type->type_class != LTT_SEQUENCE) - return ; + if(f->field_type.type_class != LTT_ARRAY && + f->field_type.type_class != LTT_SEQUENCE) + return NULL; element_number = ltt_event_field_element_number(e,f); event_type = ltt_event_eventtype(e); /* Sanity check for i : 0..n-1 only, and must be lower or equal element_number */ - if(i >= element_number) return; - - field = f->child[0]; - - if(f->field_type->type_class == LTT_SEQUENCE) - size = f->sequ_number_size; - else - size = 0; - - if(field->fixed_size == FIELD_FIXED) { - size += field->field_size * i; - - get_field_type_size(e->tracefile, event_type, - f->offset_root+size, size, field, e->data); + if(i >= element_number) return NULL; + + if(f->field_type.type_class == LTT_ARRAY) { + field = &g_array_index(f->field_type.fields, LttField, 0); + } else { + field = &g_array_index(f->field_type.fields, LttField, 1); + } + if(field->field_size != 0) { + if(f->array_offset + (i * field->field_size) == field->offset_root) + return field; /* fixed length child, already at the right offset */ + else + new_offset = f->array_offset + (i * field->field_size); } else { - for(k=0;k<=i;k++){ - size += get_field_type_size(e->tracefile, event_type, - f->offset_root+size, size, field, e->data); - } + /* Var. len. child */ + new_offset = g_array_index(f->dynamic_offsets, off_t, i); } - f->current_element = i; + compute_fields_offsets(e->tracefile, + ltt_event_facility(e), field, &new_offset, e->data, 0); + + return field; } + +off_t ltt_event_field_offset(LttEvent *e, LttField *f) +{ + return f->offset_root; +} + + + /***************************************************************************** * These functions extract data from an event after architecture specific * conversions ****************************************************************************/ guint32 ltt_event_get_unsigned(LttEvent *e, LttField *f) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); - - LttTypeEnum t = f->field_type->type_class; - - g_assert(t == LTT_UINT || t == LTT_ENUM); + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + reverse_byte_order = LTT_GET_BO(e->tracefile); + } - if(f->field_size == 1){ - guint8 x = *(guint8 *)(e->data + f->offset_root); - return (guint32) x; - }else if(f->field_size == 2){ + switch(f->field_size) { + case 1: + { + guint8 x = *(guint8 *)(e->data + f->offset_root); + return (guint32) x; + } + break; + case 2: return (guint32)ltt_get_uint16(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 4){ + break; + case 4: return (guint32)ltt_get_uint32(reverse_byte_order, e->data + f->offset_root); + break; + case 8: + default: + g_critical("ltt_event_get_unsigned : field size %i unknown", f->field_size); + return 0; + break; } -#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; } gint32 ltt_event_get_int(LttEvent *e, LttField *f) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); - - g_assert(f->field_type->type_class == LTT_INT); + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + reverse_byte_order = LTT_GET_BO(e->tracefile); + } - if(f->field_size == 1){ - gint8 x = *(gint8 *)(e->data + f->offset_root); - return (gint32) x; - }else if(f->field_size == 2){ + switch(f->field_size) { + case 1: + { + gint8 x = *(gint8 *)(e->data + f->offset_root); + return (gint32) x; + } + break; + case 2: return (gint32)ltt_get_int16(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 4){ + break; + case 4: return (gint32)ltt_get_int32(reverse_byte_order, e->data + f->offset_root); + break; + case 8: + default: + g_critical("ltt_event_get_int : field size %i unknown", f->field_size); + return 0; + break; } -#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; } guint64 ltt_event_get_long_unsigned(LttEvent *e, LttField *f) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); - - LttTypeEnum t = f->field_type->type_class; - - g_assert(t == LTT_UINT || t == LTT_ENUM - || t == LTT_ULONG || LTT_SIZE_T || LTT_OFF_T || LTT_POINTER); - - if(f->field_size == 1){ - guint8 x = *(guint8 *)(e->data + f->offset_root); - return (guint64) x; - }else if(f->field_size == 2){ + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + reverse_byte_order = LTT_GET_BO(e->tracefile); + } + + switch(f->field_size) { + case 1: + { + guint8 x = *(guint8 *)(e->data + f->offset_root); + return (guint64) x; + } + break; + case 2: return (guint64)ltt_get_uint16(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 4){ + break; + case 4: return (guint64)ltt_get_uint32(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 8){ + break; + case 8: return ltt_get_uint64(reverse_byte_order, e->data + f->offset_root); + break; + default: + g_critical("ltt_event_get_long_unsigned : field size %i unknown", f->field_size); + return 0; + break; } - g_critical("ltt_event_get_long_unsigned : field size %i unknown", f->field_size); - return 0; } 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; - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); - - g_assert( f->field_type->type_class == LTT_INT - || f->field_type->type_class == LTT_LONG - || f->field_type->type_class == LTT_SSIZE_T); - - if(f->field_size == 1){ - gint8 x = *(gint8 *)(e->data + f->offset_root); - return (gint64) x; - }else if(f->field_size == 2){ + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + reverse_byte_order = LTT_GET_BO(e->tracefile); + } + + switch(f->field_size) { + case 1: + { + gint8 x = *(gint8 *)(e->data + f->offset_root); + return (gint64) x; + } + break; + case 2: return (gint64)ltt_get_int16(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 4){ + break; + case 4: return (gint64)ltt_get_int32(reverse_byte_order, e->data + f->offset_root); - }else if(f->field_size == 8){ + break; + case 8: return ltt_get_int64(reverse_byte_order, e->data + f->offset_root); + break; + default: + g_critical("ltt_event_get_long_int : field size %i unknown", f->field_size); + return 0; + break; } - 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) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + g_assert(LTT_HAS_FLOAT(e->tracefile)); + reverse_byte_order = LTT_GET_FLOAT_BO(e->tracefile); + } - g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 4); + g_assert(f->field_type.type_class == LTT_FLOAT && f->field_size == 4); if(reverse_byte_order == 0) return *(float *)(e->data + f->offset_root); else{ -// guint32 aInt; void *ptr = e->data + f->offset_root; -// memcpy((void*)&aInt, e->data + f->offset_root, 4); -// aInt = bswap_32(); -// return ((float)aInt); - return *(float*)bswap_32(*(guint32*)ptr); + guint32 value = bswap_32(*(guint32*)ptr); + return *(float*)&value; } } double ltt_event_get_double(LttEvent *e, LttField *f) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); + gboolean reverse_byte_order; + if(unlikely(f->field_type.network)) { + reverse_byte_order = (g_ntohs(0x1) != 0x1); + } else { + g_assert(LTT_HAS_FLOAT(e->tracefile)); + reverse_byte_order = LTT_GET_FLOAT_BO(e->tracefile); + } - g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 8); + if(f->field_size == 4) + return ltt_event_get_float(e, f); + + g_assert(f->field_type.type_class == LTT_FLOAT && f->field_size == 8); if(reverse_byte_order == 0) return *(double *)(e->data + f->offset_root); - else{ + else { void *ptr = e->data + f->offset_root; - return *(double*)bswap_64(*(guint64*)ptr); - //guint64 aInt; - //memcpy((void*)&aInt, e->data + f->offset_root, 8); - //aInt = ___swab64(aInt); - //return ((double)aInt); + guint64 value = bswap_64(*(guint64*)ptr); + return *(double*)&value; } } @@ -652,139 +516,225 @@ double ltt_event_get_double(LttEvent *e, LttField *f) ****************************************************************************/ char *ltt_event_get_string(LttEvent *e, LttField *f) { - g_assert(f->field_type->type_class == LTT_STRING); + g_assert(f->field_type.type_class == LTT_STRING); return (gchar*)g_strdup((gchar*)(e->data + f->offset_root)); } - /***************************************************************************** *Function name - * get_field_type_size : set the fixed and dynamic sizes of the field type - * from the data read. + * compute_fields_offsets : set the precomputable offset of the fields *Input params - * tf : tracefile - * event_type : event type - * offset_root : offset from the root - * offset_parent : offset from the parent - * field : field - * data : a pointer to the event data. - *Returns the field type size. + * fac : facility + * field : the field + * offset : pointer to the current offset, must be incremented ****************************************************************************/ -size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, - off_t offset_root, off_t offset_parent, - LttField *field, void *data) -{ - size_t size = 0; - guint i; - LttType *type; - - g_assert(field->fixed_root != FIELD_UNKNOWN); - g_assert(field->fixed_parent != FIELD_UNKNOWN); - g_assert(field->fixed_size != FIELD_UNKNOWN); - field->offset_root = offset_root; - field->offset_parent = offset_parent; - - type = field->field_type; +#if 0 +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root, guint is_compact) +{ + LttType *type = &field->field_type; + + if(unlikely(is_compact)) { + g_assert(field->field_size != 0); + /* FIXME THIS IS A HUUUUUGE hack : + * offset is between the compact_data field in struct LttEvent + * and the address of the field root in the memory map. + * ark. Both will stay at the same addresses while the event + * is readable, so it's ok. + */ + field->offset_root = (unsigned long)(&tf->event.compact_data) + - (unsigned long)root; + field->fixed_root = FIELD_FIXED; + return; + } switch(type->type_class) { + case LTT_INT_FIXED: + case LTT_UINT_FIXED: + case LTT_POINTER: + case LTT_CHAR: + case LTT_UCHAR: + case LTT_SHORT: + case LTT_USHORT: case LTT_INT: case LTT_UINT: - case LTT_FLOAT: - case LTT_ENUM: - case LTT_POINTER: case LTT_LONG: case LTT_ULONG: case LTT_SIZE_T: case LTT_SSIZE_T: case LTT_OFF_T: - g_assert(field->fixed_size == FIELD_FIXED); - size = field->field_size; + case LTT_FLOAT: + case LTT_ENUM: + if(field->fixed_root == FIELD_VARIABLE) { + /* Align offset on type size */ + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + /* Increment offset */ + *offset += field->field_size; + } else { + //g_debug("type before offset : %llu %llu %u\n", *offset, + // field->offset_root, + // field->field_size); + *offset = field->offset_root; + *offset += field->field_size; + //g_debug("type after offset : %llu\n", *offset); + } break; - case LTT_SEQUENCE: + case LTT_STRING: + if(field->fixed_root == FIELD_VARIABLE) { + field->offset_root = *offset; + } + *offset += strlen((gchar*)(root+*offset)) + 1; + /* Realign the data */ + *offset += ltt_align(*offset, fac->pointer_size, + fac->alignment); + break; + case LTT_ARRAY: + g_assert(type->fields->len == 1); { - gint seqnum = ltt_get_uint(LTT_GET_BO(tf), - field->sequ_number_size, - data + offset_root); - - if(field->child[0]->fixed_size == FIELD_FIXED) { - size = field->sequ_number_size + - (seqnum * get_field_type_size(tf, event_type, - offset_root, offset_parent, - field->child[0], data)); + off_t local_offset; + LttField *child = &g_array_index(type->fields, LttField, 0); + if(field->fixed_root == FIELD_VARIABLE) { + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + field->array_offset = *offset; + } + + if(field->field_size != 0) { + /* Increment offset */ + /* field_size is the array size in bytes */ + *offset = field->offset_root + field->field_size; } else { - size += field->sequ_number_size; - for(i=0;ichild[0], data); - offset_root += child_size; - offset_parent += child_size; - size += child_size; + guint i; + *offset = field->array_offset; + field->dynamic_offsets = g_array_set_size(field->dynamic_offsets, + 0); + for(i=0; isize; i++) { + g_array_append_val(field->dynamic_offsets, *offset); + compute_fields_offsets(tf, fac, child, offset, root, is_compact); } } - field->field_size = size; + // local_offset = field->array_offset; + // /* Set the offset at position 0 */ + // compute_fields_offsets(tf, fac, child, &local_offset, root); } break; - case LTT_STRING: - size = strlen((char*)(data+offset_root)) + 1;// length + \0 - field->field_size = size; - break; - case LTT_ARRAY: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - for(i=0;ifield_type->element_number;i++) { - size_t child_size; - child_size = get_field_type_size(tf, event_type, - offset_root, offset_parent, - field->child[0], data); - offset_root += child_size; - offset_parent += child_size; - size += child_size; + case LTT_SEQUENCE: + g_assert(type->fields->len == 2); + { + off_t local_offset; + LttField *child; + guint i; + guint num_elem; + if(field->fixed_root == FIELD_VARIABLE) { + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + + child = &g_array_index(type->fields, LttField, 0); + compute_fields_offsets(tf, fac, child, offset, root, is_compact); + child = &g_array_index(type->fields, LttField, 1); + *offset += ltt_align(*offset, get_alignment(child), + fac->alignment); + field->array_offset = *offset; + + } else { + child = &g_array_index(type->fields, LttField, 1); + } + *offset = field->array_offset; + field->dynamic_offsets = g_array_set_size(field->dynamic_offsets, + 0); + num_elem = ltt_event_field_element_number(&tf->event, field); + for(i=0; idynamic_offsets, *offset); + compute_fields_offsets(tf, fac, child, offset, root, is_compact); } - field->field_size = size; + g_assert(num_elem == field->dynamic_offsets->len); + + /* Realign the data */ + *offset += ltt_align(*offset, fac->pointer_size, + fac->alignment); + + // local_offset = field->array_offset; + // /* Set the offset at position 0 */ + // compute_fields_offsets(tf, fac, child, &local_offset, root); } break; case LTT_STRUCT: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - size_t current_root_offset = offset_root; - size_t current_offset = 0; - size_t child_size = 0; - for(i=0;ielement_number;i++) { - child_size = get_field_type_size(tf, - event_type, current_root_offset, current_offset, - field->child[i], data); - current_offset += child_size; - current_root_offset += child_size; - + { + LttField *child; + guint i; + gint ret=0; + if(field->fixed_root == FIELD_VARIABLE) { + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + } else { + *offset = field->offset_root; + } + for(i=0; ifields->len; i++) { + child = &g_array_index(type->fields, LttField, i); + compute_fields_offsets(tf, fac, child, offset, root, is_compact); } - size = current_offset; - field->field_size = size; } break; case LTT_UNION: - if(field->fixed_size == FIELD_FIXED) - size = field->field_size; - else { - size_t current_root_offset = field->offset_root; - size_t current_offset = 0; - for(i=0;ielement_number;i++) { - size = get_field_type_size(tf, event_type, - current_root_offset, current_offset, - field->child[i], data); - size = max(size, field->child[i]->field_size); + { + LttField *child; + guint i; + gint ret=0; + if(field->fixed_root == FIELD_VARIABLE) { + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); + /* remember offset */ + field->offset_root = *offset; + } + for(i=0; ifields->len; i++) { + *offset = field->offset_root; + child = &g_array_index(type->fields, LttField, i); + compute_fields_offsets(tf, fac, child, offset, root, is_compact); } - field->field_size = size; + *offset = field->offset_root + field->field_size; } break; + case LTT_NONE: + default: + g_error("compute_fields_offsets : unknown type"); } - return size; } +/***************************************************************************** + *Function name + * compute_offsets : set the dynamically computable offsets of an event type + *Input params + * tf : tracefile + * event : event type + * + ****************************************************************************/ +void compute_offsets(LttTracefile *tf, LttFacility *fac, + LttEventType *event, off_t *offset, void *root) +{ + guint i; + + /* compute all variable offsets */ + for(i=0; ifields->len; i++) { + //g_debug("computing offset %u of %u\n", i, event->fields->len-1); + LttField *field = &g_array_index(event->fields, LttField, i); + if(event->has_compact_data && i == 0) + compute_fields_offsets(tf, fac, field, offset, root, 1); + else + compute_fields_offsets(tf, fac, field, offset, root, 0); + } + +} +#endif //0