// 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;
+ //
+ //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)) {
+ //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;
+ // res_delta_count = delta_count + 0x100000000ULL ;
+ //} else
+ // res_delta_count = (LttCycleCount)delta_count;
//cycle_count += (LttCycleCount)tf->count << 32;
// 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 = 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);
off_t nbBytes;
guint32 lostSize;
+ /* same block already opened requested */
+ 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;
/* read the whole block to precalculate total of cycles in it */
tf->count = 0;
tf->pre_cycle_count = 0;
- tf->cur_cycle_count = tf->a_block_start->cycle_count;
+ tf->cur_cycle_count = 0;
+ g_debug("precalculating cycles begin for block %i", whichBlock);
while(likely(ltt_tracefile_pre_read_cycles(tf)));
+ g_debug("precalculating cycles end for block %i", whichBlock);
+ tf->count = 0;
+ tf->pre_cycle_count = 0;
+ tf->cur_cycle_count = 0;
/* put back pointer at the beginning */
tf->which_event = 1;
tf->cur_event_pos = tf->buffer;//the beginning of the block, block start ev
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;
+ //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;
+ //}
+
+ // 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);
+
+
+ lEventTotalCycle = tf->cur_cycle_count;
+
+
+
+#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);
lEventTotalCycle = cycle_count;
lEventTotalCycle -= tf->a_block_start->cycle_count;
-
+#endif //0
// Convert it to nsecs
lEventNSec = (double)lEventTotalCycle * (double)tf->nsec_per_cycle;
//lEventNSec = (tf->cycles_per_nsec_reciprocal * lEventTotalCycle) >> 16;