Documentation:

[lttv.git] / ltt / branches / poly / lttv / modules / text / batchAnalysis.c

diff --git a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
index ec68e7f1490b2deae76980673f29903c6224efd3..bae1abcb5ec36fc9d80d89b7a93bd21c28899f4b 100644 (file)
--- a/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
+++ b/ltt/branches/poly/lttv/modules/text/batchAnalysis.c
@@ -47,9 +47,7 @@ static char *a_trace;
 
 static gboolean a_stats;
 
-static LttvFilter *a_lttv_filter;
-
-extern GString *a_filter_string;
+LttvFilter *a_lttv_filter;
 
 void lttv_trace_option(void *hook_data)
 { 
@@ -63,6 +61,10 @@ void lttv_trace_option(void *hook_data)
 
 static gboolean process_traceset(void *hook_data, void *call_data)
 {
+  LttvAttributeValue value;
+
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+
   LttvTracesetStats *tscs;
 
   LttvTracesetContext *tc;
@@ -80,7 +82,13 @@ 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));
+
+  a_lttv_filter = lttv_filter_new();
+  g_debug("Filter string: %s",((GString*)*(value.v_pointer))->str);
+  
+  g_assert(lttv_filter_append_expression(a_lttv_filter,((GString*)*(value.v_pointer))->str));
   
   //lttv_traceset_context_add_hooks(tc,
   //before_traceset, after_traceset, NULL, before_trace, after_trace,
@@ -231,4 +239,4 @@ static void destroy()
 
 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")