Update LTTV to trace format 2.3

[lttv.git] / trunk / lttv / lttv / lttv / print.c

diff --git a/trunk/lttv/lttv/lttv/print.c b/trunk/lttv/lttv/lttv/print.c
index 11b3359079c362489fa90055b31b664eabf01c7e..8bba69719df48a48d69ce92114c2f8d7c0750926 100644 (file)
--- a/trunk/lttv/lttv/lttv/print.c
+++ b/trunk/lttv/lttv/lttv/print.c
@@ -46,12 +46,12 @@
 static inline void print_enum_events(LttEvent *e, struct marker_field *f,
                       guint64 value, GString *s, LttvTracefileState *tfs)
 {
-  LttTrace *trace = ltt_tracefile_get_trace(e->tracefile);
-  struct marker_info *info = marker_get_info_from_id(trace, e->event_id);
+  struct marker_info *info = marker_get_info_from_id(tfs->parent.tf->mdata,
+    e->event_id);
   LttvTraceState *ts = (LttvTraceState*)(tfs->parent.t_context);
   
   //TODO optimize with old quarks.
-  if (info->name == g_quark_from_static_string("kernel_arch_syscall_entry") && 
+  if (info->name == g_quark_from_static_string("kernel_syscall_entry") && 
       f->name == LTT_FIELD_SYSCALL_ID) {
     g_string_append_printf(s, " [%s]",
       g_quark_to_string(ts->syscall_names[value]));
@@ -81,7 +81,8 @@ void lttv_print_field(LttEvent *e, struct marker_field *f, GString *s,
           g_string_append_printf(s, "%s = ", g_quark_to_string(name));
       }
       value = ltt_event_get_long_int(e,f);
-      g_string_append_printf(s, "%lld", value);
+      //g_string_append_printf(s, "%lld", value);
+      g_string_append_printf(s, f->fmt->str, value);
       //g_string_append_printf(s, type->fmt, ltt_event_get_long_int(e,f));
       print_enum_events(e, f, value, s, tfs);
       break;
@@ -93,7 +94,8 @@ void lttv_print_field(LttEvent *e, struct marker_field *f, GString *s,
           g_string_append_printf(s, "%s = ", g_quark_to_string(name));
       }
       value = ltt_event_get_long_unsigned(e,f);
-      g_string_append_printf(s, "%llu", value);
+      //g_string_append_printf(s, "%llu", value);
+      g_string_append_printf(s, f->fmt->str, value);
       print_enum_events(e, f, value, s, tfs);
       //g_string_append_printf(s, type->fmt, ltt_event_get_long_unsigned(e,f));
       break;
@@ -254,11 +256,10 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   guint cpu = tfs->cpu;
   LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
-  LttTrace *trace = ts->parent.t;
 
   s = g_string_set_size(s,0);
 
-  info = marker_get_info_from_id(trace, e->event_id);
+  info = marker_get_info_from_id(tfs->parent.tf->mdata, e->event_id);
 
   if(mandatory_fields) {
     time = ltt_event_time(e);