update compat

[lttv.git] / ltt / branches / poly / ltt / tracefile.c

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 19e0f1cd71dec693360b2ccf6a36f061ce643628..ec3bc4da5e503b29032893c86af0fdfda51d7e73 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -41,7 +41,6 @@
 #include <stdlib.h>
 
 
-#include "parser.h"
 #include <ltt/ltt.h>
 #include "ltt-private.h"
 #include <ltt/trace.h>
@@ -873,7 +872,7 @@ int open_tracefiles(LttTrace *trace, gchar *root_path, gchar *relative_path)
     
     g_debug("Tracefile file or directory : %s\n", path);
     
-    if(strcmp(rel_path, "/eventdefs") == 0) continue;
+  //  if(strcmp(rel_path, "/eventdefs") == 0) continue;
     
     if(S_ISDIR(stat_buf.st_mode)) {
 
@@ -1181,7 +1180,6 @@ LttTrace *ltt_trace_open(const gchar *pathname)
   DIR *dir;
   struct dirent *entry;
   guint control_found = 0;
-  guint eventdefs_found = 0;
   struct stat stat_buf;
   gchar path[PATH_MAX];
   
@@ -1212,14 +1210,11 @@ LttTrace *ltt_trace_open(const gchar *pathname)
       if(strcmp(entry->d_name, "control") == 0) {
         control_found = 1;
       }
-      if(strcmp(entry->d_name, "eventdefs") == 0) {
-        eventdefs_found = 1;
-      }
     }
   }
   closedir(dir);
   
-  if(!control_found || !eventdefs_found) goto find_error;
+  if(!control_found) goto find_error;
   
   /* Open all the tracefiles */
   if(open_tracefiles(t, abs_path, "")) {
@@ -1878,6 +1873,7 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
     pos += sizeof(guint16);
   } else {
     /* Compact event */
+    event->event_size = 0xFFFF;
   }
 
   if (a_event_debug)
@@ -2117,6 +2113,7 @@ void ltt_update_event_size(LttTracefile *tf)
   }
 
   info = marker_get_info_from_id(tf->trace, tf->event.event_id);
+
   if (tf->event.event_id >= MARKER_CORE_IDS)
     g_assert(info != NULL);