fix hash table bug

[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 e6e06987feafcfe3fabf975894c84e89f202086a..097e9d2e54dfe54aa049fafd2c1ae90b883a7808 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -274,6 +274,7 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
         tf->tsc_lsb_truncate = vheader->tsc_lsb_truncate;
         tf->tscbits = vheader->tscbits;
         tf->tsc_msb_cutoff = 32 - tf->tsc_lsb_truncate - tf->tscbits;
+        tf->compact_event_bits = 32 - vheader->compact_data_shift;
         tf->tsc_mask = ((1ULL << (tf->tscbits))-1);
         tf->tsc_mask = tf->tsc_mask << tf->tsc_lsb_truncate;
         tf->tsc_mask_next_bit = (1ULL<<(tf->tscbits));
@@ -297,7 +298,6 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
               (double)t->start_tsc
               * (1000000000.0 / tf->trace->freq_scale)
               / (double)t->start_freq);
-          t->compact_event_bits = 0;
         }
       }
       break;
@@ -873,7 +873,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 +1181,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 +1211,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, "")) {
@@ -1769,7 +1765,7 @@ static void print_debug_event_header(LttEvent *ev, void *start_pos, void *end_po
        if (offset + ((i * 4) + j) <
                (long)end_pos - (long)start_pos)
           g_printf("%02hhX",
-            ((char*)ev->tracefile->buffer.head)[ev->offset + offset + ((i * 4) + j)]);
+            ((char*)start_pos)[offset + ((i * 4) + j)]);
        else
          g_printf("  ");
         g_printf(" ");
@@ -1828,9 +1824,9 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
       /* We keep the LSB of the previous timestamp, to make sure
        * we never go back */
       event->event_id = event->timestamp >> tf->tscbits;
-      event->event_id = event->event_id & ((1 << tf->trace->compact_event_bits) - 1);
+      event->event_id = event->event_id & ((1 << tf->compact_event_bits) - 1);
       event->compact_data = event->timestamp >> 
-        (tf->trace->compact_event_bits + tf->tscbits);
+        (tf->compact_event_bits + tf->tscbits);
       //printf("tsc bits %u, ev bits %u init data %u\n",
       //  tf->tscbits, tf->trace->compact_event_bits, event->compact_data);
       /* Put the compact data back in original endianness */