position ok with processing
[lttv.git] / ltt / branches / poly / ltt / tracefile.c
index 82ccda5bf68d2336c8138916bbe9bced855b2172..cd44542031274802a76749b213fa1c2e399e2ce3 100644 (file)
@@ -1,3 +1,21 @@
+/* This file is part of the Linux Trace Toolkit viewer
+ * Copyright (C) 2003-2004 Xiangxiu Yang
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License Version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+ * MA 02111-1307, USA.
+ */
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -5,6 +23,11 @@
 #include <dirent.h>
 #include <linux/errno.h>  
 
+// For realpath
+#include <limits.h>
+#include <stdlib.h>
+
+
 #include "parser.h"
 #include <ltt/ltt.h>
 #include "ltt-private.h"
@@ -36,6 +59,89 @@ void updateTracefile(LttTracefile * tf);
 int skipEvent(LttTracefile * t);
 
 
+/* Functions to parse system.xml file (using glib xml parser) */
+static void parser_start_element (GMarkupParseContext  *context,
+                                 const gchar          *element_name,
+                                 const gchar         **attribute_names,
+                                 const gchar         **attribute_values,
+                                 gpointer              user_data,
+                                 GError              **error)
+{
+  int i=0;
+  LttSystemDescription* des = (LttSystemDescription* )user_data;
+  if(strcmp("system", element_name)){
+    *error = g_error_new(G_MARKUP_ERROR,
+                         G_LOG_LEVEL_WARNING,
+                         "This is not system.xml file");
+    return;
+  }
+  
+  while(attribute_names[i]){
+    if(strcmp("node_name", attribute_names[i])==0){
+       des->node_name = g_strdup(attribute_values[i]);      
+    }else if(strcmp("domainname", attribute_names[i])==0){
+       des->domain_name = g_strdup(attribute_values[i]);      
+    }else if(strcmp("cpu", attribute_names[i])==0){
+       des->nb_cpu = atoi(attribute_values[i]);      
+    }else if(strcmp("arch_size", attribute_names[i])==0){
+       if(strcmp(attribute_values[i],"LP32") == 0) des->size = LTT_LP32;
+       else if(strcmp(attribute_values[i],"ILP32") == 0) des->size = LTT_ILP32;
+       else if(strcmp(attribute_values[i],"LP64") == 0) des->size = LTT_LP64;
+       else if(strcmp(attribute_values[i],"ILP64") == 0) des->size = LTT_ILP64;
+       else if(strcmp(attribute_values[i],"UNKNOWN") == 0) des->size = LTT_UNKNOWN;
+    }else if(strcmp("endian", attribute_names[i])==0){
+       if(strcmp(attribute_values[i],"LITTLE_ENDIAN") == 0)
+         des->endian = LTT_LITTLE_ENDIAN;
+       else if(strcmp(attribute_values[i],"BIG_ENDIAN") == 0) 
+         des->endian = LTT_BIG_ENDIAN;
+    }else if(strcmp("kernel_name", attribute_names[i])==0){
+       des->kernel_name = g_strdup(attribute_values[i]);      
+    }else if(strcmp("kernel_release", attribute_names[i])==0){
+       des->kernel_release = g_strdup(attribute_values[i]);      
+    }else if(strcmp("kernel_version", attribute_names[i])==0){
+       des->kernel_version = g_strdup(attribute_values[i]);      
+    }else if(strcmp("machine", attribute_names[i])==0){
+       des->machine = g_strdup(attribute_values[i]);      
+    }else if(strcmp("processor", attribute_names[i])==0){
+       des->processor = g_strdup(attribute_values[i]);      
+    }else if(strcmp("hardware_platform", attribute_names[i])==0){
+       des->hardware_platform = g_strdup(attribute_values[i]);      
+    }else if(strcmp("operating_system", attribute_names[i])==0){
+       des->operating_system = g_strdup(attribute_values[i]);      
+    }else if(strcmp("ltt_major_version", attribute_names[i])==0){
+       des->ltt_major_version = atoi(attribute_values[i]);      
+    }else if(strcmp("ltt_minor_version", attribute_names[i])==0){
+       des->ltt_minor_version = atoi(attribute_values[i]);      
+    }else if(strcmp("ltt_block_size", attribute_names[i])==0){
+       des->ltt_block_size = atoi(attribute_values[i]);      
+    }else{
+      *error = g_error_new(G_MARKUP_ERROR,
+                           G_LOG_LEVEL_WARNING,
+                           "Not a valid attribute");
+      return;      
+    }
+    i++;
+  }
+}
+
+static void parser_end_element   (GMarkupParseContext  *context,
+                                 const gchar          *element_name,
+                                 gpointer              user_data,
+                                 GError              **error)
+{
+}
+
+static void  parser_characters   (GMarkupParseContext  *context,
+                                 const gchar          *text,
+                                 gsize                 text_len,
+                                 gpointer              user_data,
+                                 GError              **error)
+{
+  LttSystemDescription* des = (LttSystemDescription* )user_data;
+  des->description = g_strdup(text);
+}
+
+
 /*****************************************************************************
  *Function name
  *    ltt_tracefile_open : open a trace file, construct a LttTracefile
@@ -59,12 +165,19 @@ LttTracefile* ltt_tracefile_open(LttTrace * t, char * fileName)
   tf->trace = t;
   tf->fd = open(fileName, O_RDONLY, 0);
   if(tf->fd < 0){
-    g_error("Unable to open input data file %s\n", fileName);
+    g_warning("Unable to open input data file %s\n", fileName);
+    g_free(tf->name);
+    g_free(tf);
+    return NULL;
   }
  
   // Get the file's status 
   if(fstat(tf->fd, &lTDFStat) < 0){
-    g_error("Unable to get the status of the input data file %s\n", fileName);
+    g_warning("Unable to get the status of the input data file %s\n", fileName);
+    g_free(tf->name);
+    close(tf->fd);
+    g_free(tf);
+    return NULL;
   }
 
   // Is the file large enough to contain a trace 
@@ -105,7 +218,7 @@ void ltt_tracefile_open_cpu(LttTrace *t, char * tracefile_name)
   g_ptr_array_add(t->per_cpu_tracefiles, tf);
 }
 
-void ltt_tracefile_open_control(LttTrace *t, char * control_name)
+gint ltt_tracefile_open_control(LttTrace *t, char * control_name)
 {
   LttTracefile * tf;
   LttEvent * ev;
@@ -116,7 +229,10 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name)
   int i;
 
   tf = ltt_tracefile_open(t,control_name);
-  if(!tf) return;
+  if(!tf) {
+         g_warning("ltt_tracefile_open_control : bad file descriptor");
+    return -1;
+  }
   t->control_tracefile_number++;
   g_ptr_array_add(t->control_tracefiles,tf);
 
@@ -124,7 +240,7 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name)
   if(strcmp(&control_name[strlen(control_name)-10],"facilities") ==0){
     while(1){
       ev = ltt_tracefile_read(tf);
-      if(!ev)return; // end of file
+      if(!ev)return 0; // end of file
 
       if(ev->event_id == TRACE_FACILITY_LOAD){
        pos = ev->data;
@@ -139,16 +255,22 @@ void ltt_tracefile_open_control(LttTrace *t, char * control_name)
            break;
          }
        }
-       if(i==t->facility_number)
-         g_error("Facility: %s, checksum: %d is not founded\n",
+       if(i==t->facility_number) {
+         g_warning("Facility: %s, checksum: %d is not found\n",
                  fLoad.name,fLoad.checksum);
+    return -1;
+  }
       }else if(ev->event_id == TRACE_BLOCK_START){
        continue;
       }else if(ev->event_id == TRACE_BLOCK_END){
        break;
-      }else g_error("Not valid facilities trace file\n");
+      }else {
+        g_warning("Not valid facilities trace file\n");
+        return -1;
+      }
     }
   }
+  return 0;
 }
 
 /*****************************************************************************
@@ -170,158 +292,52 @@ void ltt_tracefile_close(LttTracefile *t)
 /*****************************************************************************
  *Get system information
  ****************************************************************************/
-void getSystemInfo(LttSystemDescription* des, char * pathname)
+gint getSystemInfo(LttSystemDescription* des, char * pathname)
 {
   FILE * fp;
-  int i;
-  int entry_number = 15;
   char buf[DIR_NAME_SIZE];
   char description[4*DIR_NAME_SIZE];
-  char * ptr;
+
+  GMarkupParseContext * context;
+  GError * error = NULL;
+  GMarkupParser markup_parser =
+    {
+      parser_start_element,
+      parser_end_element,
+      parser_characters,
+      NULL,  /*  passthrough  */
+      NULL   /*  error        */
+    };
 
   fp = fopen(pathname,"r");
   if(!fp){
-    g_error("Can not open file : %s\n", pathname);
+    g_warning("Can not open file : %s\n", pathname);
+    return -1;
   }
   
-  while(fgets(buf,DIR_NAME_SIZE, fp)!= NULL){
-    ptr = buf;
-    while(isspace(*ptr)) ptr++;
-    if(strlen(ptr) == 0) continue;     
-    break;
-  }
+  context = g_markup_parse_context_new(&markup_parser, 0, des,NULL);
   
-  if(strlen(ptr) == 0) g_error("Not a valid file: %s\n", pathname);
-  if(strncmp("<system",ptr,7) !=0)g_error("Not a valid file: %s\n", pathname);
-
-  for(i=0;i<entry_number;i++){
-    if(fgets(buf,DIR_NAME_SIZE, fp)== NULL)
-      g_error("Not a valid file: %s\n", pathname);
-    buf[strlen(buf)-1] = '\0';
-    ptr = buf;
-    while(isspace(*ptr)) ptr++;
-    switch(i){
-      case 0:
-       if(strncmp("node_name=",ptr,10)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       des->node_name = g_strdup(ptr+10);
-        break;
-      case 1:
-       if(strncmp("domainname=",ptr,11)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       des->domain_name = g_strdup(ptr+11);
-        break;
-      case 2:
-       if(strncmp("cpu=",ptr,4)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       des->nb_cpu = (unsigned)atoi(ptr+4);
-        break;
-      case 3:
-       if(strncmp("arch_size=",ptr,10)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       if(strcmp(ptr+10,"\"LP32\"") == 0) des->size = LTT_LP32;
-       else if(strcmp(ptr+10,"\"ILP32\"") == 0) des->size = LTT_ILP32;
-       else if(strcmp(ptr+10,"\"LP64\"") == 0) des->size = LTT_LP64;
-       else if(strcmp(ptr+10,"\"ILP64\"") == 0) des->size = LTT_ILP64;
-       else if(strcmp(ptr+10,"\"UNKNOWN\"") == 0) des->size = LTT_UNKNOWN;
-        break;
-      case 4:
-       if(strncmp("endian=",ptr,7)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       if(strcmp(ptr+7,"\"LITTLE_ENDIAN\"") == 0)
-         des->endian = LTT_LITTLE_ENDIAN;
-       else if(strcmp(ptr+7,"\"BIG_ENDIAN\"") == 0) 
-         des->endian = LTT_BIG_ENDIAN;
-        break;
-      case 5:
-       if(strncmp("kernel_name=",ptr,12)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       des->kernel_name = g_strdup(ptr+12);
-        break;
-      case 6:
-       if(strncmp("kernel_release=",ptr,15)!=0)
-         g_error("Not a valid file: %s\n", pathname);
-       des->kernel_release = g_strdup(ptr+15);
-        break;
-       case 7:
-        if(strncmp("kernel_version=",ptr,15)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        des->kernel_version = g_strdup(ptr+15);
-        break;
-       case 8:
-        if(strncmp("machine=",ptr,8)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        des->machine = g_strdup(ptr+8);
-        break;
-       case 9:
-        if(strncmp("processor=",ptr,10)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        des->processor = g_strdup(ptr+10);
-        break;
-       case 10:
-        if(strncmp("hardware_platform=",ptr,18)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        des->hardware_platform = g_strdup(ptr+18);
-        break;
-       case 11:
-        if(strncmp("operating_system=",ptr,17)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        des->operating_system = g_strdup(ptr+17);
-        break;
-       case 12:
-        if(strncmp("ltt_major_version=",ptr,18)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        ptr += 18; 
-        //      ptr++;//skip begining "
-        //      ptr[strlen(ptr)-1] = '\0'; //get rid of the ending "
-        des->ltt_major_version = (unsigned)atoi(ptr);
-        break;
-       case 13:
-        if(strncmp("ltt_minor_version=",ptr,18)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        ptr += 18; 
-        //      ptr++;//skip begining "
-        //      ptr[strlen(ptr)-1] = '\0'; //get rid of the ending "
-        des->ltt_minor_version = (unsigned)atoi(ptr);
-        break;
-       case 14:
-        if(strncmp("ltt_block_size=",ptr,15)!=0)
-          g_error("Not a valid file: %s\n", pathname);
-        ptr += 15; 
-        //      ptr++;//skip begining "
-        //      ptr[strlen(ptr)-1] = '\0'; //get rid of the ending "
-        des->ltt_block_size = (unsigned)atoi(ptr);
-        break;
-       default:
-        g_error("Not a valid file: %s\n", pathname);      
-   }
-  }
-
-  //get description
-  description[0] = '\0';
-  if(fgets(buf,DIR_NAME_SIZE, fp)== NULL)
-    g_error("Not a valid file: %s\n", pathname);
-  ptr = buf;
-  while(isspace(*ptr)) ptr++;
-  if(*ptr != '>') g_error("Not a valid file: %s\n", pathname);
-  while((ptr=fgets(buf,DIR_NAME_SIZE, fp))!= NULL){
-    ptr = buf;
-    while(isspace(*ptr)) ptr++;
-    if(strncmp("</system>",ptr,9) == 0 )break;
-    strcat(description, buf);
+  while(fgets(buf,DIR_NAME_SIZE, fp) != NULL){
+    if(!g_markup_parse_context_parse(context, buf, DIR_NAME_SIZE, &error)){
+      if(error != NULL) {
+        g_warning("Can not parse xml file: \n%s\n", error->message);
+        g_error_free(error);
+      }
+      g_markup_parse_context_free(context);
+      fclose(fp);
+      return -1;
+    }
   }
-  if(!ptr)g_error("Not a valid file: %s\n", pathname);
-  if(description[0] = '\0')des->description = NULL;
-  des->description = g_strdup(description);  
-
+  g_markup_parse_context_free(context);
   fclose(fp);
+  return 0;
 }
 
 /*****************************************************************************
  *The following functions get facility/tracefile information
  ****************************************************************************/
 
-void getFacilityInfo(LttTrace *t, char* eventdefs)
+gint getFacilityInfo(LttTrace *t, char* eventdefs)
 {
   DIR * dir;
   struct dirent *entry;
@@ -332,7 +348,10 @@ void getFacilityInfo(LttTrace *t, char* eventdefs)
   char name[DIR_NAME_SIZE];
 
   dir = opendir(eventdefs);
-  if(!dir) g_error("Can not open directory: %s\n", eventdefs);
+  if(!dir) {
+    g_warning("Can not open directory: %s\n", eventdefs);
+    return -1;
+  }
 
   while((entry = readdir(dir)) != NULL){
     ptr = &entry->d_name[strlen(entry->d_name)-4];
@@ -350,16 +369,20 @@ void getFacilityInfo(LttTrace *t, char* eventdefs)
       setFieldsOffset(NULL, et, NULL, t);
     }    
   }
+  return 0;
 }
 
-void getControlFileInfo(LttTrace *t, char* control)
+gint getControlFileInfo(LttTrace *t, char* control)
 {
   DIR * dir;
   struct dirent *entry;
   char name[DIR_NAME_SIZE];
 
   dir = opendir(control);
-  if(!dir) g_error("Can not open directory: %s\n", control);
+  if(!dir) {
+    g_warning("Can not open directory: %s\n", control);
+    return -1;
+  }
 
   while((entry = readdir(dir)) != NULL){
     if(strcmp(entry->d_name,"facilities") != 0 &&
@@ -368,29 +391,36 @@ void getControlFileInfo(LttTrace *t, char* control)
     
     strcpy(name,control);
     strcat(name,entry->d_name);
-    ltt_tracefile_open_control(t,name);
+    if(ltt_tracefile_open_control(t,name))
+      return -1;
   }  
   closedir(dir);
+  return 0;
 }
 
-void getCpuFileInfo(LttTrace *t, char* cpu)
+gint getCpuFileInfo(LttTrace *t, char* cpu)
 {
   DIR * dir;
   struct dirent *entry;
   char name[DIR_NAME_SIZE];
 
   dir = opendir(cpu);
-  if(!dir) g_error("Can not open directory: %s\n", cpu);
+  if(!dir) {
+    g_warning("Can not open directory: %s\n", cpu);
+    return -1;
+  }
 
   while((entry = readdir(dir)) != NULL){
     if(strcmp(entry->d_name,".") != 0 &&
-       strcmp(entry->d_name,"..") != 0 ){
+       strcmp(entry->d_name,"..") != 0 &&
+       strcmp(entry->d_name,".svn") != 0){      
       strcpy(name,cpu);
       strcat(name,entry->d_name);
       ltt_tracefile_open_cpu(t,name);
     }else continue;
   }  
   closedir(dir);
+  return 0;
 }
 
 /*****************************************************************************
@@ -400,8 +430,31 @@ void getCpuFileInfo(LttTrace *t, char* cpu)
  *
  *When a trace is closed, all the associated facilities, types and fields
  *are released as well.
+ *
+ * MD : Fixed this function so it uses realpath, dealing well with
+ * forgotten cases (.. were not used correctly before).
+ *
  ****************************************************************************/
 
+void get_absolute_pathname(const char *pathname, char * abs_pathname)
+{
+  char * ptr, *ptr1;
+  size_t size = DIR_NAME_SIZE;
+  abs_pathname[0] = '\0';
+
+  if ( realpath (pathname, abs_pathname) != NULL)
+    return;
+  else
+  {
+    // FIXME : Path is wrong, is it ok to return the pathname unmodified ?
+    strcpy(abs_pathname, pathname);
+    return;
+  }
+
+  return;
+  
+}
+
 LttTrace *ltt_trace_open(const char *pathname)
 {
   LttTrace  * t;
@@ -411,30 +464,32 @@ LttTrace *ltt_trace_open(const char *pathname)
   char control[DIR_NAME_SIZE];
   char cpu[DIR_NAME_SIZE];
   char tmp[DIR_NAME_SIZE];
+  char abs_path[DIR_NAME_SIZE];
   gboolean has_slash = FALSE;
 
+  get_absolute_pathname(pathname, abs_path);
   //establish the pathname to different directories
-  if(pathname[strlen(pathname)-1] == '/')has_slash = TRUE;
-  strcpy(eventdefs,pathname);
+  if(abs_path[strlen(abs_path)-1] == '/')has_slash = TRUE;
+  strcpy(eventdefs,abs_path);
   if(!has_slash)strcat(eventdefs,"/");
   strcat(eventdefs,"eventdefs/");
 
-  strcpy(info,pathname);
+  strcpy(info,abs_path);
   if(!has_slash)strcat(info,"/");
   strcat(info,"info/");
 
-  strcpy(control,pathname);
+  strcpy(control,abs_path);
   if(!has_slash)strcat(control,"/");
   strcat(control,"control/");
 
-  strcpy(cpu,pathname);
+  strcpy(cpu,abs_path);
   if(!has_slash)strcat(cpu,"/");
   strcat(cpu,"cpu/");
 
   //new trace
-  t               = g_new(LttTrace, 1);
   sys_description = g_new(LttSystemDescription, 1);  
-  t->pathname     = g_strdup(pathname);
+  t               = g_new(LttTrace, 1);
+  t->pathname     = g_strdup(abs_path);
   t->facility_number          = 0;
   t->control_tracefile_number = 0;
   t->per_cpu_tracefile_number = 0;
@@ -447,16 +502,52 @@ LttTrace *ltt_trace_open(const char *pathname)
   //get system description  
   strcpy(tmp,info);
   strcat(tmp,"system.xml");
-  getSystemInfo(sys_description, tmp);
+  if(getSystemInfo(sys_description, tmp)) {
+    g_ptr_array_free(t->facilities, TRUE);
+    g_ptr_array_free(t->per_cpu_tracefiles, TRUE);
+    g_ptr_array_free(t->control_tracefiles, TRUE);
+    g_free(sys_description);
+    g_free(t->pathname);
+    g_free(t);
+    return NULL;
+  }
+
+
 
   //get facilities info
-  getFacilityInfo(t,eventdefs);
+  if(getFacilityInfo(t,eventdefs)) {
+    g_ptr_array_free(t->facilities, TRUE);
+    g_ptr_array_free(t->per_cpu_tracefiles, TRUE);
+    g_ptr_array_free(t->control_tracefiles, TRUE);
+    g_free(sys_description);
+    g_free(t->pathname);
+    g_free(t);
+    return NULL;
+  }
   
   //get control tracefile info
   getControlFileInfo(t,control);
+  /*
+  if(getControlFileInfo(t,control)) {
+    g_ptr_array_free(t->facilities, TRUE);
+    g_ptr_array_free(t->per_cpu_tracefiles, TRUE);
+    g_ptr_array_free(t->control_tracefiles, TRUE);
+    g_free(sys_description);
+    g_free(t->pathname);
+    g_free(t);
+    return NULL;
+  }*/ // With fatal error
 
   //get cpu tracefile info
-  getCpuFileInfo(t,cpu);
+  if(getCpuFileInfo(t,cpu)) {
+    g_ptr_array_free(t->facilities, TRUE);
+    g_ptr_array_free(t->per_cpu_tracefiles, TRUE);
+    g_ptr_array_free(t->control_tracefiles, TRUE);
+    g_free(sys_description);
+    g_free(t->pathname);
+    g_free(t);
+    return NULL;
+  }
 
   return t;
 }
@@ -887,9 +978,12 @@ void ltt_tracefile_seek_time(LttTracefile *t, LttTime time)
 
 /*****************************************************************************
  * Seek to the first event with position equal or larger to ep 
+ *
+ * Modified by Mathieu Desnoyers to used faster offset position instead of
+ * re-reading the whole buffer.
  ****************************************************************************/
 
-void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep)
+void ltt_tracefile_seek_position(LttTracefile *t, const LttEventPosition *ep)
 {
   //if we are at the right place, just return
   if(t->which_block == ep->block_num && t->which_event == ep->event_num)
@@ -897,15 +991,36 @@ void ltt_tracefile_seek_position(LttTracefile *t, LttEventPosition *ep)
   
   if(t->which_block == ep->block_num) updateTracefile(t);
   else readBlock(t,ep->block_num);
-
-  //event offset is availiable
+  //event offset is available
   if(ep->old_position){
-    t->cur_heart_beat_number = ep->heart_beat_number;
+    int err;
+
+    t->which_event = ep->event_num;
     t->cur_event_pos = t->buffer + ep->event_offset;
+    t->prev_event_time = ep->event_time;
+    t->current_event_time = ep->event_time;
+    t->cur_heart_beat_number = ep->heart_beat_number;
+    t->cur_cycle_count = ep->event_cycle_count;
+
+    /* This is a workaround for fast position seek */
+    t->last_event_pos = ep->last_event_pos;
+    t->prev_block_end_time = ep->prev_block_end_time;
+    t->prev_event_time = ep->prev_event_time;
+    t->pre_cycle_count = ep->pre_cycle_count;
+    t->count = ep->count;
+    /* end of workaround */
+
+    //update the fields of the current event and go to the next event
+    err = skipEvent(t);
+    if(err == ERANGE) g_error("event id is out of range\n");
+      
     return;
   }
 
-  //only block number and event index are availiable
+  //only block number and event index are available
+  //MD: warning : this is slow!
+  g_warning("using slow O(n) tracefile seek position");
+
   while(t->which_event < ep->event_num) ltt_tracefile_read(t);
 
   return;
@@ -942,18 +1057,27 @@ LttEvent *ltt_tracefile_read(LttTracefile *t)
 
   lttEvent->time_delta = *(guint32 *)(t->cur_event_pos + EVENT_ID_SIZE);
   lttEvent->event_time = t->current_event_time;
+  lttEvent->event_cycle_count = t->cur_cycle_count;
 
   lttEvent->tracefile = t;
   lttEvent->data = t->cur_event_pos + EVENT_HEADER_SIZE;  
   lttEvent->which_block = t->which_block;
   lttEvent->which_event = t->which_event;
 
+  /* This is a workaround for fast position seek */
+  lttEvent->last_event_pos = t->last_event_pos;
+  lttEvent->prev_block_end_time = t->prev_block_end_time;
+  lttEvent->prev_event_time = t->prev_event_time;
+  lttEvent->pre_cycle_count = t->pre_cycle_count;
+  lttEvent->count = t->count;
+  /* end of workaround */
+
+
+
   //update the fields of the current event and go to the next event
   err = skipEvent(t);
   if(err == ERANGE) g_error("event id is out of range\n");
 
-  lttEvent->event_cycle_count = t->cur_cycle_count;
-
   return lttEvent;
 }
 
@@ -1099,6 +1223,7 @@ int skipEvent(LttTracefile * t)
   return 0;
 }
 
+
 /*****************************************************************************
  *Function name
  *    getCyclePerNsec : calculate cycles per nsec for current block
@@ -1141,10 +1266,10 @@ LttTime getEventTime(LttTracefile * tf)
   LttTime       time;
   LttCycleCount cycle_count;      // cycle count for the current event
   LttCycleCount lEventTotalCycle; // Total cycles from start for event
-  double        lEventNSec;       // Total usecs from start for event
+  LttCycleCount lEventNSec;       // Total usecs from start for event
   LttTime       lTimeOffset;      // Time offset in struct LttTime
   guint16       evId;
-  gint64        nanoSec, tmpCycleCount = (((guint64)1)<<32);
+  LttCycleCount tmpCycleCount = (((LttCycleCount)1)<<32);
 
   evId = *(guint16 *)tf->cur_event_pos;
   if(evId == TRACE_BLOCK_START){
@@ -1166,8 +1291,8 @@ LttTime getEventTime(LttTracefile * tf)
   tf->pre_cycle_count = cycle_count;
   cycle_count += tmpCycleCount * tf->count;  
   
-  if(tf->cur_heart_beat_number > tf->count)
-    cycle_count += tmpCycleCount * (tf->cur_heart_beat_number - tf->count);  
+  //  if(tf->cur_heart_beat_number > tf->count)
+  //    cycle_count += tmpCycleCount * (tf->cur_heart_beat_number - tf->count);  
 
   tf->cur_cycle_count = cycle_count;
 
@@ -1175,12 +1300,11 @@ LttTime getEventTime(LttTracefile * tf)
   lEventTotalCycle -= tf->a_block_start->cycle_count;
 
   // Convert it to nsecs
-  lEventNSec = lEventTotalCycle / tf->cycle_per_nsec;
-  nanoSec    = lEventNSec;
+  lEventNSec = (double)lEventTotalCycle / (double)tf->cycle_per_nsec;
 
   // Determine offset in struct LttTime 
-  lTimeOffset.tv_nsec = nanoSec % NANOSECONDS_PER_SECOND;
-  lTimeOffset.tv_sec  = nanoSec / NANOSECONDS_PER_SECOND;
+  lTimeOffset.tv_nsec = lEventNSec % NANOSECONDS_PER_SECOND;
+  lTimeOffset.tv_sec  = lEventNSec / NANOSECONDS_PER_SECOND;
 
   time = ltt_time_add(tf->a_block_start->time, lTimeOffset);  
   
@@ -1417,3 +1541,19 @@ LttTime ltt_trace_system_description_trace_start_time(LttSystemDescription *s)
   return s->trace_start;
 }
 
+
+LttTracefile *ltt_tracefile_new()
+{
+  return g_new(LttTracefile, 1);
+}
+
+void ltt_tracefile_destroy(LttTracefile *tf)
+{
+  g_free(tf);
+}
+
+void ltt_tracefile_copy(LttTracefile *dest, const LttTracefile *src)
+{
+  *dest = *src;
+}
+
This page took 0.031074 seconds and 4 git commands to generate.