X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=d490dd9f0c8a13c3ed4389aa86b9bbee847a4619;hb=3b15da3ee25d639b1364d405e6202d763ecf11b0;hp=5006dd681980d88acc3d719ba50d4a1807c7630d;hpb=7d65dfadc9a150da85c4bed8005861bca9c78c62;p=lttv.git

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 5006dd68..d490dd9f 100644
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -689,7 +689,8 @@ unsigned ltt_trace_eventtype_number(LttTrace *t)
 }
 
 /* FIXME : performances could be improved with a better design for this
- * function */
+ * function : sequential search through a container has never been the
+ * best on the critical path. */
 LttFacility * ltt_trace_facility_by_id(LttTrace * trace, unsigned id)
 {
   LttFacility * facility = NULL;
@@ -710,10 +711,15 @@ LttFacility * ltt_trace_facility_by_id(LttTrace * trace, unsigned id)
 
 LttEventType *ltt_trace_eventtype_get(LttTrace *t, unsigned evId)
 {
+  LttEventType *event_type;
+  
   LttFacility * f;
   f = ltt_trace_facility_by_id(t,evId);
-  if(!f) return NULL;
-  return f->events[evId - f->base_id];
+
+  if(unlikely(!f)) event_type = NULL;
+  else event_type = f->events[evId - f->base_id];
+
+  return event_type;
 }
 
 /*****************************************************************************
@@ -1020,6 +1026,7 @@ void ltt_tracefile_seek_position(LttTracefile *t, const LttEventPosition *ep)
     t->prev_event_time = ep->prev_event_time;
     t->pre_cycle_count = ep->pre_cycle_count;
     t->count = ep->count;
+    t->overflow_nsec = ep->overflow_nsec;
     /* end of workaround */
 
     //update the fields of the current event and go to the next event
@@ -1082,6 +1089,8 @@ LttEvent *ltt_tracefile_read(LttTracefile *t, LttEvent *event)
   event->prev_event_time = t->prev_event_time;
   event->pre_cycle_count = t->pre_cycle_count;
   event->count = t->count;
+  event->overflow_nsec = t->overflow_nsec;
+  
   /* end of workaround */
 
 
@@ -1238,17 +1247,24 @@ gboolean ltt_tracefile_pre_read_cycles(LttTracefile *tf)
   // 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;  
   
@@ -1256,20 +1272,22 @@ gboolean ltt_tracefile_pre_read_cycles(LttTracefile *tf)
   //  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;
-  g_debug("cur cycle count %llu", tf->cur_cycle_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);
 
 
 
 
   if(unlikely(evId == TRACE_BLOCK_START)){
-    g_debug("BLOCK START");
+    //g_debug("BLOCK START");
   }else if(unlikely(evId == TRACE_BLOCK_END)){
-    g_debug("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);
+    //g_debug("end of block cycle count : %llu", tf->cur_cycle_count);
+
     return FALSE;
   }
 
@@ -1298,6 +1316,9 @@ int readBlock(LttTracefile * tf, int whichBlock)
   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;
@@ -1328,15 +1349,49 @@ int readBlock(LttTracefile * tf, int whichBlock)
   /* 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)));
+  /* 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;
 
+  /* 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->current_event_time = getEventTime(tf);  
 
@@ -1360,6 +1415,11 @@ void updateTracefile(LttTracefile * tf)
 
   tf->prev_event_time.tv_sec = 0;
   tf->prev_event_time.tv_nsec = 0;
+  tf->count = 0;
+
+  tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
+                                        * tf->nsec_per_cycle);
+
 }
 
 /*****************************************************************************
@@ -1437,6 +1497,9 @@ void getCyclePerNsec(LttTracefile * t)
   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
@@ -1462,8 +1525,8 @@ static inline LttTime getEventTime(LttTracefile * tf)
 {
   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
+  //LttCycleCount lEventTotalCycle; // Total cycles from start for event
+  gint64       lEventNSec;       // Total nsecs from start for event
   LttTime       lTimeOffset;      // Time offset in struct LttTime
   guint16       evId;
 
@@ -1483,17 +1546,25 @@ static inline LttTime getEventTime(LttTracefile * tf)
   // 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->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)) {
+  //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;  
   
@@ -1501,10 +1572,17 @@ static inline LttTime getEventTime(LttTracefile * tf)
   //  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;
-  g_debug("cur cycle count %llu", tf->cur_cycle_count);
+  //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);
 
-  lEventTotalCycle = tf->cur_cycle_count;
+  //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;
 
 
 
@@ -1526,12 +1604,21 @@ static inline LttTime getEventTime(LttTracefile * tf)
   lEventTotalCycle -= tf->a_block_start->cycle_count;
 #endif //0
   // Convert it to nsecs
-  lEventNSec = (double)lEventTotalCycle * (double)tf->nsec_per_cycle;
+  //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);
-
+  //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);
+  lTimeOffset = ltt_time_from_uint64(lEventNSec);
+  
   time = ltt_time_add(tf->a_block_start->time, lTimeOffset);  
   
   return time;
@@ -1576,7 +1663,8 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot,
   LttType * type = fld->field_type;
 
   if(likely(t)){
-    if(unlikely(evT->latest_block==t->which_block && evT->latest_event==t->which_event)){
+    if(unlikely(evT->latest_block==t->which_block &&
+                evT->latest_event==t->which_event)){
       return fld->field_size;
     } 
   }
@@ -1635,7 +1723,11 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot,
       if(fld->field_fixed == -1){
         fld->field_fixed = 0;
       }else{//0: string
-        size = strlen((char*)evD) + 1; //include end : '\0'
+        /* Hope my implementation is faster than strlen (Mathieu) */
+        char *ptr=(char*)evD;
+        size = 1;
+        while(*ptr != '\0') { size++; ptr++; }
+        //size = ptr - (char*)evD + 1; //include end : '\0'
       }
       break;