X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fprint.c;h=d5b520863f769729cb79d37ab343b28267f05b44;hb=e098ade03ee410d2fc9fc57f7478f0f74ee9014f;hp=085216f619f9bf3fb72b410523f529bd2afe556a;hpb=41b471e6cf2d1721e554517eefa332930bcf61e4;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c
index 085216f6..d5b52086 100644
--- a/ltt/branches/poly/lttv/lttv/print.c
+++ b/ltt/branches/poly/lttv/lttv/print.c
@@ -1,4 +1,5 @@
 
+
 /* This file is part of the Linux Trace Toolkit viewer
  * Copyright (C) 2003-2004 Michel Dagenais
  *               2005 Mathieu Desnoyers
@@ -42,28 +43,37 @@
 #include <ltt/trace.h>
 #include <ltt/facility.h>
 #include <stdio.h>
+#include <ctype.h>
+#include<ltt/ltt-private.h>
+#include <string.h>
 
 
 void lttv_print_field(LttEvent *e, LttField *f, GString *s,
-                      gboolean field_names) {
+                      gboolean field_names, guint element_index) {
 
   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:
     case LTT_INT_FIXED:
-      g_string_append_printf(s, "%lld", ltt_event_get_long_int(e,f));
-      break;
+      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));
+       g_string_append_printf(s, type->fmt, ltt_event_get_long_int(e,f));
+       break;
 
     case LTT_USHORT:
     case LTT_UINT:
@@ -71,31 +81,74 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
     case LTT_SIZE_T:
     case LTT_OFF_T:
     case LTT_UINT_FIXED:
-      g_string_append_printf(s, "%llu", ltt_event_get_long_unsigned(e,f));
+      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));
+      g_string_append_printf(s, type->fmt, 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);
+	  g_string_append_printf(s, type->fmt, car);
+        } else {
+          g_string_append_printf(s, "\\%x", car);
+        }
+      }
       break;
     case LTT_FLOAT:
-      g_string_append_printf(s, "%g", ltt_event_get_double(e,f));
+     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));
+      g_string_append_printf(s, type->fmt, ltt_event_get_double(e,f));
       break;
 
     case LTT_POINTER:
-      g_string_append_printf(s, "0x%llx", ltt_event_get_long_unsigned(e,f));
+      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));
+      g_string_append_printf(s, type->fmt, ltt_event_get_long_unsigned(e,f));
       break;
 
     case LTT_STRING:
+      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;
 
     case LTT_ENUM:
       {
         GQuark value = ltt_enum_string_get(type, 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(value)
           g_string_append_printf(s, "%s", g_quark_to_string(value));
         else
@@ -105,51 +158,76 @@ void lttv_print_field(LttEvent *e, LttField *f, GString *s,
 
     case LTT_ARRAY:
     case LTT_SEQUENCE:
-      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, "{ ");
+      //Insert header
+      g_string_append_printf(s, type->header);//tested, works fine.
+
+
       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);
-        if(i != nb-1) g_string_append_printf(s, ", ");
+        LttField *child = ltt_event_field_element_select(e,f,i);
+        lttv_print_field(e, child, s, field_names, i);
+	if(i<nb-1)
+	  g_string_append_printf(s,type->separator);
       }
-      g_string_append_printf(s, " }");
+      //g_string_append_printf(s, " }");
+      //Insert footer
+      g_string_append_printf(s, type->footer);//tested, works fine.
       break;
 
     case LTT_STRUCT:
-      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, "{ ");
+      //Insert header
+      g_string_append_printf(s, type->header);
+
       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));
-        }
-        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);
+	if(i < nb-1)
+	  g_string_append_printf(s,type->separator);
       }
-      g_string_append_printf(s, " }");
+      //g_string_append_printf(s, " }");
+      //Insert footer
+      g_string_append_printf(s, type->footer);
       break;
 
     case LTT_UNION:
-      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_string_append_printf(s, type->header);
+
       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));
-        }
-        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);
+	if(i<nb-1)
+	  g_string_append_printf(s, type->separator);
       }
-      g_string_append_printf(s, " }");
+      //      g_string_append_printf(s, " }");
+      g_string_append_printf(s, type->footer);
+      break;
+    case LTT_NONE:
       break;
-
   }
 }
 
-
 void lttv_event_to_string(LttEvent *e, GString *s,
     gboolean mandatory_fields, gboolean field_names, LttvTracefileState *tfs)
 { 
@@ -161,37 +239,51 @@ 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];
 
+  GQuark name;
+
   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);
 
   if(mandatory_fields) {
     time = ltt_event_time(e);
-    g_string_append_printf(s,"%s.%s: %ld.%09ld (%s_%u)",
+    g_string_append_printf(s,"%s.%s: %ld.%09ld (%s%s_%u)",
         g_quark_to_string(ltt_facility_name(facility)),
         g_quark_to_string(ltt_eventtype_name(event_type)),
         (long)time.tv_sec, time.tv_nsec,
+	g_quark_to_string(
+		ltt_trace_name(ltt_tracefile_get_trace(tfs->parent.tf))),
         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);
   
   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_event_field(event_type, i);
-    lttv_print_field(e, field, s, field_names);
+    field = ltt_eventtype_field(event_type, i);
+    lttv_print_field(e, field, s, field_names, i);
+    //should add ',' here
+    if(i<num_fields-1)
+      g_string_append_printf(s,", ");//tested: works fine
   }
+  g_string_append_printf(s, " }");
 } 
 
 static void init()
@@ -203,6 +295,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)