X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FbatchAnalysis.c;h=80f11d3c361de18af0114c9cf1d54aca5e13031d;hb=d730b5c8b76588740d11bd12c6e85ed26bebdb4e;hp=4482a35ccf565a12a701a42880dca21f5baaec92;hpb=cec3d7b0a4303198eb608ecccd44454d56ab7b04;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
index 4482a35c..80f11d3c 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 LttvFilter *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,8 +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();
-  lttv_filter_append_expression(a_lttv_filter,a_filter_string->str);
+  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,
@@ -106,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,
@@ -118,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);