/* This file is part of the Linux Trace Toolkit viewer
- * Copyright (C) 2003-2004 Xiangxiu Yang
+ * Copyright (C) 2007 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;
+ * Complete rewrite from the original version made by XangXiu Yang.
+ *
+ * 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.
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <asm/types.h>
-#include <linux/byteorder/swab.h>
+#include <glib.h>
-#include "parser.h"
-#include <ltt/ltt.h>
-#include "ltt-private.h"
#include <ltt/event.h>
-#include <ltt/trace.h>
-
-
-LttEvent *ltt_event_new()
-{
- return g_new(LttEvent, 1);
-}
-
-void ltt_event_destroy(LttEvent *event)
-{
- g_free(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;
-
- switch(type->type_class) {
- case LTT_ARRAY:
- element_number = (int) type->element_number;
- if(fld->field_fixed == 0){// has string or sequence
- size = 0;
- for(i=0;i<element_number;i++){
- size += ltt_event_refresh_fields(offsetRoot+size,size,
- fld->child[0], evD+size);
- }
- }else size = fld->field_size;
- break;
-
- case 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;i<element_number;i++){
- size += ltt_event_refresh_fields(offsetRoot+size+size1,size+size1,
- fld->child[0], evD+size+size1);
- }
- size += size1;
- }
- break;
-
- case LTT_STRING:
- size = strlen((char*)evD) + 1; //include end : '\0'
- break;
-
- case LTT_STRUCT:
- element_number = (int) type->element_number;
- if(fld->field_fixed == 0){
- offset1 = offsetRoot;
- offset2 = 0;
- for(i=0;i<element_number;i++){
- size=ltt_event_refresh_fields(offset1,offset2,
- fld->child[i],evD+offset2);
- offset1 += size;
- offset2 += size;
- }
- size = offset2;
- }else size = fld->field_size;
- break;
-
- default:
- size = fld->field_size;
- }
-
-#if 0
- 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;i<element_number;i++){
- size += ltt_event_refresh_fields(offsetRoot+size,size,
- fld->child[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;i<element_number;i++){
- size += ltt_event_refresh_fields(offsetRoot+size+size1,size+size1,
- fld->child[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;i<element_number;i++){
- size=ltt_event_refresh_fields(offset1,offset2,
- fld->child[i],evD+offset2);
- offset1 += size;
- offset2 += size;
- }
- size = offset2;
- }else size = fld->field_size;
- }
-#endif //0
- 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;
-}
+#include <ltt/ltt-types.h>
+#include <ltt/ltt-private.h>
+#include <ltt/marker.h>
+#include <ltt/marker-field.h>
/*****************************************************************************
*Function name
- * ltt_event_facility : get the facility of the event
+ * ltt_event_position_get : get the event position data
*Input params
* e : an instance of an event type
- *Return value
- * LttFacility * : the facility of the event
- ****************************************************************************/
-
-LttFacility *ltt_event_facility(LttEvent *e)
-{
- LttTrace * trace = e->tracefile->trace;
- unsigned id = e->event_id;
- return ltt_trace_facility_by_id(trace,id);
-}
-
-/*****************************************************************************
- *Function name
- * ltt_event_eventtype : get the event type of the event
- *Input params
- * e : an instance of an event type
- *Return value
- * LttEventType * : the event type of the event
- ****************************************************************************/
-
-LttEventType *ltt_event_eventtype(LttEvent *e)
-{
- 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
+ * ep : a pointer to event's position structure
+ * tf : tracefile pointer
+ * block : current block
+ * offset : current offset
+ * tsc : current tsc
****************************************************************************/
-
-LttField *ltt_event_field(LttEvent *e)
+void ltt_event_position_get(LttEventPosition *ep, LttTracefile **tf,
+ guint *block, guint *offset, guint64 *tsc)
{
- 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;
+ *tf = ep->tracefile;
+ *block = ep->block;
+ *offset = ep->offset;
+ *tsc = ep->tsc;
}
-/*****************************************************************************
- *Function name
- * ltt_event_time : get the time of the event
- *Input params
- * e : an instance of an event type
- *Return value
- * LttTime : the time of the event
- ****************************************************************************/
-LttTime ltt_event_time(LttEvent *e)
+void ltt_event_position_set(LttEventPosition *ep, LttTracefile *tf,
+ guint block, guint offset, guint64 tsc)
{
- return e->event_time;
+ ep->tracefile = tf;
+ ep->block = block;
+ ep->offset = offset;
+ ep->tsc = tsc;
}
-/*****************************************************************************
- *Function name
- * ltt_event_time : get the cycle count of the event
- *Input params
- * e : an instance of an event type
- *Return value
- * LttCycleCount : the cycle count of the event
- ****************************************************************************/
-
-LttCycleCount ltt_event_cycle_count(LttEvent *e)
-{
- return e->event_cycle_count;
-}
/*****************************************************************************
*Function name
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 = 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 */
+ ep->tracefile = e->tracefile;
+ ep->block = e->block;
+ ep->offset = e->offset;
+ ep->tsc = e->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
- *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_get(LttEventPosition *ep,
- unsigned *block_number, unsigned *index_in_block, LttTracefile ** tf)
-{
- *block_number = ep->block_num;
- *index_in_block = ep->event_num;
- *tf = ep->tf;
-}
-
-/*****************************************************************************
- *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)
-{
- 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;
-
-}
/*****************************************************************************
* Function name
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;
}
}
-/*****************************************************************************
- *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
- * unsigned : the cpu id
- ****************************************************************************/
-
-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);
- }
-}
-/*****************************************************************************
- *Function name
- * ltt_event_data : get the raw data for the event
- *Input params
- * e : an instance of an event type
- *Return value
- * void * : pointer to the raw data for the event
- ****************************************************************************/
-
-void *ltt_event_data(LttEvent *e)
+LttTracefile *ltt_event_position_tracefile(LttEventPosition *ep)
{
- return e->data;
+ return ep->tracefile;
}
/*****************************************************************************
- *Function name
- * ltt_event_field_element_number
- * : The number of elements in a sequence field is specific
- * 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
- * f : a field of the instance
- *Return value
- * unsigned : the number of elements for an array/sequence field
+ * These functions extract data from an event after architecture specific
+ * conversions
****************************************************************************/
-
-unsigned ltt_event_field_element_number(LttEvent *e, LttField *f)
+guint32 ltt_event_get_unsigned(LttEvent *e, struct marker_field *f)
{
- 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);
-}
+ gboolean reverse_byte_order;
-/*****************************************************************************
- *Function name
- * ltt_event_field_element_select
- * : Set the currently selected element for a sequence or
- * array field
- *Input params
- * e : an instance of an event type
- * f : a field of the instance
- * i : the ith element
- ****************************************************************************/
+ if(unlikely(f->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ reverse_byte_order = (g_ntohs(0x1) != 0x1);
+ } else {
+ reverse_byte_order = LTT_GET_BO(e->tracefile);
+ }
-void ltt_event_field_element_select(LttEvent *e, LttField *f, unsigned i)
-{
- unsigned element_number;
- LttField *fld;
- unsigned int k;
- int size;
- void *evD;
-
- if(f->field_type->type_class != LTT_ARRAY &&
- f->field_type->type_class != LTT_SEQUENCE)
- return ;
-
- element_number = ltt_event_field_element_number(e,f);
- /* Sanity check for i : 1..n only, and must be lower or equal element_number
- */
- if(element_number < i || i == 0) return;
-
- fld = f->child[0];
-
- evD = e->data + f->offset_root;
- size = 0;
- for(k=0;k<i;k++){
- size += ltt_event_refresh_fields(f->offset_root+size,size, fld, evD+size);
+ switch(f->size) {
+ case 1:
+ {
+ guint8 x = *(guint8 *)(e->data + f->offset);
+ return (guint32) x;
+ }
+ break;
+ case 2:
+ return (guint32)ltt_get_uint16(reverse_byte_order, e->data + f->offset);
+ break;
+ case 4:
+ return (guint32)ltt_get_uint32(reverse_byte_order, e->data + f->offset);
+ break;
+ case 8:
+ default:
+ g_critical("ltt_event_get_unsigned : field size %i unknown", f->size);
+ return 0;
+ break;
}
- f->current_element = i - 1;
}
-/*****************************************************************************
- * These functions extract data from an event after architecture specific
- * conversions
- ****************************************************************************/
-
-unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f)
+gint32 ltt_event_get_int(LttEvent *e, struct marker_field *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->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ reverse_byte_order = (g_ntohs(0x1) != 0x1);
+ } else {
+ reverse_byte_order = LTT_GET_BO(e->tracefile);
}
- g_critical("ltt_event_get_unsigned : field size %i unknown", f->field_size);
- return 0;
-}
-int 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);
+ switch(f->size) {
+ case 1:
+ {
+ gint8 x = *(gint8 *)(e->data + f->offset);
+ return (gint32) x;
+ }
+ break;
+ case 2:
+ return (gint32)ltt_get_int16(reverse_byte_order, e->data + f->offset);
+ break;
+ case 4:
+ return (gint32)ltt_get_int32(reverse_byte_order, e->data + f->offset);
+ break;
+ case 8:
+ default:
+ g_critical("ltt_event_get_int : field size %i unknown", f->size);
+ return 0;
+ break;
}
- g_critical("ltt_event_get_int : field size %i unknown", f->field_size);
- return 0;
}
-unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f)
+guint64 ltt_event_get_long_unsigned(LttEvent *e, struct marker_field *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->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ reverse_byte_order = (g_ntohs(0x1) != 0x1);
+ } else {
+ reverse_byte_order = LTT_GET_BO(e->tracefile);
+ }
+
+ switch(f->size) {
+ case 1:
+ {
+ guint8 x = *(guint8 *)(e->data + f->offset);
+ return (guint64) x;
+ }
+ break;
+ case 2:
+ return (guint64)ltt_get_uint16(reverse_byte_order, e->data + f->offset);
+ break;
+ case 4:
+ return (guint64)ltt_get_uint32(reverse_byte_order, e->data + f->offset);
+ break;
+ case 8:
+ return ltt_get_uint64(reverse_byte_order, e->data + f->offset);
+ break;
+ default:
+ g_critical("ltt_event_get_long_unsigned : field size %i unknown", f->size);
+ return 0;
+ break;
}
- g_critical("ltt_event_get_long_unsigned : field size %i unknown", f->field_size);
- return 0;
}
-long int ltt_event_get_long_int(LttEvent *e, LttField *f)
+gint64 ltt_event_get_long_int(LttEvent *e, struct marker_field *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->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ reverse_byte_order = (g_ntohs(0x1) != 0x1);
+ } else {
+ reverse_byte_order = LTT_GET_BO(e->tracefile);
+ }
+
+ switch(f->size) {
+ case 1:
+ {
+ gint8 x = *(gint8 *)(e->data + f->offset);
+ return (gint64) x;
+ }
+ break;
+ case 2:
+ return (gint64)ltt_get_int16(reverse_byte_order, e->data + f->offset);
+ break;
+ case 4:
+ return (gint64)ltt_get_int32(reverse_byte_order, e->data + f->offset);
+ break;
+ case 8:
+ return ltt_get_int64(reverse_byte_order, e->data + f->offset);
+ break;
+ default:
+ g_critical("ltt_event_get_long_int : field size %i unknown", f->size);
+ return 0;
+ break;
}
- g_critical("ltt_event_get_long_int : field size %i unknown", f->field_size);
- return 0;
}
-float ltt_event_get_float(LttEvent *e, LttField *f)
+#if 0
+float ltt_event_get_float(LttEvent *e, struct marker_field *f)
{
- int revFlag = e->tracefile->trace->my_arch_endian ==
- e->tracefile->trace->system_description->endian ? 0:1;
+ gboolean reverse_byte_order;
+ if(unlikely(f->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ 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->size == 4);
- if(revFlag == 0) return *(float *)(e->data + f->offset_root);
+ if(reverse_byte_order == 0) return *(float *)(e->data + f->offset);
else{
- guint32 aInt;
- memcpy((void*)&aInt, e->data + f->offset_root, 4);
- aInt = ___swab32(aInt);
- return ((float)aInt);
+ void *ptr = e->data + f->offset;
+ guint32 value = bswap_32(*(guint32*)ptr);
+ return *(float*)&value;
}
}
-double ltt_event_get_double(LttEvent *e, LttField *f)
+double ltt_event_get_double(LttEvent *e, struct marker_field *f)
{
- int revFlag = e->tracefile->trace->my_arch_endian ==
- e->tracefile->trace->system_description->endian ? 0:1;
+ gboolean reverse_byte_order;
+ if(unlikely(f->attributes & LTT_ATTRIBUTE_NETWORK_BYTE_ORDER)) {
+ 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 == 8);
+ if(f->size == 4)
+ return ltt_event_get_float(e, f);
+
+ g_assert(f->field_type.type_class == LTT_FLOAT && f->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);
+ else {
+ void *ptr = e->data + f->offset;
+ guint64 value = bswap_64(*(guint64*)ptr);
+ return *(double*)&value;
}
}
+#endif
/*****************************************************************************
* The string obtained is only valid until the next read from
* the same tracefile.
****************************************************************************/
-
-char *ltt_event_get_string(LttEvent *e, LttField *f)
+char *ltt_event_get_string(LttEvent *e, struct marker_field *f)
{
- g_assert(f->field_type->type_class == LTT_STRING);
+ g_assert(f->type == LTT_TYPE_STRING);
- return (char*)g_strdup((char*)(e->data + f->offset_root));
+ return (gchar*)g_strdup((gchar*)(e->data + f->offset));
}
+
+