#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
+#include <math.h>
// For realpath
#include <limits.h>
#include <ltt/facility.h>
#include <ltt/event.h>
#include <ltt/type.h>
+#include <ltt/ltt-types.h>
#define DIR_NAME_SIZE 256
#define __UNUSED__ __attribute__((__unused__))
t->control_tracefiles = g_ptr_array_new();
t->per_cpu_tracefiles = g_ptr_array_new();
t->facilities = g_ptr_array_new();
- getDataEndianType(&(t->my_arch_size), &(t->my_arch_endian));
-
+ //getDataEndianType(&(t->my_arch_size), &(t->my_arch_endian));
+
//get system description
strcpy(tmp,info);
strcat(tmp,"system.xml");
g_free(t);
return NULL;
}
-
-
+
+ /* Set the reverse byte order between trace and reader */
+ if(sys_description->endian == LTT_LITTLE_ENDIAN
+ && G_BYTE_ORDER != G_LITTLE_ENDIAN) {
+ t->reverse_byte_order = 1;
+ } else if(sys_description->endian == LTT_BIG_ENDIAN
+ && G_BYTE_ORDER != G_BIG_ENDIAN) {
+ t->reverse_byte_order = 1;
+ } else t->reverse_byte_order = 0;
//get facilities info
if(getFacilityInfo(t,eventdefs)) {
for(i=0;i<t->control_tracefile_number;i++){
tf = g_ptr_array_index(t->control_tracefiles, i);
readBlock(tf,1);
- startTmp = tf->a_block_start->time;
+ startTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_start->time);
readBlock(tf,tf->block_number);
- endTmp = tf->a_block_end->time;
+ endTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_end->time);
if(i==0){
startSmall = startTmp;
endBig = endTmp;
for(i=0;i<t->per_cpu_tracefile_number;i++){
tf = g_ptr_array_index(t->per_cpu_tracefiles, i);
readBlock(tf,1);
- startTmp = tf->a_block_start->time;
+ startTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_start->time);
readBlock(tf,tf->block_number);
- endTmp = tf->a_block_end->time;
+ endTmp = ltt_get_time(t->reverse_byte_order, &tf->a_block_end->time);
if(j == 0 && i==0){
startSmall = startTmp;
endBig = endTmp;
if(err) g_error("Can not read tracefile: %s\n", t->name);
if(start_block == end_block)return;
- tailTime = ltt_time_compare(t->a_block_end->time, time);
+ tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time), time);
if(tailTime >= 0) return;
err=readBlock(t,end_block);
if(err) g_error("Can not read tracefile: %s\n", t->name);
if(start_block+1 == end_block)return;
- headTime = ltt_time_compare(t->a_block_start->time, time);
+ headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_start->time), time);
if(headTime <= 0 ) return;
tmp_block = (end_block + start_block)/2;
err=readBlock(t,tmp_block);
if(err) g_error("Can not read tracefile: %s\n", t->name);
- headTime = ltt_time_compare(t->a_block_start->time, time);
- tailTime = ltt_time_compare(t->a_block_end->time, time);
+ headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_start->time), time);
+ tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time), time);
if(headTime <= 0 && tailTime >= 0) return;
if(headTime > 0){
int t_time, h_time, err;
err=readBlock(t,t->which_block-1);
if(err) g_error("Can not read tracefile: %s\n", t->name);
- h_time = ltt_time_compare(t->a_block_start->time, time);
- t_time = ltt_time_compare(t->a_block_end->time, time);
+ h_time = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_start->time), time);
+ t_time = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time), time);
if(h_time == 0){
int tmp;
if(t->which_block == 1) return;
err=readBlock(t,t->which_block-1);
if(err) g_error("Can not read tracefile: %s\n", t->name);
- tmp = ltt_time_compare(t->a_block_end->time, time);
+ tmp = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time), time);
if(tmp == 0) return ltt_tracefile_seek_time(t, time);
err=readBlock(t,t->which_block+1);
if(err) g_error("Can not read tracefile: %s\n", t->name);
{
int err;
LttTime lttTime;
- int headTime = ltt_time_compare(t->a_block_start->time, time);
- int tailTime = ltt_time_compare(t->a_block_end->time, time);
+ int headTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_start->time), time);
+ int tailTime = ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time), time);
LttEvent ev;
if(headTime < 0 && tailTime > 0){
- if(ltt_time_compare(t->a_block_end->time, t->current_event_time) !=0) {
+ if(ltt_time_compare(ltt_get_time(t->trace->reverse_byte_order,
+ &t->a_block_end->time),
+ t->current_event_time) !=0) {
lttTime = getEventTime(t);
err = ltt_time_compare(lttTime, time);
if(err > 0){
t->pre_cycle_count = ep->pre_cycle_count;
t->count = ep->count;
t->overflow_nsec = ep->overflow_nsec;
+ t->last_heartbeat = ep->last_heartbeat;
/* end of workaround */
//update the fields of the current event and go to the next event
if(unlikely(err))g_error("Can not read tracefile");
}
- event->event_id = (int)(*(guint16 *)(t->cur_event_pos));
+ event->event_id = ltt_get_uint16(t->trace->reverse_byte_order, t->cur_event_pos);
if(unlikely(event->event_id == TRACE_TIME_HEARTBEAT))
t->cur_heart_beat_number++;
t->prev_event_time = t->current_event_time;
// t->current_event_time = getEventTime(t);
- event->time_delta = *(guint32 *)(t->cur_event_pos + EVENT_ID_SIZE);
+ event->time_delta = ltt_get_uint32(t->trace->reverse_byte_order, t->cur_event_pos + EVENT_ID_SIZE);
event->event_time = t->current_event_time;
event->event_cycle_count = t->cur_cycle_count;
event->tracefile = t;
- event->data = t->cur_event_pos + EVENT_HEADER_SIZE;
+ event->data = t->cur_event_pos + EVENT_HEADER_SIZE;
event->which_block = t->which_block;
event->which_event = t->which_event;
event->pre_cycle_count = t->pre_cycle_count;
event->count = t->count;
event->overflow_nsec = t->overflow_nsec;
+ event->last_heartbeat = t->last_heartbeat;
/* end of workaround */
return 0;
}
-/*****************************************************************************
- *Function name
- * skipEvent_pre_read_cycles : go to the next event,
- * update the necessary fields of the current event
- * increment the cycle counter, save it at the end.
- *Input params
- * t : tracefile
- *return value
- * 0 : success
- * ERANGE : event id is out of range
- ****************************************************************************/
-
-int skipEvent_pre_read_cycles(LttTracefile * t)
-{
- int evId;
- void * evData;
- LttEventType * evT;
- LttField * rootFld;
-
- evId = (int)(*(guint16 *)(t->cur_event_pos));
- evData = t->cur_event_pos + EVENT_HEADER_SIZE;
-
- evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId);
-
- if(likely(evT)) rootFld = evT->root_field;
- else return ERANGE;
-
- if(likely(rootFld)){
- //event has string/sequence or the last event is not the same event
- if(likely((evT->latest_block!=t->which_block || evT->latest_event!=t->which_event)
- && rootFld->field_fixed == 0)){
- setFieldsOffset(t, evT, evData, t->trace);
- }
- t->cur_event_pos += EVENT_HEADER_SIZE + rootFld->field_size;
- }else t->cur_event_pos += EVENT_HEADER_SIZE;
-
- //evT->latest_block = t->which_block;
- //evT->latest_event = t->which_event;
-
- //the next event is in the next block
- //if(unlikely(evId == TRACE_BLOCK_END)){
- // Specify end of buffer reached.
- // t->cur_event_pos = t->buffer + t->block_size;
- //}else{
- //g_critical("COUNT : %lu", t->cur_cycle_count);
- //t->which_event++;
- // t->current_event_time = getEventTime(t);
- //}
-
- return 0;
-}
-
-
-
-
-/*****************************************************************************
- *Function name
- * ltt_tracefile_pre_read_cycles :
- * read the current event, increment the cycle counter
- *Input params
- * t : tracefile
- *Return value
- * False : end of bloc reached
- ****************************************************************************/
-
-gboolean ltt_tracefile_pre_read_cycles(LttTracefile *tf)
-{
- int err;
- //LttEvent event;
-
- // if(unlikely(t->cur_event_pos == t->buffer + t->block_size)){
- //if(unlikely(t->which_block == t->block_number)){
- // return FALSE;
- //}
- // return FALSE; // end of bloc reached
- //err = readBlock(t, t->which_block + 1);
- //if(unlikely(err))g_error("Can not read tracefile");
- //}
-
- //event.event_id = (int)(*(guint16 *)(t->cur_event_pos));
- //if(unlikely(event.event_id == TRACE_TIME_HEARTBEAT))
- // t->cur_heart_beat_number++;
-
- //t->prev_event_time = t->current_event_time;
- // t->current_event_time = getEventTime(t);
-
- //event.time_delta = *(guint32 *)(t->cur_event_pos + EVENT_ID_SIZE);
- //event.event_time = t->current_event_time;
- //event.event_cycle_count = t->cur_cycle_count;
-
- //event.tracefile = t;
- //event.data = t->cur_event_pos + EVENT_HEADER_SIZE;
- //event.which_block = t->which_block;
- //event.which_event = t->which_event;
-
- /* This is a workaround for fast position seek */
- //event.last_event_pos = t->last_event_pos;
- //event.prev_block_end_time = t->prev_block_end_time;
- //event.prev_event_time = t->prev_event_time;
- //event.pre_cycle_count = t->pre_cycle_count;
- //event.count = t->count;
- /* end of workaround */
-
-
- /* Increment the cycle counter for the bloc */
- LttTime time;
- LttCycleCount cycle_count; // cycle count for the current event
- LttCycleCount lEventTotalCycle; // Total cycles from start for event
- LttCycleCount lEventNSec; // Total nsecs from start for event
- LttTime lTimeOffset; // Time offset in struct LttTime
- guint16 evId;
-
- evId = *(guint16 *)tf->cur_event_pos;
-
- // Calculate total time in cycles from start of buffer for this event
- cycle_count = (LttCycleCount)*(guint32 *)(tf->cur_event_pos + EVENT_ID_SIZE);
- //g_debug("event cycle count %llu", cycle_count);
- //
- //gint64 delta_count = (gint64)(cycle_count - tf->pre_cycle_count);
- //LttCycleCount res_delta_count;
- gboolean comp_count = cycle_count < tf->pre_cycle_count;
- tf->pre_cycle_count = cycle_count;
-
- if(unlikely(comp_count)) {
- /* Wrapped */
- tf->count++; //increment wrap count
- }
-
- //if(unlikely(cycle_count < tf->pre_cycle_count)) tf->count++;
- //if(unlikely(delta_count < 0)) {
- // tf->count++; //increment wrap count
- // keep in mind that delta_count is negative here.
- // res_delta_count = delta_count + 0x100000000ULL ;
- //} else
- // res_delta_count = (LttCycleCount)delta_count;
-
- //cycle_count += (LttCycleCount)tf->count << 32;
-
- //FIXME (MD)
- // if(tf->cur_heart_beat_number > tf->count)
- // cycle_count += (tf->cur_heart_beat_number - tf->count) << 32;
-
- //tf->cur_cycle_count = tf->cur_cycle_count + res_delta_count;
- tf->cur_cycle_count = cycle_count | ((LttCycleCount)tf->count << 32);
- //g_debug("cur cycle count %llu", tf->cur_cycle_count);
-
-
-
-
- if(unlikely(evId == TRACE_BLOCK_START)){
- //g_debug("BLOCK START");
- }else if(unlikely(evId == TRACE_BLOCK_END)){
- //g_debug("BLOCK END");
-
- /* The goal of all this pre reading */
- tf->a_block_end->cycle_count = tf->cur_cycle_count;
- //g_debug("end of block cycle count : %llu", tf->cur_cycle_count);
-
- return FALSE;
- }
-
- //update the fields of the current event and go to the next event
- err = skipEvent_pre_read_cycles(tf);
- if(unlikely(err == ERANGE)) g_error("event id is out of range\n");
-
-
- return TRUE;
-}
/****************************************************************************
*Function name
if((guint)whichBlock == tf->which_block) return 0;
if(likely(whichBlock - tf->which_block == 1 && tf->which_block != 0)){
- tf->prev_block_end_time = tf->a_block_end->time;
- tf->prev_event_time = tf->a_block_end->time;
+ tf->prev_block_end_time = ltt_get_time(tf->trace->reverse_byte_order,
+ &tf->a_block_end->time);
+ tf->prev_event_time = ltt_get_time(tf->trace->reverse_byte_order,
+ &tf->a_block_end->time);
}else{
tf->prev_block_end_time.tv_sec = 0;
tf->prev_block_end_time.tv_nsec = 0;
tf->a_block_start=(BlockStart *) (tf->buffer + EVENT_HEADER_SIZE);
lostSize = *(guint32 *)(tf->buffer + tf->block_size - sizeof(guint32));
- tf->a_block_end=(BlockEnd *)(tf->buffer + tf->block_size -
- lostSize + EVENT_HEADER_SIZE);
- tf->last_event_pos = tf->buffer + tf->block_size - lostSize;
+ tf->a_block_end=(BlockEnd *)(tf->buffer + tf->block_size
+ - sizeof(guint32) - lostSize - sizeof(BlockEnd));
+ tf->last_event_pos = tf->buffer + tf->block_size -
+ sizeof(guint32) - lostSize
+ - sizeof(BlockEnd) - EVENT_HEADER_SIZE;
tf->which_block = whichBlock;
tf->which_event = 1;
tf->cur_event_pos = tf->buffer;//the beginning of the block, block start ev
tf->cur_heart_beat_number = 0;
+ tf->last_heartbeat = NULL;
/* read the whole block to precalculate total of cycles in it */
tf->count = 0;
tf->pre_cycle_count = 0;
- tf->cur_cycle_count = 0;
- //g_debug("precalculating cycles begin for block %i", whichBlock);
- while(likely(ltt_tracefile_pre_read_cycles(tf)));
- /* Rough approximation of cycles per usec to calculate
- * the real block start and end time.
- */
- getCyclePerNsec(tf);
- /* we are at end position, make end time more precise */
- /* Start overflow_nsec to a negative value : takes account of the
- * start of block cycle counter */
- tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
- * tf->nsec_per_cycle);
- /* put back the numbers corresponding to end time */
- tf->overflow_nsec += tf->one_overflow_nsec * tf->count;
-
- tf->a_block_end->time = getEventTime(tf);
-
- //g_debug("precalculating cycles end for block %i", whichBlock);
-
- /* put back pointer at the beginning */
- tf->count = 0;
- tf->pre_cycle_count = 0;
- tf->cur_cycle_count = 0;
- tf->which_event = 1;
- tf->cur_event_pos = tf->buffer;//the beginning of the block, block start ev
- tf->cur_heart_beat_number = 0;
+ tf->cur_cycle_count = ltt_get_uint32(tf->trace->reverse_byte_order, tf->cur_event_pos + EVENT_ID_SIZE);
- /* Make start time more precise */
- /* Start overflow_nsec to a negative value : takes account of the
- * start of block cycle counter */
- tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
- * tf->nsec_per_cycle);
-
-
- tf->a_block_start->time = getEventTime(tf);
-
- /* recalculate the cycles per nsec, with now more precise start and end time
- */
getCyclePerNsec(tf);
- tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
- * tf->nsec_per_cycle);
-
+ tf->overflow_nsec =
+ (-((double)
+ (ltt_get_uint64(tf->trace->reverse_byte_order,
+ &tf->a_block_start->cycle_count)&0xFFFFFFFF))
+ * tf->nsec_per_cycle);
tf->current_event_time = getEventTime(tf);
tf->prev_event_time.tv_nsec = 0;
tf->count = 0;
- tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
+ tf->overflow_nsec =
+ (-((double)ltt_get_uint64(tf->trace->reverse_byte_order,
+ &tf->a_block_start->cycle_count))
* tf->nsec_per_cycle);
}
LttEventType * evT;
LttField * rootFld;
- evId = (int)(*(guint16 *)(t->cur_event_pos));
+ evId = ltt_get_uint16(t->trace->reverse_byte_order, t->cur_event_pos);
evData = t->cur_event_pos + EVENT_HEADER_SIZE;
evT = ltt_trace_eventtype_get(t->trace,(unsigned)evId);
if(unlikely(evId == TRACE_BLOCK_END)){
t->cur_event_pos = t->buffer + t->block_size;
}else{
+ t->cur_cycle_count = ltt_get_uint32(t->trace->reverse_byte_order,
+ t->cur_event_pos + EVENT_ID_SIZE);
t->which_event++;
t->current_event_time = getEventTime(t);
}
{
LttTime lBufTotalTime; /* Total time for this buffer */
double lBufTotalNSec; /* Total time for this buffer in nsecs */
- double lBufTotalCycle;/* Total cycles for this buffer */
+ LttCycleCount lBufTotalCycle;/* Total cycles for this buffer */
/* Calculate the total time for this buffer */
- lBufTotalTime = ltt_time_sub(t->a_block_end->time, t->a_block_start->time);
+ lBufTotalTime = ltt_time_sub(
+ ltt_get_time(t->trace->reverse_byte_order, &t->a_block_end->time),
+ ltt_get_time(t->trace->reverse_byte_order, &t->a_block_start->time));
/* Calculate the total cycles for this bufffer */
- lBufTotalCycle = t->a_block_end->cycle_count;
- lBufTotalCycle -= t->a_block_start->cycle_count;
+ lBufTotalCycle = ltt_get_uint64(t->trace->reverse_byte_order,
+ &t->a_block_end->cycle_count);
+ lBufTotalCycle -= ltt_get_uint64(t->trace->reverse_byte_order,
+ &t->a_block_start->cycle_count);
- /* Convert the total time to nsecs */
+ /* Convert the total time to double */
lBufTotalNSec = ltt_time_to_double(lBufTotalTime);
t->nsec_per_cycle = (double)lBufTotalNSec / (double)lBufTotalCycle;
+
/* Pre-multiply one overflow (2^32 cycles) by nsec_per_cycle */
t->one_overflow_nsec = t->nsec_per_cycle * (double)0x100000000ULL;
- /* See : http://www.azillionmonkeys.com/qed/adiv.html */
- // precalculate the reciprocal, so divisions will be really fast.
- // 2^32-1 == 0xFFFFFFFFULL
- //{
- // double int_res = lBufTotalCycle/lBufTotalNSec;
- // t->cycles_per_nsec_reciprocal =
- // ((0xFFFF+int_res)/int_res);
- //}
-
}
/****************************************************************************
LttTime lTimeOffset; // Time offset in struct LttTime
guint16 evId;
- evId = *(guint16 *)tf->cur_event_pos;
- //if(unlikely(evId == TRACE_BLOCK_START)){
- // tf->count = 0;
- // tf->pre_cycle_count = 0;
- // tf->cur_cycle_count = tf->a_block_start->cycle_count;
- // return tf->a_block_start->time;
- //}//else if(unlikely(evId == TRACE_BLOCK_END)){
- //tf->count = 0;
- //tf->pre_cycle_count = 0;
- //tf->cur_cycle_count = tf->a_block_end->cycle_count;
- //return tf->a_block_end->time;
- //}
+ evId = ltt_get_uint16(tf->trace->reverse_byte_order,
+ tf->cur_event_pos);
- // Calculate total time in cycles from start of buffer for this event
- cycle_count = (LttCycleCount)*(guint32 *)(tf->cur_event_pos + EVENT_ID_SIZE);
- //g_debug("event cycle count %llu", cycle_count);
- //
- //gint64 delta_count = (gint64)(cycle_count - tf->pre_cycle_count);
- //LttCycleCount res_delta_count;
+ cycle_count = ltt_get_uint32(tf->trace->reverse_byte_order,
+ tf->cur_event_pos + EVENT_ID_SIZE);
+
gboolean comp_count = cycle_count < tf->pre_cycle_count;
+
tf->pre_cycle_count = cycle_count;
if(unlikely(comp_count)) {
- /* Wrapped */
+ /* Overflow */
tf->overflow_nsec += tf->one_overflow_nsec;
tf->count++; //increment overflow count
}
-
- //if(unlikely(cycle_count < tf->pre_cycle_count)) tf->count++;
- //if(unlikely(delta_count < 0)) {
- // tf->count++; //increment wrap count
- // keep in mind that delta_count is negative here.
- // res_delta_count = delta_count + 0x100000000ULL ;
- //} else
- // res_delta_count = (LttCycleCount)delta_count;
-
- //cycle_count += (LttCycleCount)tf->count << 32;
-
- //FIXME (MD)
- // if(tf->cur_heart_beat_number > tf->count)
- // cycle_count += (tf->cur_heart_beat_number - tf->count) << 32;
-
- //tf->cur_cycle_count = tf->cur_cycle_count + res_delta_count;
- //
- //
- // Total cycle counter of the event.
- //tf->cur_cycle_count = cycle_count | ((LttCycleCount)tf->count << 32);
-
- //g_debug("cur cycle count %llu", tf->cur_cycle_count);
-
- // Total number of cycles since the beginning of the block
- //lEventTotalCycle = tf->cur_cycle_count
- // - tf->a_block_start->cycle_count;
-
-
+ if(unlikely(evId == TRACE_BLOCK_START)) {
+ lEventNSec = 0;
+ } else if(unlikely(evId == TRACE_BLOCK_END)) {
+ lEventNSec = ((double)
+ (ltt_get_uint64(tf->trace->reverse_byte_order,
+ &tf->a_block_end->cycle_count)
+ - ltt_get_uint64(tf->trace->reverse_byte_order,
+ &tf->a_block_start->cycle_count))
+ * tf->nsec_per_cycle);
+ }
#if 0
- // Calculate total time in cycles from start of buffer for this event
- cycle_count = (LttCycleCount)*(guint32 *)(tf->cur_event_pos + EVENT_ID_SIZE);
-
- if(unlikely(cycle_count < tf->pre_cycle_count)) tf->count++;
- tf->pre_cycle_count = cycle_count;
- cycle_count += (LttCycleCount)tf->count << 32;
-
- //FIXME (MD)
- // if(tf->cur_heart_beat_number > tf->count)
- // cycle_count += (tf->cur_heart_beat_number - tf->count) << 32;
-
- tf->cur_cycle_count = cycle_count;
+ /* If you want to make heart beat a special case and use their own 64 bits
+ * TSC, activate this.
+ */
+ else if(unlikely(evId == TRACE_TIME_HEARTBEAT)) {
- lEventTotalCycle = cycle_count;
- lEventTotalCycle -= tf->a_block_start->cycle_count;
+ tf->last_heartbeat = (TimeHeartbeat*)(tf->cur_event_pos+EVENT_HEADER_SIZE);
+ lEventNSec = ((double)(tf->last_heartbeat->cycle_count
+ - tf->a_block_start->cycle_count)
+ * tf->nsec_per_cycle);
+ }
#endif //0
- // Convert it to nsecs
- //lEventNSec = (double)lEventTotalCycle * (double)tf->nsec_per_cycle;
- //lEventNSec = (tf->cycles_per_nsec_reciprocal * lEventTotalCycle) >> 16;
-
- // Determine offset in struct LttTime
- //lTimeOffset = ltt_time_from_double(lEventNSec);
- //
- // We do not substract block start cycle count here, it has already been done
- // on the overflow_nsec
- // The result should never be negative, because the cycle count of
- // the event following the block start should be >= the previous one.
- lEventNSec = (gint64)((double)cycle_count * tf->nsec_per_cycle)
- +tf->overflow_nsec;
- //g_assert(lEventNSec >= 0);
+ else {
+ lEventNSec = (gint64)((double)cycle_count * tf->nsec_per_cycle)
+ +tf->overflow_nsec;
+ }
+
lTimeOffset = ltt_time_from_uint64(lEventNSec);
- time = ltt_time_add(tf->a_block_start->time, lTimeOffset);
+ time = ltt_time_add(ltt_get_time(tf->trace->reverse_byte_order,
+ &tf->a_block_start->time), lTimeOffset);
return time;
}
0,fld->child[0], NULL, trace);
fld->element_size = size;
}else{//0: sequence
- element_number = getIntNumber(size1,evD);
+ element_number = getIntNumber(t->trace->reverse_byte_order,size1,evD);
type->element_number = element_number;
if(fld->element_size > 0){
size = element_number * fld->element_size;
}
size = offset2;
}else size = fld->field_size;
- if(unlikely(!evD)){
- fld->fixed_root = (offsetRoot==-1) ? 0 : 1;
- fld->fixed_parent = (offsetParent==-1) ? 0 : 1;
- }
+ fld->fixed_root = (offsetRoot==-1) ? 0 : 1;
+ fld->fixed_parent = (offsetParent==-1) ? 0 : 1;
break;
default:
* gint64 : a 64 bits integer
****************************************************************************/
-gint64 getIntNumber(int size, void *evD)
+gint64 getIntNumber(gboolean reverse_byte_order, int size, void *evD)
{
gint64 i;
switch(size) {
- case 1: i = *(gint8 *)evD; break;
- case 2: i = *(gint16 *)evD; break;
- case 4: i = *(gint32 *)evD; break;
- case 8: i = *(gint64 *)evD; break;
- default: i = *(gint64 *)evD;
+ case 1: i = *((gint8*)evD); break;
+ case 2: i = ltt_get_int16(reverse_byte_order, evD); break;
+ case 4: i = ltt_get_int32(reverse_byte_order, evD); break;
+ case 8: i = ltt_get_int64(reverse_byte_order, evD); break;
+ default: i = ltt_get_int64(reverse_byte_order, evD);
g_critical("getIntNumber : integer size %d unknown", size);
break;
}
-#if 0
- if(size == 1) i = *(gint8 *)evD;
- else if(size == 2) i = *(gint16 *)evD;
- else if(size == 4) i = *(gint32 *)evD;
- else if(size == 8) i = *(gint64 *)evD;
-#endif //0
-
- return (gint64)i;
+ return i;
}
-
+#if 0
/*****************************************************************************
*Function name
* getDataEndianType : get the data type size and endian type of the local
*size = LTT_ILP64;
else *size = LTT_UNKNOWN;
}
-
+#endif //0
/* get the node name of the system */
char * ltt_trace_system_description_node_name (LttSystemDescription * s)
projects / lttv.git / blobdiff