X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fprint.c;h=a6fcd2d19d0ae0ae46fdf7c3bcb778302eaeebd5;hb=ae3d0f50f89e7b965795a9b9ad7e1f533f760598;hp=84f3af795adab287833024dd45a15b36119099a1;hpb=2312de30ce2be53f81c4eaaa772ffff21511b509;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c
index 84f3af79..a6fcd2d1 100644
--- a/ltt/branches/poly/lttv/lttv/print.c
+++ b/ltt/branches/poly/lttv/lttv/print.c
@@ -161,7 +161,7 @@ void lttv_event_to_string(LttEvent *e, GString *s,
 
   LttTime time;
 
-  guint cpu = ltt_tracefile_num(tfs->parent.tf);
+  guint cpu = tfs->cpu;
   LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
 
@@ -190,6 +190,9 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   event_type = ltt_event_eventtype(e);
   
   num_fields = ltt_eventtype_num_fields(event_type);
+  if(num_fields == 0) return;
+  g_string_append_printf(s, " ");
+  g_string_append_printf(s, "{ ");
   for(i=0; i<num_fields; i++) {
     field = ltt_eventtype_field(event_type, i);
     if(field_names) {
@@ -198,7 +201,9 @@ void lttv_event_to_string(LttEvent *e, GString *s,
         g_string_append_printf(s, "%s = ", g_quark_to_string(name));
     }
     lttv_print_field(e, field, s, field_names);
+    if(i != num_fields-1) g_string_append_printf(s, ", ");
   }
+  g_string_append_printf(s, " }");
 } 
 
 static void init()