X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=17e9688a14ce5d82a00704dd0bb45bfd8414ece1;hb=768d9ff70f4f49a042d606eeb0e767c23e537d04;hp=3bc93857f51954da565fbdd77e888189ea272c7a;hpb=537b2d7f25594609d335248faea9532ae9a2a8b6;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index 3bc93857..17e9688a 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -1,30 +1,45 @@ /* 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 +#include +#endif + #include +#include +#include +#include + #include -#include +#include #include "parser.h" #include #include "ltt-private.h" #include #include +#include + + + +void compute_fields_offsets(LttTracefile *tf, + LttFacility *fac, LttField *field, off_t *offset, void *root); LttEvent *ltt_event_new() @@ -38,75 +53,6 @@ void ltt_event_destroy(LttEvent *event) } -/***************************************************************************** - *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 - *Return value - * int : size of the field - ****************************************************************************/ - -int ltt_event_refresh_fields(int offsetRoot,int offsetParent, - LttField * fld, void *evD) -{ - int size, size1, element_number, i, offset1, offset2; - LttType * type = fld->field_type; - - 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; - } - - 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; -} - /***************************************************************************** *Function name * ltt_event_eventtype_id: get event type id @@ -117,7 +63,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; } @@ -131,61 +77,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 facility->events[e->event_id - facility->base_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(!event_type) return NULL; - field = event_type->root_field; - if(!field) return NULL; - - //check if the field need refresh - if(e->which_block != event_type->latest_block || - e->which_event != event_type->latest_event){ - - event_type->latest_block = e->which_block; - event_type->latest_event = e->which_event; - - if(field->field_fixed == 1)return field; - - //refresh the field - ltt_event_refresh_fields(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 @@ -195,7 +128,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; } @@ -209,83 +142,56 @@ 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->event_cycle_count; + return e->tsc; } + + /***************************************************************************** *Function name - * ltt_event_position : get the event's position + * 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(LttEvent *e, LttEventPosition *ep) +void ltt_event_position_get(LttEventPosition *ep, LttTracefile **tf, + guint *block, guint *offset, guint64 *tsc) { - ep->block_num = e->which_block; - ep->event_num = e->which_event; - ep->event_time = e->event_time; - ep->event_cycle_count = e->event_cycle_count; - ep->heart_beat_number = e->tracefile->cur_heart_beat_number; - ep->old_position = TRUE; - ep->event_offset = e->data - e->tracefile->buffer - EVENT_HEADER_SIZE ; - ep->tf = e->tracefile; - - /* This is a workaround for fast position seek */ - ep->last_event_pos = e->last_event_pos; - ep->prev_block_end_time = e->prev_block_end_time; - ep->prev_event_time = e->prev_event_time; - ep->pre_cycle_count = e->pre_cycle_count; - ep->count = e->count; - /* end of workaround */ + *tf = ep->tracefile; + *block = ep->block; + *offset = ep->offset; + *tsc = ep->tsc; } -LttEventPosition * ltt_event_position_new() -{ - return g_new(LttEventPosition, 1); -} /***************************************************************************** *Function name - * ltt_event_position_get : get the block number and index of the event + * ltt_event_position : get the event's position *Input params - * ep : a pointer to event's position structure - * block_number : the block number of the event - * index_in_block : the index of the event within the block + * e : an instance of an event type + * ep : a pointer to event's position structure ****************************************************************************/ -void ltt_event_position_get(LttEventPosition *ep, - unsigned *block_number, unsigned *index_in_block, LttTracefile ** tf) +void ltt_event_position(LttEvent *e, LttEventPosition *ep) { - *block_number = ep->block_num; - *index_in_block = ep->event_num; - *tf = ep->tf; + ep->tracefile = e->tracefile; + ep->block = e->block; + ep->offset = e->offset; + ep->tsc = e->tsc; } -/***************************************************************************** - *Function name - * ltt_event_position_set : set the block number and index of the event - * It does put the old_position gboolean to FALSE, as it is impossible - * to know the quick position to seek in the tracefile. - *Input params - * ep : a pointer to event's position structure - * block_number : the block number of the event - * index_in_block : the index of the event within the block - ****************************************************************************/ - -void ltt_event_position_set(LttEventPosition *ep, - unsigned block_number, unsigned index_in_block) +LttEventPosition * ltt_event_position_new() { - if(ep->block_num != block_number || ep->event_num != index_in_block) - ep->old_position = FALSE; - - ep->block_num = block_number; - ep->event_num = index_in_block; - + return g_new(LttEventPosition, 1); } + /***************************************************************************** * Function name * ltt_event_position_compare : compare two positions @@ -303,58 +209,23 @@ void ltt_event_position_set(LttEventPosition *ep, gint ltt_event_position_compare(const LttEventPosition *ep1, const LttEventPosition *ep2) { - if(ep1->tf != ep2->tf) - g_error("ltt_event_position_compare on different tracefiles makes no sense"); if(ep1 == NULL && ep2 == NULL) return 0; if(ep1 != NULL && ep2 == NULL) return -1; if(ep1 == NULL && ep2 != NULL) return 1; - - if(ep1->block_num < ep2->block_num) - return -1; - if(ep1->block_num > ep2->block_num) - return 1; - if(ep1->event_num < ep2->event_num) - return -1; - if(ep1->event_num > ep2->event_num) - return 1; - return 0; -} - -/***************************************************************************** - * Function name - * ltt_event_event_position_compare : compare two positions, one in event, - * other in position opaque structure. - * Input params - * event : a pointer to event structure - * ep : a pointer to event's position structure - * Return - * -1 is event < ep - * 1 if event > ep - * 0 if event == ep - ****************************************************************************/ - -gint ltt_event_event_position_compare(const LttEvent *event, - const LttEventPosition *ep) -{ - if(event == NULL && ep == NULL) - return 0; - if(event != NULL && ep == NULL) - return -1; - if(event == NULL && ep != NULL) - return 1; - g_assert(event->tracefile == ep->tf); - - if(event->which_block < ep->block_num) + if(ep1->tracefile != ep2->tracefile) + g_error("ltt_event_position_compare on different tracefiles makes no sense"); + + if(ep1->block < ep2->block) return -1; - if(event->which_block > ep->block_num) + if(ep1->block > ep2->block) return 1; - if(event->which_event < ep->event_num) + if(ep1->offset < ep2->offset) return -1; - if(event->which_event > ep->event_num) + if(ep1->offset > ep2->offset) return 1; return 0; } @@ -378,6 +249,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 @@ -388,23 +265,8 @@ void ltt_event_position_copy(LttEventPosition *dest, ****************************************************************************/ unsigned ltt_event_cpu_id(LttEvent *e) -{ - char * c1, * c2, * c3; - c1 = strrchr(e->tracefile->name,'\\'); - c2 = strrchr(e->tracefile->name,'/'); - if(c1 == NULL && c2 == NULL){ - return (unsigned)atoi(e->tracefile->name); - }else if(c1 == NULL){ - c2++; - return (unsigned)atoi(c2); - }else if(c2 == NULL){ - c1++; - return (unsigned)atoi(c1); - }else{ - c3 = (c1 > c2) ? c1 : c2; - c3++; - return (unsigned)atoi(c3); - } +{ + return e->tracefile->cpu_num; } /***************************************************************************** @@ -433,16 +295,16 @@ void *ltt_event_data(LttEvent *e) *Return value * unsigned : the number of elements for an array/sequence field ****************************************************************************/ - -unsigned ltt_event_field_element_number(LttEvent *e, LttField *f) +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 (unsigned) getIntNumber(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)); } /***************************************************************************** @@ -450,197 +312,229 @@ unsigned 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) because of offset array. *Input params * e : an instance of an event type * f : a field of the instance - * i : the ith element + * 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; - LttField *fld; - int k, size; - void *evD; + 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); - if((element_number-1) < i || i < 0) return; - - fld = f->child[0]; - - evD = e->data + f->offset_root; - size = 0; - for(k=0;koffset_root+size,size, fld, evD+size); + 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 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 { + /* Var. len. child */ + new_offset = g_array_index(f->dynamic_offsets, off_t, i); } + compute_fields_offsets(e->tracefile, + ltt_event_facility(e), field, &new_offset, e->data); - f->current_element = i - 1; + 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 ****************************************************************************/ - -unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f) +guint32 ltt_event_get_unsigned(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->trace->my_arch_endian == - e->tracefile->trace->system_description->endian ? 0:1; - 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 (unsigned int) x; - }else if(f->field_size == 2){ - guint16 x = *(guint16 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (unsigned int) (revFlag ? GUINT16_FROM_BE(x): x); - else - return (unsigned int) (revFlag ? GUINT16_FROM_LE(x): x); - }else if(f->field_size == 4){ - guint32 x = *(guint32 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (unsigned int) (revFlag ? GUINT32_FROM_BE(x): x); - else - return (unsigned int) (revFlag ? GUINT32_FROM_LE(x): x); - }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); + 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); + 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; } } -int ltt_event_get_int(LttEvent *e, LttField *f) +gint32 ltt_event_get_int(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->trace->my_arch_endian == - e->tracefile->trace->system_description->endian ? 0:1; - - g_assert(f->field_type->type_class == LTT_INT); - - if(f->field_size == 1){ - gint8 x = *(gint8 *)(e->data + f->offset_root); - return (int) x; - }else if(f->field_size == 2){ - gint16 x = *(gint16 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (int) (revFlag ? GINT16_FROM_BE(x): x); - else - return (int) (revFlag ? GINT16_FROM_LE(x): x); - }else if(f->field_size == 4){ - gint32 x = *(gint32 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (int) (revFlag ? GINT32_FROM_BE(x): x); - else - return (int) (revFlag ? GINT32_FROM_LE(x): x); - }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); + 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); + 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; } } -unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f) +guint64 ltt_event_get_long_unsigned(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->trace->my_arch_endian == - e->tracefile->trace->system_description->endian ? 0:1; - 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 (unsigned long) x; - }else if(f->field_size == 2){ - guint16 x = *(guint16 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (unsigned long) (revFlag ? GUINT16_FROM_BE(x): x); - else - return (unsigned long) (revFlag ? GUINT16_FROM_LE(x): x); - }else if(f->field_size == 4){ - guint32 x = *(guint32 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (unsigned long) (revFlag ? GUINT32_FROM_BE(x): x); - else - return (unsigned long) (revFlag ? GUINT32_FROM_LE(x): x); - }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 long) (revFlag ? GUINT64_FROM_BE(x): x); - else - return (unsigned long) (revFlag ? GUINT64_FROM_LE(x): x); + 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); + break; + case 4: + return (guint64)ltt_get_uint32(reverse_byte_order, e->data + f->offset_root); + 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; } } -long int ltt_event_get_long_int(LttEvent *e, LttField *f) +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; - - g_assert( f->field_type->type_class == LTT_INT); - - if(f->field_size == 1){ - gint8 x = *(gint8 *)(e->data + f->offset_root); - return (long) x; - }else if(f->field_size == 2){ - gint16 x = *(gint16 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (long) (revFlag ? GINT16_FROM_BE(x): x); - else - return (long) (revFlag ? GINT16_FROM_LE(x): x); - }else if(f->field_size == 4){ - gint32 x = *(gint32 *)(e->data + f->offset_root); - if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN) - return (long) (revFlag ? GINT32_FROM_BE(x): x); - else - return (long) (revFlag ? GINT32_FROM_LE(x): x); - }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 (long) (revFlag ? GINT64_FROM_BE(x): x); - else - return (long) (revFlag ? GINT64_FROM_LE(x): x); + 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); + break; + case 4: + return (gint64)ltt_get_int32(reverse_byte_order, e->data + f->offset_root); + 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; } } float ltt_event_get_float(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->trace->my_arch_endian == - e->tracefile->trace->system_description->endian ? 0:1; + 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(revFlag == 0) return *(float *)(e->data + f->offset_root); + 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) { - int revFlag = e->tracefile->trace->my_arch_endian == - e->tracefile->trace->system_description->endian ? 0:1; - - 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(revFlag == 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); + if(reverse_byte_order == 0) return *(double *)(e->data + f->offset_root); + else { + void *ptr = e->data + f->offset_root; + guint64 value = bswap_64(*(guint64*)ptr); + return *(double*)&value; } } @@ -648,10 +542,210 @@ double ltt_event_get_double(LttEvent *e, LttField *f) * The string obtained is only valid until the next read from * the same tracefile. ****************************************************************************/ - 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 (char*)g_strdup((char*)(e->data + f->offset_root)); + return (gchar*)g_strdup((gchar*)(e->data + f->offset_root)); } + +/***************************************************************************** + *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(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); + } + +} +