X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=cf0b21f5c541f255100c993d10cd60eece45a7bc;hb=ef2b0f6126573732140ab56b653711de2cffbb4a;hp=fe299b5dae33ec0fc81344458f041eddae635cd1;hpb=3aee1200b100fe8063661fd2d8eaa5fbbfc1977f;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index fe299b5d..cf0b21f5 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "parser.h" #include @@ -36,6 +36,11 @@ #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); @@ -188,7 +193,7 @@ int ltt_event_refresh_fields(int offsetRoot,int offsetParent, * unsigned : event type id ****************************************************************************/ -unsigned ltt_event_eventtype_id(LttEvent *e) +unsigned ltt_event_eventtype_id(const LttEvent *e) { return (unsigned) e->event_id; } @@ -202,52 +207,48 @@ unsigned ltt_event_eventtype_id(LttEvent *e) * LttFacility * : the facility of the event ****************************************************************************/ -LttFacility *ltt_event_facility(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; } /***************************************************************************** *Function name - * ltt_event_eventtype : get the event type of the event + * ltt_event_facility_id : get the facility id of the event *Input params - * e : an instance of an event type + * e : an instance of an event type *Return value - * LttEventType * : the event type of the event + * unsigned : the facility of the event ****************************************************************************/ -LttEventType *ltt_event_eventtype(LttEvent *e) +unsigned ltt_event_facility_id(const LttEvent *e) { - LttFacility* facility = ltt_event_facility(e); - if(!facility) return NULL; - return &g_array_index(facility->events, LttEventType, e->event_id); + return e->facility_id; } /***************************************************************************** *Function name - * ltt_event_field : get the root field of the event + * ltt_event_eventtype : get the event type of the event *Input params - * e : an instance of an event type + * e : an instance of an event type *Return value - * LttField * : the root field of the event + * LttEventType * : the event type of the event ****************************************************************************/ -LttField *ltt_event_field(LttEvent *e) +LttEventType *ltt_event_eventtype(const 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; + LttFacility* facility = ltt_event_facility(e); + if(!facility) return NULL; + return &g_array_index(facility->events, LttEventType, e->event_id); } + /***************************************************************************** *Function name * ltt_event_time : get the time of the event @@ -257,7 +258,7 @@ LttField *ltt_event_field(LttEvent *e) * LttTime : the time of the event ****************************************************************************/ -LttTime ltt_event_time(LttEvent *e) +LttTime ltt_event_time(const LttEvent *e) { return e->event_time; } @@ -271,11 +272,34 @@ LttTime ltt_event_time(LttEvent *e) * LttCycleCount : the cycle count of the event ****************************************************************************/ -LttCycleCount ltt_event_cycle_count(LttEvent *e) +LttCycleCount ltt_event_cycle_count(const LttEvent *e) { return e->tsc; } + + +/***************************************************************************** + *Function name + * ltt_event_position_get : get the event position data + *Input params + * e : an instance of an event type + * ep : a pointer to event's position structure + * tf : tracefile pointer + * block : current block + * offset : current offset + * tsc : current tsc + ****************************************************************************/ +void ltt_event_position_get(LttEventPosition *ep, LttTracefile **tf, + guint *block, guint *offset, guint64 *tsc) +{ + *tf = ep->tracefile; + *block = ep->block; + *offset = ep->offset; + *tsc = ep->tsc; +} + + /***************************************************************************** *Function name * ltt_event_position : get the event's position @@ -355,6 +379,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 @@ -397,14 +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->element_number; - return get_unsigned(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)); } /***************************************************************************** @@ -412,53 +442,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 @@ -467,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); @@ -496,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; @@ -523,9 +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); + LttTypeEnum t = f->field_type.type_class; if(f->field_size == 1){ guint8 x = *(guint8 *)(e->data + f->offset_root); @@ -547,8 +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); - if(f->field_size == 1){ gint8 x = *(gint8 *)(e->data + f->offset_root); return (gint64) x; @@ -565,31 +595,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; } } @@ -599,7 +632,365 @@ 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->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 + * 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); + } + +} +