X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FbatchAnalysis.c;h=12dea8d53bc2c0b1992651ee500f3123372b7cc8;hb=b1794effb12e2cc4c0c67dbf661792b86588f694;hp=c404cdd3f0e919720a96a29a30c93f2aa191169c;hpb=3d974afbca8dcf983dfde91126d3c5df76370401;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
index c404cdd3..12dea8d5 100644
--- a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
+++ b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
@@ -19,7 +19,11 @@
 /* This module inserts a hook in the program main loop. This hook processes 
    all the events in the main tracefile. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
 #include <lttv/hook.h>
@@ -28,6 +32,7 @@
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
 #include <lttv/stats.h>
+#include <lttv/filter.h>
 #include <ltt/trace.h>
 
 static LttvTraceset *traceset;
@@ -58,6 +63,10 @@ void lttv_trace_option(void *hook_data)
 
 static gboolean process_traceset(void *hook_data, void *call_data)
 {
+  LttvAttributeValue value_expression, value_filter;
+
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
   LttvTracesetStats *tscs;
 
   LttvTracesetContext *tc;
@@ -75,6 +84,17 @@ static gboolean process_traceset(void *hook_data, void *call_data)
   lttv_state_add_event_hooks(&tscs->parent);
   if(a_stats) lttv_stats_add_event_hooks(tscs);
 
+  g_assert(lttv_iattribute_find_by_path(attributes, "filter/expression",
+      LTTV_POINTER, &value_expression));
+
+  g_assert(lttv_iattribute_find_by_path(attributes, "filter/lttv_filter",
+      LTTV_POINTER, &value_filter));
+
+  *(value_filter.v_pointer) = lttv_filter_new();
+  //g_debug("Filter string: %s",((GString*)*(value_expression.v_pointer))->str);
+
+  lttv_filter_append_expression(*(value_filter.v_pointer),((GString*)*(value_expression.v_pointer))->str);
+  
   //lttv_traceset_context_add_hooks(tc,
   //before_traceset, after_traceset, NULL, before_trace, after_trace,
   //NULL, before_tracefile, after_tracefile, NULL, before_event, after_event);
@@ -98,7 +118,6 @@ static gboolean process_traceset(void *hook_data, void *call_data)
                                G_MAXULONG,
                                NULL);
 
-  g_info("BatchAnalysis destroy context");
 
   //lttv_traceset_context_remove_hooks(tc,
   //before_traceset, after_traceset, NULL, before_trace, after_trace,
@@ -110,12 +129,16 @@ static gboolean process_traceset(void *hook_data, void *call_data)
                             event_hook,
                             NULL);
 
+  g_info("BatchAnalysis destroy context");
+
+  lttv_filter_destroy(*(value_filter.v_pointer));
   lttv_state_remove_event_hooks(&tscs->parent);
   if(a_stats) lttv_stats_remove_event_hooks(tscs);
   lttv_context_fini(tc);
   g_object_unref(tscs);
 
   g_info("BatchAnalysis end process traceset");
+  return FALSE;
 }
 
 
@@ -185,7 +208,6 @@ static void init()
   lttv_hooks_add(main_hooks, process_traceset, NULL, LTTV_PRIO_DEFAULT);
 }
 
-
 static void destroy()
 {
   guint i, nb;
@@ -219,7 +241,6 @@ static void destroy()
   lttv_traceset_destroy(traceset); 
 }
 
-
 LTTV_MODULE("batchAnalysis", "Batch processing of a trace", \
     "Run through a trace calling all the registered hooks", \
-    init, destroy, "state", "stats", "option")
+    init, destroy, "state", "stats", "option","textFilter")