X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=1c2140ef983c9f45b21f0b44ea44271cf8e3e5b5;hb=c02ea99f196ff9bf99335fcf0cae4efc0e28f051;hp=bd9a8fbe9eeaded3edb9e8f218c1b0cde8d8df02;hpb=96da5c0d83846884f7be822410209325a2dd0e51;p=lttv.git

diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c
index bd9a8fbe..1c2140ef 100644
--- a/ltt/branches/poly/ltt/event.c
+++ b/ltt/branches/poly/ltt/event.c
@@ -26,12 +26,24 @@
 #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 parrent
+ *    offsetParent    : offset from the parent
  *    fld             : field
  *    evD             : event data
  *Return value
@@ -217,9 +229,17 @@ void ltt_event_position(LttEvent *e, LttEventPosition *ep)
   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      = FALSE;
+  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 */
 }
 
 LttEventPosition * ltt_event_position_new()
@@ -263,6 +283,7 @@ void ltt_event_position_set(LttEventPosition *ep,
 /*****************************************************************************
  * Function name
  *    ltt_event_position_compare : compare two positions
+ *    A NULL value is infinite.
  * Input params
  *    ep1                    : a pointer to event's position structure
  *    ep2                    : a pointer to event's position structure
@@ -278,6 +299,13 @@ gint ltt_event_position_compare(const LttEventPosition *ep1,
 {
   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)
@@ -305,19 +333,43 @@ gint ltt_event_position_compare(const LttEventPosition *ep1,
 gint ltt_event_event_position_compare(const LttEvent *event,
                                       const LttEventPosition *ep)
 {
-  if(event->tf != ep->tf)
-    g_error("ltt_event_position_compare on different tracefiles makes no sense");
-  if(e->which_block < ep->block_num)
+  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)
     return -1;
-  if(e->which_block > ep->block_num)
+  if(event->which_block > ep->block_num)
     return 1;
-  if(e->which_event < ep->event_num)
+  if(event->which_event < ep->event_num)
     return -1;
-  if(e->which_event > ep->event_num)
+  if(event->which_event > ep->event_num)
     return 1;
   return 0;
 }
 
+/*****************************************************************************
+ * Function name
+ *    ltt_event_position_copy : copy position
+ * Input params
+ *    src                    : a pointer to event's position structure source
+ *    dest                   : a pointer to event's position structure dest
+ * Return
+ *    void
+ ****************************************************************************/
+void ltt_event_position_copy(LttEventPosition *dest,
+                             const LttEventPosition *src)
+{
+  if(src == NULL)
+    dest = NULL;
+  else
+    *dest = *src;
+}
 
 
 /*****************************************************************************
@@ -434,8 +486,7 @@ unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f)
                 e->tracefile->trace->system_description->endian ? 0:1;
   LttTypeEnum t = f->field_type->type_class;
 
-  if(t != LTT_UINT && t != LTT_ENUM)
-    g_error("The type of the field is not unsigned int\n");
+  g_assert(t == LTT_UINT || t == LTT_ENUM);
 
   if(f->field_size == 1){
     guint8 x = *(guint8 *)(e->data + f->offset_root);
@@ -466,8 +517,7 @@ 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;
 
-  if(f->field_type->type_class != LTT_INT)
-    g_error("The type of the field is not int\n");
+  g_assert(f->field_type->type_class == LTT_INT);
 
   if(f->field_size == 1){
     gint8 x = *(gint8 *)(e->data + f->offset_root);
@@ -499,8 +549,7 @@ unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f)
                 e->tracefile->trace->system_description->endian ? 0:1;
   LttTypeEnum t = f->field_type->type_class;
 
-  if(t != LTT_UINT && t != LTT_ENUM)
-    g_error("The type of the field is not unsigned long\n");
+  g_assert(t == LTT_UINT || t == LTT_ENUM);
 
   if(f->field_size == 1){
     guint8 x = *(guint8 *)(e->data + f->offset_root);
@@ -531,8 +580,7 @@ long int ltt_event_get_long_int(LttEvent *e, LttField *f)
   int revFlag = e->tracefile->trace->my_arch_endian == 
                 e->tracefile->trace->system_description->endian ? 0:1;
 
-  if( f->field_type->type_class != LTT_INT)
-    g_error("The type of the field is not long int\n");
+  g_assert( f->field_type->type_class == LTT_INT);
 
   if(f->field_size == 1){
     gint8 x = *(gint8 *)(e->data + f->offset_root);
@@ -563,9 +611,7 @@ float ltt_event_get_float(LttEvent *e, LttField *f)
   int revFlag = e->tracefile->trace->my_arch_endian == 
                 e->tracefile->trace->system_description->endian ? 0:1;
 
-  if(f->field_type->type_class != LTT_FLOAT || 
-     (f->field_type->type_class == LTT_FLOAT && f->field_size != 4))
-    g_error("The type of the field is not float\n");
+  g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 4);
 
   if(revFlag == 0) return *(float *)(e->data + f->offset_root);
   else{
@@ -581,9 +627,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f)
   int revFlag = e->tracefile->trace->my_arch_endian == 
                 e->tracefile->trace->system_description->endian ? 0:1;
 
-  if(f->field_type->type_class != LTT_FLOAT || 
-     (f->field_type->type_class == LTT_FLOAT && f->field_size != 8))
-    g_error("The type of the field is not double\n");
+  g_assert(f->field_type->type_class == LTT_FLOAT && f->field_size == 8);
 
   if(revFlag == 0) return *(double *)(e->data + f->offset_root);
   else{
@@ -601,7 +645,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f)
 
 char *ltt_event_get_string(LttEvent *e, LttField *f)
 {
-  if(f->field_type->type_class != LTT_STRING)
-    g_error("The field contains no string\n");
+  g_assert(f->field_type->type_class == LTT_STRING);
+
   return (char*)g_strdup((char*)(e->data + f->offset_root));
 }