/* 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>
static gboolean a_stats;
-static LttvFilter *a_lttv_filter;
-
-extern GString *a_filter_string;
-
void lttv_trace_option(void *hook_data)
{
LttTrace *trace;
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;
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,
event_hook,
NULL);
- lttv_filter_destroy(a_lttv_filter);
+ 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);
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")