X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=fea42ef0800b49cbac826eeed1215099e9ada94f;hb=cec3d7b0a4303198eb608ecccd44454d56ab7b04;hp=51e6994a23dc337fe29de37bd5f66aa871bbfebe;hpb=12c59c3d7642704991efec208aff605b77fa32e5;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c
index 51e6994a..fea42ef0 100644
--- a/ltt/branches/poly/lttv/modules/text/textDump.c
+++ b/ltt/branches/poly/lttv/modules/text/textDump.c
@@ -27,10 +27,12 @@
 #include <lttv/attribute.h>
 #include <lttv/iattribute.h>
 #include <lttv/stats.h>
+#include <lttv/filter.h>
 #include <ltt/ltt.h>
 #include <ltt/event.h>
 #include <ltt/type.h>
 #include <ltt/trace.h>
+#include <ltt/facility.h>
 #include <stdio.h>
 
 static gboolean
@@ -48,7 +50,6 @@ static LttvHooks
   *before_trace,
   *event_hook;
 
-
 void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
 
   LttType *type;
@@ -62,11 +63,11 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
   type = ltt_field_type(f);
   switch(ltt_type_class(type)) {
     case LTT_INT:
-      g_string_append_printf(s, " %ld", ltt_event_get_long_int(e,f));
+      g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f));
       break;
 
     case LTT_UINT:
-      g_string_append_printf(s, " %lu", ltt_event_get_long_unsigned(e,f));
+      g_string_append_printf(s, " %llu", ltt_event_get_long_unsigned(e,f));
       break;
 
     case LTT_FLOAT:
@@ -107,11 +108,26 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
       }
       g_string_append_printf(s, " }");
       break;
+
+    case LTT_UNION:
+      g_string_append_printf(s, " {");
+      nb = ltt_type_member_number(type);
+      for(i = 0 ; i < nb ; i++) {
+        element = ltt_field_member(f,i);
+        if(field_names) {
+          ltt_type_member_type(type, i, &name);
+          g_string_append_printf(s, " %s = ", name);
+        }
+        print_field(e, element, s, field_names);
+      }
+      g_string_append_printf(s, " }");
+      break;
+
   }
 }
 
 
-void lttv_event_to_string(LttEvent *e, LttTracefile *tf, GString *s,
+void lttv_event_to_string(LttEvent *e, GString *s,
     gboolean mandatory_fields, gboolean field_names, LttvTracefileState *tfs)
 { 
   LttFacility *facility;
@@ -185,7 +201,7 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
         fprintf(fp, "%f\n", *value.v_double);
         break;
       case LTTV_TIME:
-        fprintf(fp, "%10u.%09u\n", value.v_time->tv_sec, 
+        fprintf(fp, "%10lu.%09lu\n", value.v_time->tv_sec, 
             value.v_time->tv_nsec);
         break;
       case LTTV_POINTER:
@@ -236,9 +252,11 @@ print_stats(FILE *fp, LttvTracesetStats *tscs)
   for(i = 0 ; i < nb ; i++) {
     tcs = (LttvTraceStats *)(LTTV_TRACESET_CONTEXT(tscs)->traces[i]);
     desc = ltt_trace_system_description(tcs->parent.parent.t);
-    fprintf(fp, "Trace on system %s at time %d secs:\n", 
+    LttTime start_time = ltt_trace_system_description_trace_start_time(desc);
+    fprintf(fp, "Trace on system %s at time %lu.%09lu :\n", 
 	    ltt_trace_system_description_node_name(desc), 
-	    (ltt_trace_system_description_trace_start_time(desc)).tv_sec);
+	    start_time.tv_sec,
+      start_time.tv_nsec);
     saved_length = indent->len;
     g_string_append(indent, "  ");
     print_tree(fp, indent, tcs->stats);
@@ -317,7 +335,12 @@ static int write_event_content(void *hook_data, void *call_data)
 
   e = tfc->e;
 
-  lttv_event_to_string(e, tfc->tf, a_string, TRUE, a_field_names, tfs);
+  /*
+   * call to the filter if available
+   */
+  //  lttv_filter_tree_parse(f->head,e,NULL,NULL,NULL);
+  
+  lttv_event_to_string(e, a_string, TRUE, a_field_names, tfs);
   g_string_append_printf(a_string,"\n");  
 
   if(a_state) {
@@ -422,8 +445,5 @@ static void destroy()
 
 LTTV_MODULE("textDump", "Print events in a file", \
 	    "Produce a detailed text printout of a trace", \
-	    init, destroy, "stats", "batchAnalysis")
-
-
-
+	    init, destroy, "stats", "batchAnalysis", "option")