X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2FtextDump.c;h=46f676ff90351875f3d0a4963bbdc420dac7c1c7;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=ddee070b119e78bcfc40b29610152b483aa22988;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/modules/text/textDump.c b/lttv/modules/text/textDump.c
index ddee070b..46f676ff 100644
--- a/lttv/modules/text/textDump.c
+++ b/lttv/modules/text/textDump.c
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 /* The text dump facility needs to print headers before the trace set and
@@ -31,15 +31,17 @@
 #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>
-#include <ltt/trace.h>
 #include <stdio.h>
 #include <inttypes.h>
 
+#include <lttv/event.h>
+
 static gboolean
   a_noevent,
   a_no_field_names,
@@ -57,7 +59,7 @@ static LttvHooks
   *before_trace,
   *event_hook;
 
-
+#ifdef BABEL_CLEANUP
 static void 
 print_path_tree(FILE *fp, GString *indent, LttvAttribute *tree)
 {
@@ -195,7 +197,8 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
     }
   }
 }
-
+#endif
+#ifdef BABEL_CLEANUP
 static void
 print_stats(FILE *fp, LttvTracesetStats *tscs)
 {
@@ -242,7 +245,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. */
 
@@ -252,7 +255,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");
 
@@ -263,7 +266,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;
 }
@@ -271,17 +274,18 @@ 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;
-
+#ifdef BABEL_CLEAUP
+  LttvTraceset *traceset = (LttvTraceset *)call_data;
+#endif
   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;
@@ -302,13 +306,15 @@ static gboolean write_trace_header(void *hook_data, void *call_data)
   return FALSE;
 }
 
-
 static int write_event_content(void *hook_data, void *call_data)
 {
+#ifdef BABEL_CLEANUP
   gboolean result;
 
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
-  
+#endif   
+  LttvEvent *event = (LttvEvent *)call_data;
+#ifdef BABEL_CLEANUP  
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
@@ -340,17 +346,25 @@ static int write_event_content(void *hook_data, void *call_data)
     if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
                                tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
-  
+#endif  
+#ifdef BABEL_CLEANUP
   lttv_event_to_string(e, a_string, TRUE, !a_no_field_names, tfs);
+#endif
+
+  /* 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 ",
         g_quark_to_string(process->state->s));
   }
+#endif
 
   g_string_append_printf(a_string,"\n");
 
   fputs(a_string->str, a_file);
+
   return FALSE;
 }
 
@@ -472,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")