X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=67c689b67ee9e6a4d77708e5ace2b9c9e7c3547e;hb=f0b795e0b579719a95fee5f84d4dcb893044d926;hp=53a2b2ec3c532a80adea94c3a2fb6dbb484e96fb;hpb=f104d082727461632e7a5cc1d2a854f0ad66db07;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index 53a2b2ec..67c689b6 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 @@ -35,6 +36,12 @@ #include #include + + +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root); + + LttEvent *ltt_event_new() { return g_new(LttEvent, 1); @@ -46,137 +53,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 @@ -242,25 +118,6 @@ LttEventType *ltt_event_eventtype(const LttEvent *e) 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 - * name : field name - *Return value - * LttField * : The requested field, or NULL - ****************************************************************************/ - -LttField *ltt_event_field(LttEvent *e, GQuark name) -{ - LttField * field; - LttEventType * event_type = ltt_event_eventtype(e); - if(unlikely(!event_type)) return NULL; - - return (LttField*)g_datalist_id_get_data(&event_type->fields_by_name, name); - -} /***************************************************************************** *Function name @@ -440,13 +297,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->size; - return ltt_get_long_unsigned(e, &g_array_index(f->fields, LttField, 0)); + 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)); } /***************************************************************************** @@ -470,149 +328,184 @@ LttField *ltt_event_field_element_select(LttEvent *e, LttField *f, gulong i) 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; + if(i >= element_number) return NULL; - if(f->field_type->type_class == LTT_ARRAY) { - field = &g_array_index(f->fields, LttField, 0); + if(f->field_type.type_class == LTT_ARRAY) { + field = &g_array_index(f->field_type.fields, LttField, 0); } else { - field = &g_array_index(f->fields, LttField, 1); + 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; /* fixed length child, already at the right offset */ + return field; /* fixed length child, already at the right offset */ else new_offset = f->array_offset + (i * field->field_size); } else { /* Var. len. child */ new_offset = g_array_index(f->dynamic_offsets, off_t, i); } - compute_fields_offsets(e->tracefile, field, new_offset); + compute_fields_offsets(e->tracefile, + ltt_event_facility(e), field, &new_offset, e->data); 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); - - if(f->field_size == 1){ - guint8 x = *(guint8 *)(e->data + f->offset_root); - return (guint32) 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 (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); - - if(f->field_size == 1){ - gint8 x = *(gint8 *)(e->data + f->offset_root); - return (gint32) 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 (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) { - g_assert(LTT_HAS_FLOAT(e->tracefile)); - gboolean reverse_byte_order = LTT_GET_FLOAT_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{ @@ -624,10 +517,18 @@ float ltt_event_get_float(LttEvent *e, LttField *f) double ltt_event_get_double(LttEvent *e, LttField *f) { - g_assert(LTT_HAS_FLOAT(e->tracefile)); - gboolean reverse_byte_order = LTT_GET_FLOAT_BO(e->tracefile); - - g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 8); + 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); + } + + 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 { @@ -643,182 +544,25 @@ 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. - *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. - ****************************************************************************/ - // TODO -// Change this function so it uses a *to offset value incrementation, just like -// genevent-new instead of returning a size. What is of interest here is the -// offset needed to read each field. -// -// Precomputed ones can be returned directly. Otherwise, the field is flagged -// "VARIABLE OFFSET" and must be computed dynamically. The dynamic processing -// of an offset takes the last known fixed offset, and then dynamically -// calculates all variable field offsets from it. -// -// After a VARIABLE SIZE element, all fields have a variable offset. -// Also, is an array or a sequence has variable length child, we must pass -// through all of them, saving the offsets in the dynamic_offsets array. - -#if 0 -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; - off_t align; - - 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; - - switch(type->type_class) { - 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; - align = ltt_align(field->offset_root, - size, event_type->facility->has_alignment); - field->offset_root += align; - field->offset_parent += align; - size += align; - break; - case LTT_SEQUENCE: - { - /* FIXME : check the type of sequence identifier */ - 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)); - } else { - size += field->sequ_number_size; - for(i=0;ichild[0], data); - offset_root += child_size; - offset_parent += child_size; - size += child_size; - } - } - field->field_size = size; - } - 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; - } - field->field_size = size; - } - 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; - - } - 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); - } - field->field_size = size; - } - break; - } - - return size; -} -#endif //0 - - - - - /***************************************************************************** *Function name * compute_fields_offsets : set the precomputable offset of the fields *Input params - * tf : tracefile + * fac : facility * field : the field * offset : pointer to the current offset, must be incremented ****************************************************************************/ -void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, - void *root) +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root) { - type = &field->field_type; + LttType *type = &field->field_type; switch(type->type_class) { case LTT_INT_FIXED: @@ -839,23 +583,29 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, case LTT_ENUM: if(field->fixed_root == FIELD_VARIABLE) { /* Align offset on type size */ - *offset += ltt_align(*offset, get_alignment(tf, field), - tf->has_alignment); + *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); } - /* None of these types has variable size, so we are sure that if - * this element has a fixed_root, then the following one will have - * a fixed root too, so it does not need the *offset at all. - */ break; 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); @@ -863,8 +613,8 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, 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(tf, field), - tf->has_alignment); + *offset += ltt_align(*offset, get_alignment(field), + fac->alignment); /* remember offset */ field->offset_root = *offset; field->array_offset = *offset; @@ -881,30 +631,32 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, 0); for(i=0; isize; i++) { g_array_append_val(field->dynamic_offsets, *offset); - compute_fields_offsets(tf, child, offset); + compute_fields_offsets(tf, fac, child, offset, root); } } // local_offset = field->array_offset; // /* Set the offset at position 0 */ - // compute_fields_offsets(tf, child, &local_offset); - break; + // compute_fields_offsets(tf, fac, child, &local_offset, root); + } + break; 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(tf, field), - tf->has_alignment); + *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, child, offset); + compute_fields_offsets(tf, fac, child, offset, root); child = &g_array_index(type->fields, LttField, 1); - *offset += ltt_align(*offset, get_alignment(tf, child), - tf->has_alignment); + *offset += ltt_align(*offset, get_alignment(child), + fac->alignment); field->array_offset = *offset; } else { @@ -913,13 +665,20 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, *offset = field->array_offset; field->dynamic_offsets = g_array_set_size(field->dynamic_offsets, 0); - for(i=0; ievent, field); i++) { + num_elem = ltt_event_field_element_number(&tf->event, field); + for(i=0; idynamic_offsets, *offset); - compute_fields_offsets(tf, child, offset); + compute_fields_offsets(tf, fac, child, offset, root); } + 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, child, &local_offset); + // compute_fields_offsets(tf, fac, child, &local_offset, root); } break; case LTT_STRUCT: @@ -928,8 +687,8 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, guint i; gint ret=0; if(field->fixed_root == FIELD_VARIABLE) { - *offset += ltt_align(*offset, get_alignment(tf, field), - tf->has_alignment); + *offset += ltt_align(*offset, get_alignment(fac, field), + fac->alignment); /* remember offset */ field->offset_root = *offset; } else { @@ -937,7 +696,7 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, } for(i=0; ifields->len; i++) { child = &g_array_index(type->fields, LttField, i); - compute_fields_offsets(tf, child, offset); + compute_fields_offsets(tf, fac, child, offset, root); } } break; @@ -947,15 +706,15 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, guint i; gint ret=0; if(field->fixed_root == FIELD_VARIABLE) { - *offset += ltt_align(*offset, get_alignment(tf, field), - tf->has_alignment); + *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, child, offset); + compute_fields_offsets(tf, fac, child, offset, root); } *offset = field->offset_root + field->field_size; } @@ -976,17 +735,16 @@ void compute_fields_offsets(LttTracefile *tf, LttField *field, off_t *offset, * event : event type * ****************************************************************************/ -void compute_offsets(LttTracefile *tf, LttEventType *event, size_t *offset, - void *root) +void compute_offsets(LttTracefile *tf, LttFacility *fac, + LttEventType *event, off_t *offset, void *root) { guint i; - gint ret; /* 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); - ret = compute_fields_offsets(tf, field, offset, root); - if(ret) break; + compute_fields_offsets(tf, fac, field, offset, root); } }