X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=47bf9e761b0f1694311e0d3ba06a58216ee3238d;hb=1b44b0b5729fbc82eab287323dc14d12c028dd44;hp=52344487c8a48403c0d369fa6a01b41bcbf5c912;hpb=eed2ef37f908daf7b3f884b5d8f91dad03f10526;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index 52344487..47bf9e76 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 @@ -26,7 +27,7 @@ #include #include -#include +#include #include "parser.h" #include @@ -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); @@ -204,8 +211,12 @@ unsigned ltt_event_eventtype_id(const LttEvent *e) LttFacility *ltt_event_facility(const LttEvent *e) { LttTrace * trace = e->tracefile->trace; - unsigned id = e->event_id; - return ltt_trace_facility_by_id(trace,id); + unsigned id = e->facility_id; + LttFacility *facility = ltt_trace_facility_by_id(trace,id); + + g_assert(facility->exists); + + return facility; } /***************************************************************************** @@ -238,28 +249,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 - *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; -} /***************************************************************************** *Function name @@ -391,6 +380,12 @@ void ltt_event_position_copy(LttEventPosition *dest, } + +LttTracefile *ltt_event_position_tracefile(LttEventPosition *ep) +{ + return ep->tracefile; +} + /***************************************************************************** *Function name * ltt_event_cpu_i: get the cpu id where the event happens @@ -433,14 +428,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)); } /***************************************************************************** @@ -448,53 +443,61 @@ 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); + + 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 @@ -503,9 +506,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); @@ -532,8 +533,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; @@ -559,9 +558,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); + LttTypeEnum t = f->field_type.type_class; if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); @@ -583,8 +580,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); - if(f->field_size == 1){ gint8 x = *(gint8 *)(e->data + f->offset_root); return (gint64) x; @@ -601,31 +596,34 @@ gint64 ltt_event_get_long_int(LttEvent *e, LttField *f) float ltt_event_get_float(LttEvent *e, LttField *f) { - gboolean reverse_byte_order = LTT_GET_BO(e->tracefile); + 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{ - guint32 aInt; - memcpy((void*)&aInt, e->data + f->offset_root, 4); - aInt = ___swab32(aInt); - return ((float)aInt); + void *ptr = e->data + f->offset_root; + 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); + 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{ - guint64 aInt; - memcpy((void*)&aInt, e->data + f->offset_root, 8); - aInt = ___swab64(aInt); - return ((double)aInt); + else { + void *ptr = e->data + f->offset_root; + guint64 value = bswap_64(*(guint64*)ptr); + return *(double*)&value; } } @@ -635,7 +633,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)); } @@ -654,6 +652,21 @@ char *ltt_event_get_string(LttEvent *e, LttField *f) * 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) @@ -661,6 +674,7 @@ size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, 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); @@ -683,10 +697,16 @@ size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, case LTT_SSIZE_T: case LTT_OFF_T: g_assert(field->fixed_size == FIELD_FIXED); - size = field->field_size; + size = field->field_size; + align = ltt_align(field->offset_root, + size, event_type->facility->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); @@ -769,5 +789,209 @@ size_t get_field_type_size(LttTracefile *tf, LttEventType *event_type, return size; } +#endif //0 + + + + + +/***************************************************************************** + *Function name + * compute_fields_offsets : set the precomputable offset of the fields + *Input params + * fac : facility + * field : the field + * offset : pointer to the current offset, must be incremented + ****************************************************************************/ + + +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root) +{ + LttType *type = &field->field_type; + + 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_LONG: + case LTT_ULONG: + case LTT_SIZE_T: + case LTT_SSIZE_T: + case LTT_OFF_T: + 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_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); + { + 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 { + 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); + } + } + // local_offset = field->array_offset; + // /* Set the offset at position 0 */ + // 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(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); + 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); + } + 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: + { + LttField *child; + guint i; + gint ret=0; + if(field->fixed_root == FIELD_VARIABLE) { + *offset += ltt_align(*offset, get_alignment(fac, 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); + } + } + break; + case LTT_UNION: + { + 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); + } + *offset = field->offset_root + field->field_size; + } + break; + case LTT_NONE: + default: + g_error("compute_fields_offsets : unknown type"); + } + +} + +/***************************************************************************** + *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); + compute_fields_offsets(tf, fac, field, offset, root); + } + +}