X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2FtextDump.c;h=c11db5d9965bfc54eef4423c2aa63cea059553ee;hb=6db3427f29cace9a1addac5a6277bbc1ce666002;hp=004384a8885321563bed9153a25e540f03618bae;hpb=922581a4a91dcb870a6168112a6198a1afacf0bb;p=lttv.git

diff --git a/lttv/modules/text/textDump.c b/lttv/modules/text/textDump.c
index 004384a8..c11db5d9 100644
--- a/lttv/modules/text/textDump.c
+++ b/lttv/modules/text/textDump.c
@@ -31,8 +31,11 @@
 #include <lttv/hook.h>
 #include <lttv/attribute.h>
 #include <lttv/iattribute.h>
+#ifdef BABEL_CLEANUP
 #include <lttv/stats.h>
 #include <lttv/filter.h>
+#endif
+// #include <lttv/traceset.h>
 #include <lttv/print.h>
 #include <ltt/ltt.h>
 #include <ltt/event.h>
@@ -40,7 +43,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include <babeltrace/ctf/events.h>
+#include <lttv/event.h>
 
 static gboolean
   a_noevent,
@@ -197,7 +200,7 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
     }
   }
 }
-
+#ifdef BABEL_CLEANUP
 static void
 print_stats(FILE *fp, LttvTracesetStats *tscs)
 {
@@ -244,7 +247,7 @@ print_stats(FILE *fp, LttvTracesetStats *tscs)
   }
   g_string_free(indent, TRUE);
 }
-
+#endif
 /* Insert the hooks before and after each trace and tracefile, and for each
    event. Print a global header. */
 
@@ -254,7 +257,7 @@ static GString *a_string;
 
 static gboolean write_traceset_header(void *hook_data, void *call_data)
 {
-  LttvTracesetContext *tc = (LttvTracesetContext *)call_data;
+  LttvTraceset *traceset = (LttvTraceset *)call_data;
 
   g_info("TextDump traceset header");
 
@@ -265,7 +268,7 @@ static gboolean write_traceset_header(void *hook_data, void *call_data)
 
   /* Print the trace set header */
   fprintf(a_file,"Trace set contains %d traces\n\n", 
-      lttv_traceset_number(tc->ts));
+      lttv_traceset_number(traceset));
 
   return FALSE;
 }
@@ -273,17 +276,17 @@ static gboolean write_traceset_header(void *hook_data, void *call_data)
 
 static gboolean write_traceset_footer(void *hook_data, void *call_data)
 {
-  LttvTracesetContext *tc = (LttvTracesetContext *)call_data;
+  LttvTraceset *traceset = (LttvTraceset *)call_data;
 
   g_info("TextDump traceset footer");
 
   fprintf(a_file,"End trace set\n\n");
-
+#ifdef BABEL_CLEANUP
   if(LTTV_IS_TRACESET_STATS(tc)) {
     lttv_stats_sum_traceset((LttvTracesetStats *)tc, ltt_time_infinite);
     print_stats(a_file, (LttvTracesetStats *)tc);
   }
-
+#endif
   if(a_file_name != NULL) fclose(a_file);
 
   return FALSE;
@@ -304,14 +307,13 @@ static gboolean write_trace_header(void *hook_data, void *call_data)
   return FALSE;
 }
 
-
 static int write_event_content(void *hook_data, void *call_data)
 {
   gboolean result;
 
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
   
-  struct bt_ctf_event *event = (struct bt_ctf_event *)call_data;
+  LttvEvent *event = (LttvEvent *)call_data;
 #ifdef BABEL_CLEANUP  
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
@@ -348,10 +350,10 @@ static int write_event_content(void *hook_data, void *call_data)
 #ifdef BABEL_CLEANUP
   lttv_event_to_string(e, a_string, TRUE, !a_no_field_names, tfs);
 #endif
-  g_string_set_size(a_string,0);
-  g_string_append_printf(a_string, " %s %llu", 
-			 bt_ctf_event_name(event),
-			 bt_ctf_get_timestamp_raw(event));
+
+  /* TODO 2012-03-12 Add state info */
+  lttv_event_to_string(event, a_string, !a_no_field_names, TRUE);
+
 #ifdef BABEL_CLEANUP
   if(a_state) {
     g_string_append_printf(a_string, " %s ",
@@ -484,5 +486,5 @@ static void destroy()
 
 LTTV_MODULE("textDump", "Print events in a file", \
 	    "Produce a detailed text printout of a trace", \
-	    init, destroy, "stats", "batchAnalysis", "option", "print")
+	    init, destroy, "batchAnalysis", "option", "print")