compile fixes

[lttv.git] / ltt / branches / poly / lttv / lttv / print.c

diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c
index 89dad9a4ac423e6dabacd81eb48bfe8b5e9a4b7f..84f3af795adab287833024dd45a15b36119099a1 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/print.c
+++ b/ltt/branches/poly/lttv/lttv/print.c
@@ -49,85 +49,103 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
 
   LttType *type;
 
-  LttField *element;
-
   GQuark name;
 
   int nb, i;
 
   type = ltt_field_type(f);
   switch(ltt_type_class(type)) {
+    case LTT_SHORT:
     case LTT_INT:
     case LTT_LONG:
     case LTT_SSIZE_T:
-      g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f));
+    case LTT_INT_FIXED:
+      g_string_append_printf(s, "%lld", ltt_event_get_long_int(e,f));
       break;
 
+    case LTT_USHORT:
     case LTT_UINT:
     case LTT_ULONG:
     case LTT_SIZE_T:
     case LTT_OFF_T:
-      g_string_append_printf(s, " %llu", ltt_event_get_long_unsigned(e,f));
+    case LTT_UINT_FIXED:
+      g_string_append_printf(s, "%llu", ltt_event_get_long_unsigned(e,f));
+      break;
+    
+    case LTT_CHAR:
+      g_string_append_printf(s, "%c", ltt_event_get_int(e,f));
+      break;
+    case LTT_UCHAR:
+      g_string_append_printf(s, "%c", ltt_event_get_unsigned(e,f));
       break;
-
     case LTT_FLOAT:
-      g_string_append_printf(s, " %g", ltt_event_get_double(e,f));
+      g_string_append_printf(s, "%g", ltt_event_get_double(e,f));
       break;
 
     case LTT_POINTER:
-      g_string_append_printf(s, " 0x%llx", ltt_event_get_long_unsigned(e,f));
+      g_string_append_printf(s, "0x%llx", ltt_event_get_long_unsigned(e,f));
       break;
 
     case LTT_STRING:
-      g_string_append_printf(s, " \"%s\"", ltt_event_get_string(e,f));
+      g_string_append_printf(s, "\"%s\"", ltt_event_get_string(e,f));
       break;
 
     case LTT_ENUM:
-      g_string_append_printf(s, " %s", 
-          g_quark_to_string(ltt_enum_string_get(type,
-          ltt_event_get_unsigned(e,f)-1)));
+      {
+        GQuark value = ltt_enum_string_get(type, ltt_event_get_unsigned(e,f));
+        
+        if(value)
+          g_string_append_printf(s, "%s", g_quark_to_string(value));
+        else
+          g_string_append_printf(s, "%lld", ltt_event_get_long_int(e,f));
+      }
       break;
 
     case LTT_ARRAY:
     case LTT_SEQUENCE:
-      g_string_append_printf(s, " {");
+      g_string_append_printf(s, "{ ");
       nb = ltt_event_field_element_number(e,f);
-      element = ltt_field_element(f);
       for(i = 0 ; i < nb ; i++) {
-        ltt_event_field_element_select(e,f,i);
-        lttv_print_field(e, element, s, field_names);
+        LttField *child = ltt_event_field_element_select(e,f,i);
+        lttv_print_field(e, child, s, field_names);
+        if(i != nb-1) g_string_append_printf(s, ", ");
       }
       g_string_append_printf(s, " }");
       break;
 
     case LTT_STRUCT:
-      g_string_append_printf(s, " {");
+      g_string_append_printf(s, "{ ");
       nb = ltt_type_member_number(type);
       for(i = 0 ; i < nb ; i++) {
+        LttField *element;
         element = ltt_field_member(f,i);
         if(field_names) {
-          ltt_type_member_type(type, i, &name);
-          g_string_append_printf(s, " %s = ", g_quark_to_string(name));
+          name = ltt_field_name(element);
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
         }
         lttv_print_field(e, element, s, field_names);
+        if(i != nb-1) g_string_append_printf(s, ", ");
       }
       g_string_append_printf(s, " }");
       break;
 
     case LTT_UNION:
-      g_string_append_printf(s, " {");
+      g_string_append_printf(s, "{ ");
       nb = ltt_type_member_number(type);
       for(i = 0 ; i < nb ; i++) {
+        LttField *element;
         element = ltt_field_member(f,i);
         if(field_names) {
-          ltt_type_member_type(type, i, &name);
-          g_string_append_printf(s, " %s = ", g_quark_to_string(name));
+          name = ltt_field_name(element);
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
         }
         lttv_print_field(e, element, s, field_names);
+        if(i != nb-1) g_string_append_printf(s, ", ");
       }
       g_string_append_printf(s, " }");
       break;
-
+    case LTT_NONE:
+      break;
   }
 }
 
@@ -147,11 +165,14 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
 
+  GQuark name;
+
+  guint i, num_fields;
+
   g_string_set_size(s,0);
 
   facility = ltt_event_facility(e);
   event_type = ltt_event_eventtype(e);
-  field = ltt_event_field(e);
 
   if(mandatory_fields) {
     time = ltt_event_time(e);
@@ -166,9 +187,18 @@ void lttv_event_to_string(LttEvent *e, GString *s,
                    process->ppid,
                    g_quark_to_string(process->state->t));
   }
-
-  if(field)
+  event_type = ltt_event_eventtype(e);
+  
+  num_fields = ltt_eventtype_num_fields(event_type);
+  for(i=0; i<num_fields; i++) {
+    field = ltt_eventtype_field(event_type, i);
+    if(field_names) {
+      name = ltt_field_name(field);
+      if(name)
+        g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+    }
     lttv_print_field(e, field, s, field_names);
+  }
 } 
 
 static void init()