X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fprint.c;h=ff9116a4c30342d0fdfd9211a1edf37ae7efef5b;hb=8402f27d5ece604aac4e8410eff8ee626cb6cca9;hp=50c7c67473dbcb9560950892d83633b296a1f731;hpb=743e50fd0105daeea4804d68989965399bf3a4d3;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c
index 50c7c674..ff9116a4 100644
--- a/ltt/branches/poly/lttv/lttv/print.c
+++ b/ltt/branches/poly/lttv/lttv/print.c
@@ -42,10 +42,10 @@
 #include <ltt/trace.h>
 #include <ltt/facility.h>
 #include <stdio.h>
-
+#include <ctype.h>
 
 void lttv_print_field(LttEvent *e, LttField *f, GString *s,
-                      gboolean field_names) {
+                      gboolean field_names, guint element_index) {
 
   LttType *type;
 
@@ -60,6 +60,13 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
     case LTT_LONG:
     case LTT_SSIZE_T:
     case LTT_INT_FIXED:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       g_string_append_printf(s, "%lld", ltt_event_get_long_int(e,f));
       break;
 
@@ -69,24 +76,67 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
     case LTT_SIZE_T:
     case LTT_OFF_T:
     case LTT_UINT_FIXED:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       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));
+      {
+        unsigned car = ltt_event_get_unsigned(e,f);
+        if(field_names) {
+          name = ltt_field_name(f);
+          if(name)
+            g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+        }
+        if(isprint(car)) {
+          if(field_names) {
+            name = ltt_field_name(f);
+            if(name)
+              g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+          }
+          g_string_append_printf(s, "%c", car);
+        } else {
+          g_string_append_printf(s, "\\%x", car);
+        }
+      }
       break;
     case LTT_FLOAT:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       g_string_append_printf(s, "%g", ltt_event_get_double(e,f));
       break;
 
     case LTT_POINTER:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       g_string_append_printf(s, "0x%llx", ltt_event_get_long_unsigned(e,f));
       break;
 
     case LTT_STRING:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       g_string_append_printf(s, "\"%s\"", ltt_event_get_string(e,f));
       break;
 
@@ -94,6 +144,13 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
       {
         GQuark value = ltt_enum_string_get(type, ltt_event_get_unsigned(e,f));
         
+        if(element_index > 0)
+          g_string_append_printf(s, ", ");
+        if(field_names) {
+          name = ltt_field_name(f);
+          if(name)
+            g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+        }
         if(value)
           g_string_append_printf(s, "%s", g_quark_to_string(value));
         else
@@ -103,44 +160,54 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
 
     case LTT_ARRAY:
     case LTT_SEQUENCE:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       g_string_append_printf(s, "{ ");
       nb = ltt_event_field_element_number(e,f);
       for(i = 0 ; i < nb ; i++) {
         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, ", ");
+        lttv_print_field(e, child, s, field_names, i);
       }
       g_string_append_printf(s, " }");
       break;
 
     case LTT_STRUCT:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       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) {
-          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, ", ");
+        lttv_print_field(e, element, s, field_names, i);
       }
       g_string_append_printf(s, " }");
       break;
 
     case LTT_UNION:
+      if(element_index > 0)
+        g_string_append_printf(s, ", ");
+      if(field_names) {
+        name = ltt_field_name(f);
+        if(name)
+          g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+      }
       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) {
-          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, ", ");
+        lttv_print_field(e, element, s, field_names, i);
       }
       g_string_append_printf(s, " }");
       break;
@@ -161,7 +228,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];
 
@@ -169,7 +236,7 @@ void lttv_event_to_string(LttEvent *e, GString *s,
 
   guint i, num_fields;
 
-  g_string_set_size(s,0);
+  s = g_string_set_size(s,0);
 
   facility = ltt_event_facility(e);
   event_type = ltt_event_eventtype(e);
@@ -183,9 +250,12 @@ void lttv_event_to_string(LttEvent *e, GString *s,
         g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
         cpu);
     /* Print the process id and the state/interrupt type of the process */
-    g_string_append_printf(s,", %u, %u,  %s", process->pid,
-		    process->ppid,
-		    g_quark_to_string(process->state->t));
+    g_string_append_printf(s,", %u, %u, %s, %s, %u, 0x%llX, %s", process->pid,
+        process->tgid,
+        g_quark_to_string(process->name),
+        g_quark_to_string(process->brand),
+        process->ppid, process->current_function,
+        g_quark_to_string(process->state->t));
   }
   event_type = ltt_event_eventtype(e);
   
@@ -195,13 +265,7 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   g_string_append_printf(s, "{ ");
   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);
-    if(i != num_fields-1) g_string_append_printf(s, ", ");
+    lttv_print_field(e, field, s, field_names, i);
   }
   g_string_append_printf(s, " }");
 } 
@@ -215,6 +279,6 @@ static void destroy()
 }
 
 LTTV_MODULE("print", "Print events", \
-	    "Produce a detailed text printout of events", \
-	    init, destroy)
+      "Produce a detailed text printout of events", \
+      init, destroy)