X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftracefile.c;h=43334ed366d727fcb1527ed7ef7b411ed178004e;hb=487ad18102bd5f8a398f3c14ed3a489d3c89a181;hp=928f541af152f0bbf859ea91dfd0f7d6936a20fc;hpb=62e55dd6e879b10dc7b4308dbec16061a74a5674;p=lttv.git

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 928f541a..43334ed3 100644
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -36,37 +36,6 @@ int skipEvent(LttTracefile * t);
 /* compare two time (LttTime), 0:t1=t2, -1:t1<t2, 1:t1>t2 */
 int timecmp(LttTime * t1, LttTime * t2);
 
-/* get an integer number */
-int getIntNumber(int size1, void *evD);
-
-
-/* Time operation macros for LttTime (struct timespec) */
-/*  (T3 = T2 - T1) */
-#define TimeSub(T3, T2, T1) \
-do \
-{\
-  (T3).tv_sec  = (T2).tv_sec  - (T1).tv_sec;  \
-  (T3).tv_nsec = (T2).tv_nsec - (T1).tv_nsec; \
-  if((T3).tv_nsec < 0)\
-    {\
-    (T3).tv_sec--;\
-    (T3).tv_nsec += 1000000000;\
-    }\
-} while(0)
-
-/*  (T3 = T2 + T1) */
-#define TimeAdd(T3, T2, T1) \
-do \
-{\
-  (T3).tv_sec  = (T2).tv_sec  + (T1).tv_sec;  \
-  (T3).tv_nsec = (T2).tv_nsec + (T1).tv_nsec; \
-  if((T3).tv_nsec >= 1000000000)\
-    {\
-    (T3).tv_sec += (T3).tv_nsec / 1000000000;\
-    (T3).tv_nsec = (T3).tv_nsec % 1000000000;\
-    }\
-} while(0)
-
 
 
 /*****************************************************************************
@@ -180,7 +149,6 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name)
       }else if(ev->event_id == TRACE_BLOCK_END){
 	break;
       }else g_error("Not valid facilities trace file\n");
-      g_free(ev);
     }
   }
 }
@@ -521,23 +489,25 @@ void ltt_trace_close(LttTrace *t)
     tf = (LttTracefile*)g_ptr_array_index(t->control_tracefiles,i);
     ltt_tracefile_close(tf);
   }
-  g_ptr_array_free(t->control_tracefiles, FALSE);
+  g_ptr_array_free(t->control_tracefiles, TRUE);
 
   //free per_cpu_tracefiles
   for(i=0;i<t->per_cpu_tracefile_number;i++){
     tf = (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles,i);
     ltt_tracefile_close(tf);
   }
-  g_ptr_array_free(t->per_cpu_tracefiles, FALSE);
+  g_ptr_array_free(t->per_cpu_tracefiles, TRUE);
 
   //free facilities
   for(i=0;i<t->facility_number;i++){
     f = (LttFacility*)g_ptr_array_index(t->facilities,i);
     ltt_facility_close(f);
   }
-  g_ptr_array_free(t->facilities, FALSE);
+  g_ptr_array_free(t->facilities, TRUE);
 
   g_free(t);
+ 
+  g_blow_chunks();
 }
 
 
@@ -580,7 +550,7 @@ unsigned ltt_trace_facility_find(LttTrace *t, char *name, unsigned *position)
 {
   int i, count=0;
   LttFacility * f;
-  for(i=0;i=t->facility_number;i++){
+  for(i=0;i<t->facility_number;i++){
     f = (LttFacility*)g_ptr_array_index(t->facilities, i);
     if(strcmp(f->name,name)==0){
       count++;
@@ -683,7 +653,7 @@ int ltt_trace_per_cpu_tracefile_find(LttTrace *t, unsigned i)
 
 LttTracefile *ltt_trace_control_tracefile_get(LttTrace *t, unsigned i)
 {
-  return (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, i);  
+  return (LttTracefile*)g_ptr_array_index(t->control_tracefiles, i);  
 }
 
 LttTracefile *ltt_trace_per_cpu_tracefile_get(LttTrace *t, unsigned i)
@@ -691,6 +661,52 @@ LttTracefile *ltt_trace_per_cpu_tracefile_get(LttTrace *t, unsigned i)
   return (LttTracefile*)g_ptr_array_index(t->per_cpu_tracefiles, i);
 }
 
+/*****************************************************************************
+ * Get the start time and end time of the trace 
+ ****************************************************************************/
+
+void ltt_trace_time_span_get(LttTrace *t, LttTime *start, LttTime *end)
+{
+  LttTime startSmall, startTmp, endBig, endTmp;
+  int i, j=0;
+  LttTracefile * tf;
+
+  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;    
+    readBlock(tf,tf->block_number);
+    endTmp = tf->a_block_end->time;
+    if(i==0){
+      startSmall = startTmp;
+      endBig     = endTmp;
+      j = 1;
+      continue;
+    }
+    if(timecmp(&startSmall,&startTmp) > 0) startSmall = startTmp;
+    if(timecmp(&endBig,&endTmp) < 0) 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;    
+    readBlock(tf,tf->block_number);
+    endTmp = tf->a_block_end->time;
+    if(j == 0 && i==0){
+      startSmall = startTmp;
+      endBig     = endTmp;
+      continue;
+    }
+    if(timecmp(&startSmall,&startTmp) > 0) startSmall = startTmp;
+    if(timecmp(&endBig,&endTmp) < 0) endBig = endTmp;
+  }
+
+  *start = startSmall;
+  *end = endBig;
+}
+
+
 /*****************************************************************************
  *Get the name of a tracefile
  ****************************************************************************/
@@ -700,6 +716,15 @@ char *ltt_tracefile_name(LttTracefile *tf)
   return tf->name;
 }
 
+/*****************************************************************************
+ * Get the number of blocks in the tracefile 
+ ****************************************************************************/
+
+unsigned ltt_tracefile_block_number(LttTracefile *tf)
+{
+  return tf->block_number; 
+}
+
 /*****************************************************************************
  *Function name
  *    ltt_tracefile_seek_time: seek to the first event of the trace with time 
@@ -728,15 +753,16 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
 	return ltt_tracefile_seek_time(t, time);
       }
     }else if(err < 0){
-      err = t->which_block;
-      ev = ltt_tracefile_read(t);
-      if(ev == NULL){
-	g_print("End of file\n");      
-	return;
+      while(1){
+	ev = ltt_tracefile_read(t);
+	if(ev == NULL){
+	  g_print("End of file\n");      
+	  return;
+	}
+	lttTime = getEventTime(t);
+	err = timecmp(&lttTime, &time);
+	if(err >= 0)return;
       }
-      g_free(ev);
-      if(t->which_block == err)
-	return ltt_tracefile_seek_time(t,time);
     }else return;    
   }else if(headTime > 0){
     if(t->which_block == 1){
@@ -762,7 +788,7 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
   }else if(headTime == 0){
     updateTracefile(t);
   }else if(tailTime == 0){
-    t->cur_event_pos = t->a_block_end;
+    t->cur_event_pos = t->a_block_end - EVENT_HEADER_SIZE;
     t->current_event_time = time;  
     t->cur_heart_beat_number = 0;
     t->prev_event_time.tv_sec = 0;
@@ -771,6 +797,32 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
   }
 }
 
+/*****************************************************************************
+ * Seek to the first event with position equal or larger to ep 
+ ****************************************************************************/
+
+void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep)
+{
+  //if we are at the right place, just return
+  if(t->which_block == ep->block_num && t->which_event == ep->event_num)
+    return;
+  
+  if(t->which_block == ep->block_num) updateTracefile(t);
+  else readBlock(t,ep->block_num);
+
+  //event offset is availiable
+  if(ep->old_position){
+    t->cur_heart_beat_number = ep->heart_beat_number;
+    t->cur_event_pos = t->buffer + ep->event_offset;
+    return;
+  }
+
+  //only block number and event index are availiable
+  while(t->which_event < ep->event_num) ltt_tracefile_read(t);
+
+  return;
+}
+
 /*****************************************************************************
  *Function name
  *    ltt_tracefile_read : read the current event, set the pointer to the next
@@ -782,9 +834,17 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
 
 LttEvent *ltt_tracefile_read(LttTracefile *t)
 {
-  LttEvent * lttEvent = (LttEvent *)g_new(LttEvent, 1);
+  LttEvent * lttEvent = &t->an_event;
   int err;
 
+  if(t->cur_event_pos == t->buffer + t->block_size){
+    if(t->which_block == t->block_number){
+      return NULL;
+    }
+    err = readBlock(t, t->which_block + 1);
+    if(err)g_error("Can not read tracefile");    
+  }
+
   lttEvent->event_id = (int)(*(uint16_t *)(t->cur_event_pos));
   if(lttEvent->event_id == TRACE_TIME_HEARTBEAT)
     t->cur_heart_beat_number++;
@@ -800,16 +860,12 @@ LttEvent *ltt_tracefile_read(LttTracefile *t)
 
   lttEvent->tracefile = t;
   lttEvent->data = t->cur_event_pos + EVENT_HEADER_SIZE;  
+  lttEvent->which_block = t->which_block;
+  lttEvent->which_event = t->which_event;
 
   //update the fields of the current event and go to the next event
   err = skipEvent(t);
-  if(err == ENOMEM){
-    g_free(lttEvent);
-    return NULL;
-  }
-  if(err == ENOENT) return lttEvent;
   if(err == ERANGE) g_error("event id is out of range\n");
-  if(err)g_error("Can not read tracefile\n");
 
   return lttEvent;
 }
@@ -914,10 +970,6 @@ void updateTracefile(LttTracefile * tf)
  *    t         : tracefile
  *return value 
  *    0               : success
- *    EINVAL          : lseek fail
- *    EIO             : can not read from the file
- *    ENOMEM          : end of file
- *    ENOENT          : last event
  *    ERANGE          : event id is out of range
  ****************************************************************************/
 
@@ -927,53 +979,30 @@ int skipEvent(LttTracefile * t)
   void * evData;
   LttEventType * evT;
   LttField * rootFld;
-  static int evCount = 0;
-
-  if(evCount){
-    if(t->which_block == t->block_number && 
-       evCount == t->which_event){
-      return ENOMEM;
-    }else evCount = 0;
-  }
 
   evId   = (int)(*(uint16_t *)(t->cur_event_pos));
   evData = t->cur_event_pos + EVENT_HEADER_SIZE;
 
-  //regard BLOCK_START, END and HEARTBEAT as special case, there are buildin events
-  if(evId != TRACE_BLOCK_START && evId != TRACE_BLOCK_END && evId != TRACE_TIME_HEARTBEAT){
-    evT    = ltt_trace_eventtype_get(t->trace,(unsigned)evId);
+  evT    = ltt_trace_eventtype_get(t->trace,(unsigned)evId);
     
-    if(evT) rootFld = evT->root_field;
-    else return ERANGE;
+  if(evT) rootFld = evT->root_field;
+  else return ERANGE;
   
-    if(rootFld){
-      //event has string/sequence or the last event is not the same event
-      if((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;
-  }else{
-    if(evId == TRACE_BLOCK_START || evId == TRACE_BLOCK_END){
-      t->cur_event_pos += sizeof(BlockStart) + EVENT_HEADER_SIZE;
-    }else{
-      t->cur_event_pos += sizeof(TimeHeartbeat) + EVENT_HEADER_SIZE;
+  if(rootFld){
+    //event has string/sequence or the last event is not the same event
+    if((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(evId == TRACE_BLOCK_END){
-    if(t->which_block == t->block_number){
-      t->which_event++;
-      evCount = t->which_event;
-      return ENOENT;
-    }
-    err = readBlock(t, t->which_block + 1);
-    if(err) return err;
+    t->cur_event_pos = t->buffer + t->block_size;
   }else{
     t->which_event++;
     t->current_event_time = getEventTime(t);
@@ -1127,6 +1156,7 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot,
   }else if(type->type_class == LTT_SEQUENCE){
     size1 = (int) ltt_type_size(trace, type);
     if(fld->field_fixed == -1){
+      fld->sequ_number_size = size1;
       fld->field_fixed = 0;
       size = getFieldtypeSize(t, evT, offsetRoot,0,fld->child[0], NULL, trace);      
       fld->element_size = size;
@@ -1210,11 +1240,11 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot,
 
 int timecmp(LttTime * t1, LttTime * t2)
 {
-  LttTime T;
-  TimeSub(T, *t1, *t2);
-  if(T.tv_sec == 0 && T.tv_nsec == 0) return 0;
-  else if(T.tv_sec > 0 || (T.tv_sec==0 && T.tv_nsec > 0)) return 1;
-  else return -1;
+  if(t1->tv_sec < t2->tv_sec) return -1;
+  if(t1->tv_sec > t2->tv_sec) return 1;
+  if(t1->tv_nsec < t2->tv_nsec) return -1;
+  if(t1->tv_nsec > t2->tv_nsec) return 1;
+  return 0;
 }
 
 /*****************************************************************************