X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=11afbed4ccf2aecc711f819aa9e2c029d0c6fb46;hb=94fe07f4f00135c1d5fab2e304b620c8be570121;hp=5c4cd4261846b9029bedc3654acf657ba65bbfa2;hpb=ba6f11f1da1c46e16008a60c6a05e36943f8721d;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c
index 5c4cd426..11afbed4 100644
--- a/ltt/branches/poly/lttv/modules/text/textDump.c
+++ b/ltt/branches/poly/lttv/modules/text/textDump.c
@@ -27,6 +27,7 @@
 #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>
@@ -49,7 +50,6 @@ static LttvHooks
   *before_trace,
   *event_hook;
 
-
 void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
 
   LttType *type;
@@ -63,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:
@@ -327,14 +327,32 @@ static gboolean write_trace_header(void *hook_data, void *call_data)
 
 static int write_event_content(void *hook_data, void *call_data)
 {
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+  
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
 
   LttEvent *e;
 
+  LttvAttributeValue value_filter;
+
+  LttvFilter *filter;
+
   e = tfc->e;
 
+
+  g_assert(lttv_iattribute_find_by_path(attributes, "filter/lttv_filter",
+      LTTV_POINTER, &value_filter));
+  filter = (LttvFilter*)*(value_filter.v_pointer);
+
+  /*
+   * call to the filter if available
+   */
+  if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,tfc->t_context->t,tfs->process,tfc)) {
+      return FALSE;
+  }
+  
   lttv_event_to_string(e, a_string, TRUE, a_field_names, tfs);
   g_string_append_printf(a_string,"\n");