X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=1335afc4c78a19b29d7992dece0fb4a41df75fd4;hb=9eb6aa7a42ed8d7e5b6d095bd3c31886ab5ebd33;hp=fea42ef0800b49cbac826eeed1215099e9ada94f;hpb=cec3d7b0a4303198eb608ecccd44454d56ab7b04;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c
index fea42ef0..1335afc4 100644
--- a/ltt/branches/poly/lttv/modules/text/textDump.c
+++ b/ltt/branches/poly/lttv/modules/text/textDump.c
@@ -20,6 +20,10 @@
    before each trace, to print each event, and to print statistics
    after each trace. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <lttv/lttv.h>
 #include <lttv/option.h>
 #include <lttv/module.h>
@@ -56,17 +60,22 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
 
   LttField *element;
 
-  char *name;
+  GQuark name;
 
   int nb, i;
 
   type = ltt_field_type(f);
   switch(ltt_type_class(type)) {
     case LTT_INT:
+    case LTT_LONG:
+    case LTT_SSIZE_T:
       g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f));
       break;
 
     case LTT_UINT:
+    case LTT_ULONG:
+    case LTT_SIZE_T:
+    case LTT_OFF_T:
       g_string_append_printf(s, " %llu", ltt_event_get_long_unsigned(e,f));
       break;
 
@@ -74,6 +83,10 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
       g_string_append_printf(s, " %g", ltt_event_get_double(e,f));
       break;
 
+    case LTT_POINTER:
+      g_string_append_printf(s, " 0x%llx", ltt_event_get_long_unsigned(e,f));
+      break;
+
     case LTT_STRING:
       g_string_append_printf(s, " \"%s\"", ltt_event_get_string(e,f));
       break;
@@ -102,7 +115,7 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
         element = ltt_field_member(f,i);
         if(field_names) {
           ltt_type_member_type(type, i, &name);
-          g_string_append_printf(s, " %s = ", name);
+          g_string_append_printf(s, " %s = ", g_quark_to_string(name));
         }
         print_field(e, element, s, field_names);
       }
@@ -116,7 +129,7 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
         element = ltt_field_member(f,i);
         if(field_names) {
           ltt_type_member_type(type, i, &name);
-          g_string_append_printf(s, " %s = ", name);
+          g_string_append_printf(s, " %s = ", g_quark_to_string(name));
         }
         print_field(e, element, s, field_names);
       }
@@ -149,8 +162,9 @@ void lttv_event_to_string(LttEvent *e, GString *s,
   if(mandatory_fields) {
     time = ltt_event_time(e);
     g_string_append_printf(s,"%s.%s: %ld.%09ld (%s)",
-        ltt_facility_name(facility),
-        ltt_eventtype_name(event_type), (long)time.tv_sec, time.tv_nsec,
+        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(tfs->cpu_name));
     /* Print the process id and the state/interrupt type of the process */
     g_string_append_printf(s,", %u, %u,  %s", tfs->process->pid,
@@ -251,12 +265,14 @@ print_stats(FILE *fp, LttvTracesetStats *tscs)
 
   for(i = 0 ; i < nb ; i++) {
     tcs = (LttvTraceStats *)(LTTV_TRACESET_CONTEXT(tscs)->traces[i]);
+#if 0 //FIXME
     desc = ltt_trace_system_description(tcs->parent.parent.t);
     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), 
 	    start_time.tv_sec,
       start_time.tv_nsec);
+#endif //FIXME
     saved_length = indent->len;
     g_string_append(indent, "  ");
     print_tree(fp, indent, tcs->stats);
@@ -314,31 +330,45 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data)
 static gboolean write_trace_header(void *hook_data, void *call_data)
 {
   LttvTraceContext *tc = (LttvTraceContext *)call_data;
-
+#if 0 //FIXME
   LttSystemDescription *system = ltt_trace_system_description(tc->t);
 
   fprintf(a_file,"  Trace from %s in %s\n%s\n\n", 
 	  ltt_trace_system_description_node_name(system), 
 	  ltt_trace_system_description_domain_name(system), 
 	  ltt_trace_system_description_description(system));
+#endif //0
   return FALSE;
 }
 
 
 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;
 
-  e = tfc->e;
+  LttvAttributeValue value_filter;
+
+  LttvFilter *filter;
+
+  e = ltt_tracefile_get_event(tfc->tf);
+
+
+  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
    */
-  //  lttv_filter_tree_parse(f->head,e,NULL,NULL,NULL);
+  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");