add support for hex values in facility enums

[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 8ac4b5061de96a70269dfedc3a539642d55c11cd..cab3108b5d416ce525d64fc62297df385fe73318 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -223,6 +223,7 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
    * (or is set to 0 if the trace has no float (kernel trace)) */
   tf->float_word_order = any->float_word_order;
        tf->has_alignment = any->has_alignment;
+  tf->has_heartbeat = any->has_heartbeat;
 
   if(t) {
     t->arch_type = ltt_get_uint32(LTT_GET_BO(tf),
@@ -233,7 +234,6 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
     t->ltt_major_version = any->major_version;
     t->ltt_minor_version = any->minor_version;
     t->flight_recorder = any->flight_recorder;
-    t->has_heartbeat = any->has_heartbeat;
     t->compact_facilities = NULL;
   }
  
@@ -845,7 +845,7 @@ gboolean ltt_tracefile_group_has_cpu_online(gpointer data)
  * relative path is the path relative to the trace root
  * root path is the full path
  *
- * A tracefile group is simply an array where all the per cpu tracefiles sits.
+ * A tracefile group is simply an array where all the per cpu tracefiles sit.
  */
 
 static int open_tracefiles(LttTrace *trace, gchar *root_path,
@@ -1900,11 +1900,11 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
        if(!tf->compact)
                pos += ltt_align((size_t)pos, tf->trace->arch_size, tf->has_alignment);
        else {
-               g_assert(tf->trace->has_heartbeat);
+               g_assert(tf->has_heartbeat);
                pos += ltt_align((size_t)pos, sizeof(uint32_t), tf->has_alignment);
        }
   
-       if(tf->trace->has_heartbeat) {
+       if(tf->has_heartbeat) {
                event->timestamp = ltt_get_uint32(LTT_GET_BO(tf),
                                                                                                                                                                        pos);
     if(!tf->compact) {