X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FbatchAnalysis.c;h=9cd292741bc907c4472853ac019fe0967d480dcc;hb=8e680509351245867a89f5647c7b926af7652f17;hp=a57f0aac5211f7ed4f26d3a524af9cc837c0848c;hpb=1da1525dc4a987ee97bd025f96d2ee75804d2012;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
index a57f0aac..9cd29274 100644
--- a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
+++ b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
@@ -19,6 +19,9 @@
 /* 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 <lttv/lttv.h>
 #include <lttv/attribute.h>
@@ -47,10 +50,6 @@ static char *a_trace;
 
 static gboolean a_stats;
 
-static lttv_filter *a_lttv_filter;
-
-extern GString *a_filter_string;
-
 void lttv_trace_option(void *hook_data)
 { 
   LttTrace *trace;
@@ -63,6 +62,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;
@@ -80,7 +83,16 @@ 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);
 
-  a_lttv_filter = lttv_filter_new(a_filter_string,(LttvTraceState*)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,
@@ -105,7 +117,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,
@@ -117,7 +128,9 @@ static gboolean process_traceset(void *hook_data, void *call_data)
                             event_hook,
                             NULL);
 
-  lttv_filter_destroy(a_lttv_filter);
+  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);
@@ -194,7 +207,6 @@ static void init()
   lttv_hooks_add(main_hooks, process_traceset, NULL, LTTV_PRIO_DEFAULT);
 }
 
-
 static void destroy()
 {
   guint i, nb;
@@ -228,7 +240,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","filter")
+    init, destroy, "state", "stats", "option","textFilter")