X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=68920d22099082ba140603008192daa6e39eea7a;hb=5bf80c50db66957caea1577bb4c9f8e8f7d9d75e;hp=791dabcc5512c49e8ef1fcf06c2f8c267d8282fc;hpb=fcdf0ec203524819d926c57c9aa4d2fb6a268ca1;p=lttv.git diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c index 791dabcc..68920d22 100644 --- a/ltt/branches/poly/ltt/event.c +++ b/ltt/branches/poly/ltt/event.c @@ -1,22 +1,111 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 Xiangxiu Yang + * + * 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 program 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. + * + * 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. + */ + #include #include #include -#include #include "parser.h" +#include +#include "ltt-private.h" #include +#include /***************************************************************************** *Function name - * ltt_facility_eventtype_id: get event type id - * (base id + position of the event) + * ltt_event_refresh_fields : refresh fields of an event *Input params - * e : an instance of an event type + * offsetRoot : offset from the root + * offsetParent : offset from the parrent + * fld : field + * evD : event data *Return value - * unsigned : event type id + * int : size of the field ****************************************************************************/ -unsigned ltt_event_eventtype_id(ltt_event *e) +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 + * (base id + position of the event) + *Input params + * e : an instance of an event type + *Return value + * unsigned : event type id + ****************************************************************************/ + +unsigned ltt_event_eventtype_id(LttEvent *e) { return (unsigned) e->event_id; } @@ -27,19 +116,14 @@ unsigned ltt_event_eventtype_id(ltt_event *e) *Input params * e : an instance of an event type *Return value - * ltt_facility * : the facility of the event + * LttFacility * : the facility of the event ****************************************************************************/ -ltt_facility *ltt_event_facility(ltt_event *e) +LttFacility *ltt_event_facility(LttEvent *e) { - ltt_eventtype * evT; - ptr_wrap * ptr; - ptr = (ptr_wrap*)g_ptr_array_index(e->tracefile->eventtype_event_id, - (gint)(e->event_id)); - evT = (ltt_eventtype*)(ptr->ptr); - - if(!evT) return NULL; - return evT->facility; + LttTrace * trace = e->tracefile->trace; + unsigned id = e->event_id; + return ltt_trace_facility_by_id(trace,id); } /***************************************************************************** @@ -48,15 +132,46 @@ ltt_facility *ltt_event_facility(ltt_event *e) *Input params * e : an instance of an event type *Return value - * ltt_eventtype * : the event type of the event + * LttEventType * : the event type of the event ****************************************************************************/ -ltt_eventtype *ltt_event_eventtype(ltt_event *e) +LttEventType *ltt_event_eventtype(LttEvent *e) { - ptr_wrap * ptr; - ptr = (ptr_wrap*)g_ptr_array_index(e->tracefile->eventtype_event_id, - (gint)(e->event_id)); - return (ltt_eventtype*)(ptr->ptr); + LttFacility* facility = ltt_event_facility(e); + if(!facility) return NULL; + return facility->events[e->event_id - facility->base_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(!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; } /***************************************************************************** @@ -65,12 +180,12 @@ ltt_eventtype *ltt_event_eventtype(ltt_event *e) *Input params * e : an instance of an event type *Return value - * ltt_time : the time of the event + * LttTime : the time of the event ****************************************************************************/ -ltt_time ltt_event_time(ltt_event *e) +LttTime ltt_event_time(LttEvent *e) { - return getEventTime(e->tracefile); + return e->event_time; } /***************************************************************************** @@ -79,40 +194,159 @@ ltt_time ltt_event_time(ltt_event *e) *Input params * e : an instance of an event type *Return value - * ltt_time : the cycle count of the event + * LttCycleCount : the cycle count of the event ****************************************************************************/ -ltt_cycle_count ltt_event_cycle_count(ltt_event *e) +LttCycleCount ltt_event_cycle_count(LttEvent *e) { - return e->cycle_count; + return e->event_cycle_count; } /***************************************************************************** *Function name - * ltt_event_cpu_i: get the cpu id where the event happens + * ltt_event_position : get the event's position *Input params - * e : an instance of an event type - *Return value - * unsigned : the cpu id + * e : an instance of an event type + * ep : a pointer to event's position structure + ****************************************************************************/ + +void ltt_event_position(LttEvent *e, LttEventPosition *ep) +{ + 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 = FALSE; + ep->event_offset = e->data - e->tracefile->buffer - EVENT_HEADER_SIZE ; + ep->tf = e->tracefile; +} + +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 + *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 ****************************************************************************/ -unsigned ltt_event_cpu_id(ltt_event *e) +void ltt_event_position_get(LttEventPosition *ep, + unsigned *block_number, unsigned *index_in_block, LttTracefile ** tf) { - return e->tracefile->trace_header->cpu_id; + *block_number = ep->block_num; + *index_in_block = ep->event_num; + *tf = ep->tf; } /***************************************************************************** *Function name - * ltt_event_cpu_i: get the name of the system where the event happens + * ltt_event_position_set : set the block number and index of the event + *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) +{ + ep->block_num = block_number; + ep->event_num = index_in_block; +} + +/***************************************************************************** + * Function name + * ltt_event_position_compare : compare two positions + * Input params + * ep1 : a pointer to event's position structure + * ep2 : a pointer to event's position structure + * Return + * -1 is ep1 < ep2 + * 1 if ep1 > ep2 + * 0 if ep1 == ep2 + ****************************************************************************/ + + +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->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->tracefile != ep->tf) + g_error("ltt_event_position_compare on different tracefiles makes no sense"); + if(event->which_block < ep->block_num) + return -1; + if(event->which_block > ep->block_num) + return 1; + if(event->which_event < ep->event_num) + return -1; + if(event->which_event > ep->event_num) + return 1; + return 0; +} + + + +/***************************************************************************** + *Function name + * ltt_event_cpu_i: get the cpu id where the event happens *Input params * e : an instance of an event type *Return value - * char * : the name of the system + * unsigned : the cpu id ****************************************************************************/ -char *ltt_event_system_name(ltt_event *e) -{ - return e->tracefile->trace_header->system_name; +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); + } } /***************************************************************************** @@ -124,7 +358,7 @@ char *ltt_event_system_name(ltt_event *e) * void * : pointer to the raw data for the event ****************************************************************************/ -void *ltt_event_data(ltt_event *e) +void *ltt_event_data(LttEvent *e) { return e->data; } @@ -136,19 +370,21 @@ void *ltt_event_data(ltt_event *e) * to each event. This function returns the number of * elements for an array or sequence field in an event. *Input params - * e : an instance of an event type ???? + * e : an instance of an event type * f : a field of the instance *Return value * unsigned : the number of elements for an array/sequence field ****************************************************************************/ -unsigned ltt_event_field_element_number(ltt_event *e, ltt_field *f) +unsigned ltt_event_field_element_number(LttEvent *e, LttField *f) { if(f->field_type->type_class != LTT_ARRAY && f->field_type->type_class != LTT_SEQUENCE) return 0; - - return f->field_type->element_number; + + 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); } /***************************************************************************** @@ -157,23 +393,34 @@ unsigned ltt_event_field_element_number(ltt_event *e, ltt_field *f) * : Set the currently selected element for a sequence or * array field *Input params - * e : an instance of an event type ???? + * e : an instance of an event type * f : a field of the instance * i : the ith element - *Return value - * int : ???? error number ****************************************************************************/ -int ltt_event_field_element_select(ltt_event *e, ltt_field *f, unsigned i) +void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i) { - if(f->field_type->type_class != LTT_ARRAY && + unsigned element_number; + LttField *fld; + int k, size; + void *evD; + + if(f->field_type->type_class != LTT_ARRAY && f->field_type->type_class != LTT_SEQUENCE) - return -1; //????? - - if(f->field_type->element_number < i || i == 0) return -1; //???? + return ; + + 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); + } - f->current_element = i - 1; - return 0; + f->current_element = i - 1; } /***************************************************************************** @@ -181,130 +428,140 @@ int ltt_event_field_element_select(ltt_event *e, ltt_field *f, unsigned i) * conversions ****************************************************************************/ -unsigned ltt_event_get_unsigned(ltt_event *e, ltt_field *f) +unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f) { - ltt_arch_size rSize = e->tracefile->trace_header->arch_size; - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; - ltt_type_enum t = f->field_type->type_class; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; + LttTypeEnum t = f->field_type->type_class; - if(t != LTT_UINT || t != LTT_ENUM) + if(t != LTT_UINT && t != LTT_ENUM) g_error("The type of the field is not unsigned int\n"); - if(rSize == LTT_LP32){ - if(f->field_size != 2) - g_error("The type of the field is not unsigned int: uint16_t\n"); - else{ - uint16_t x = *(uint16_t *)(e->data + f->offset_root); - return (unsigned) (revFlag ? BREV16(x) : x); - } - }else if(rSize == LTT_ILP32 || rSize == LTT_LP64){ - if(f->field_size != 4) - g_error("The type of the field is not unsigned int: uint32_t\n"); - else{ - uint32_t x = *(uint32_t *)(e->data + f->offset_root); - return (unsigned) (revFlag ? BREV32(x): x); - } - }else if(rSize == LTT_ILP64){ - if(f->field_size != 8) - g_error("The type of the field is not unsigned int: uint64_t\n"); - else{ - uint64_t x = *(uint64_t *)(e->data + f->offset_root); - return (unsigned) (revFlag ? BREV64(x): x); - } + 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); } } -int ltt_event_get_int(ltt_event *e, ltt_field *f) +int ltt_event_get_int(LttEvent *e, LttField *f) { - ltt_arch_size rSize = e->tracefile->trace_header->arch_size; - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; if(f->field_type->type_class != LTT_INT) g_error("The type of the field is not int\n"); - if(rSize == LTT_LP32){ - if(f->field_size != 2) - g_error("The type of the field is not int: int16_t\n"); - else{ - int16_t x = *(int16_t *)(e->data + f->offset_root); - return (int) (revFlag ? BREV16(x) : x); - } - }else if(rSize == LTT_ILP32 || rSize == LTT_LP64){ - if(f->field_size != 4) - g_error("The type of the field is not int: int32_t\n"); - else{ - int32_t x = *(int32_t *)(e->data + f->offset_root); - return (int) (revFlag ? BREV32(x): x); - } - }else if(rSize == LTT_ILP64){ - if(f->field_size != 8) - g_error("The type of the field is not int: int64_t\n"); - else{ - int64_t x = *(int64_t *)(e->data + f->offset_root); - return (int) (revFlag ? BREV64(x): x); - } + 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); } } -unsigned long ltt_event_get_long_unsigned(ltt_event *e, ltt_field *f) +unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f) { - ltt_arch_size rSize = e->tracefile->trace_header->arch_size; - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; - ltt_type_enum t = f->field_type->type_class; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; + LttTypeEnum t = f->field_type->type_class; - if(t != LTT_UINT || t != LTT_ENUM) + if(t != LTT_UINT && t != LTT_ENUM) g_error("The type of the field is not unsigned long\n"); - if(rSize == LTT_LP32 || rSize == LTT_ILP32 ){ - if(f->field_size != 4) - g_error("The type of the field is not unsigned long: uint32_t\n"); - else{ - uint32_t x = *(uint32_t *)(e->data + f->offset_root); - return (unsigned long) (revFlag ? BREV32(x) : x); - } - }else if(rSize == LTT_LP64 || rSize == LTT_ILP64){ - if(f->field_size != 8) - g_error("The type of the field is not unsigned long: uint64_t\n"); - else{ - uint64_t x = *(uint64_t *)(e->data + f->offset_root); - return (unsigned long) (revFlag ? BREV64(x): x); - } + 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); } } -long int ltt_event_get_long_int(ltt_event *e, ltt_field *f) +long int ltt_event_get_long_int(LttEvent *e, LttField *f) { - ltt_arch_size rSize = e->tracefile->trace_header->arch_size; - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; if( f->field_type->type_class != LTT_INT) g_error("The type of the field is not long int\n"); - if(rSize == LTT_LP32 || rSize == LTT_ILP32 ){ - if(f->field_size != 4) - g_error("The type of the field is not long int: int32_t\n"); - else{ - int32_t x = *(int32_t *)(e->data + f->offset_root); - return (long) (revFlag ? BREV32(x) : x); - } - }else if(rSize == LTT_LP64 || rSize == LTT_ILP64){ - if(f->field_size != 8) - g_error("The type of the field is not long int: int64_t\n"); - else{ - int64_t x = *(int64_t *)(e->data + f->offset_root); - return (long) (revFlag ? BREV64(x): x); - } + 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); } } -float ltt_event_get_float(ltt_event *e, ltt_field *f) +float ltt_event_get_float(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; if(f->field_type->type_class != LTT_FLOAT || (f->field_type->type_class == LTT_FLOAT && f->field_size != 4)) @@ -312,17 +569,17 @@ float ltt_event_get_float(ltt_event *e, ltt_field *f) if(revFlag == 0) return *(float *)(e->data + f->offset_root); else{ - uint32_t aInt; + guint32 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 4); aInt = ___swab32(aInt); return *((float*)&aInt); } } -double ltt_event_get_double(ltt_event *e, ltt_field *f) +double ltt_event_get_double(LttEvent *e, LttField *f) { - int revFlag = e->tracefile->my_arch_endian == - e->tracefile->trace_header->arch_endian ? 0:1; + int revFlag = e->tracefile->trace->my_arch_endian == + e->tracefile->trace->system_description->endian ? 0:1; if(f->field_type->type_class != LTT_FLOAT || (f->field_type->type_class == LTT_FLOAT && f->field_size != 8)) @@ -330,7 +587,7 @@ double ltt_event_get_double(ltt_event *e, ltt_field *f) if(revFlag == 0) return *(double *)(e->data + f->offset_root); else{ - uint64_t aInt; + guint64 aInt; memcpy((void*)&aInt, e->data + f->offset_root, 8); aInt = ___swab64(aInt); return *((double *)&aInt); @@ -339,10 +596,10 @@ double ltt_event_get_double(ltt_event *e, ltt_field *f) /***************************************************************************** * The string obtained is only valid until the next read from - * the same tracefile. ???? + * the same tracefile. ****************************************************************************/ -char *ltt_event_get_string(ltt_event *e, ltt_field *f) +char *ltt_event_get_string(LttEvent *e, LttField *f) { if(f->field_type->type_class != LTT_STRING) g_error("The field contains no string\n");