X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=cf0b21f5c541f255100c993d10cd60eece45a7bc;hb=ef2b0f6126573732140ab56b653711de2cffbb4a;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..cf0b21f5 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -35,6 +35,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); @@ -242,25 +248,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 +427,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,36 +458,45 @@ 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 @@ -508,9 +505,7 @@ 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); + LttTypeEnum t = f->field_type.type_class; if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); @@ -537,8 +532,6 @@ 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; @@ -564,10 +557,7 @@ 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); + LttTypeEnum t = f->field_type.type_class; if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); @@ -589,10 +579,6 @@ gint64 ltt_event_get_long_int(LttEvent *e, LttField *f) // 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; @@ -612,7 +598,7 @@ 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); - 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{ @@ -627,7 +613,10 @@ 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); + 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,7 +632,7 @@ 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)); } @@ -709,7 +698,7 @@ size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, g_assert(field->fixed_size == FIELD_FIXED); size = field->field_size; align = ltt_align(field->offset_root, - size, event_type->facility->has_alignment); + size, event_type->facility->alignment); field->offset_root += align; field->offset_parent += align; size += align; @@ -809,16 +798,16 @@ size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, *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 +828,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 +858,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 +876,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 +910,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 +932,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 +941,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 +951,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 +980,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); } }