add compact event field

[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 f1e5695ac50294dfc4dc3e331db298c25dda2874..d37c694d6b0349af5120a89ebf1dc27724a2bcdd 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;
@@ -2142,6 +2142,16 @@ void ltt_update_event_size(LttTracefile *tf)
   if (a_event_debug)
     print_debug_event_data(&tf->event);
 
+  /* Having a marker load or marker format event out of the facilities
+   * tracefiles is a serious bug. */
+  switch((enum marker_id)tf->event.event_id) {
+    case MARKER_ID_SET_MARKER_ID:
+    case MARKER_ID_SET_MARKER_FORMAT:
+      if (tf->name != g_quark_from_string("/control/facilities"))
+        g_error("Trace inconsistency : metadata event found in data "
+                "tracefile %s", g_quark_to_string(tf->long_name));
+  }
+
   if (tf->event.data_size != tf->event.event_size) {
     struct marker_info *info = marker_get_info_from_id(tf->trace,
                                                        tf->event.event_id);