#include <lttv/attribute.h>
#include <lttv/iattribute.h>
#include <lttv/stats.h>
+#include <lttv/filter.h>
#include <ltt/ltt.h>
#include <ltt/event.h>
#include <ltt/type.h>
#include <ltt/trace.h>
+#include <ltt/facility.h>
#include <stdio.h>
static gboolean
*before_traceset,
*after_traceset,
*before_trace,
- *before_event;
+ *event_hook;
+extern LttvFilter *a_lttv_filter;
void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) {
type = ltt_field_type(f);
switch(ltt_type_class(type)) {
case LTT_INT:
- g_string_append_printf(s, " %ld", ltt_event_get_long_int(e,f));
+ g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f));
break;
case LTT_UINT:
- g_string_append_printf(s, " %lu", ltt_event_get_long_unsigned(e,f));
+ g_string_append_printf(s, " %llu", ltt_event_get_long_unsigned(e,f));
break;
case LTT_FLOAT:
}
g_string_append_printf(s, " }");
break;
+
+ case LTT_UNION:
+ g_string_append_printf(s, " {");
+ nb = ltt_type_member_number(type);
+ for(i = 0 ; i < nb ; i++) {
+ element = ltt_field_member(f,i);
+ if(field_names) {
+ ltt_type_member_type(type, i, &name);
+ g_string_append_printf(s, " %s = ", name);
+ }
+ print_field(e, element, s, field_names);
+ }
+ g_string_append_printf(s, " }");
+ break;
+
}
}
-void lttv_event_to_string(LttEvent *e, LttTracefile *tf, GString *s,
+void lttv_event_to_string(LttEvent *e, GString *s,
gboolean mandatory_fields, gboolean field_names, LttvTracefileState *tfs)
{
LttFacility *facility;
fprintf(fp, "%f\n", *value.v_double);
break;
case LTTV_TIME:
- fprintf(fp, "%10u.%09u\n", value.v_time->tv_sec,
+ fprintf(fp, "%10lu.%09lu\n", value.v_time->tv_sec,
value.v_time->tv_nsec);
break;
case LTTV_POINTER:
for(i = 0 ; i < nb ; i++) {
tcs = (LttvTraceStats *)(LTTV_TRACESET_CONTEXT(tscs)->traces[i]);
desc = ltt_trace_system_description(tcs->parent.parent.t);
- fprintf(fp, "Trace on system %s at time %d secs:\n",
+ LttTime start_time = ltt_trace_system_description_trace_start_time(desc);
+ fprintf(fp, "Trace on system %s at time %lu.%09lu :\n",
ltt_trace_system_description_node_name(desc),
- (ltt_trace_system_description_trace_start_time(desc)).tv_sec);
+ start_time.tv_sec,
+ start_time.tv_nsec);
saved_length = indent->len;
g_string_append(indent, " ");
print_tree(fp, indent, tcs->stats);
fprintf(a_file,"End trace set\n\n");
if(LTTV_IS_TRACESET_STATS(tc)) {
+ lttv_stats_sum_traceset((LttvTracesetStats *)tc);
print_stats(a_file, (LttvTracesetStats *)tc);
}
e = tfc->e;
- lttv_event_to_string(e, tfc->tf, a_string, TRUE, a_field_names, tfs);
+ /*
+ * call to the filter if available
+ */
+ lttv_filter_tree_parse(a_lttv_filter->head,e,NULL,NULL,NULL);
+
+ lttv_event_to_string(e, a_string, TRUE, a_field_names, tfs);
g_string_append_printf(a_string,"\n");
if(a_state) {
"",
LTTV_OPT_NONE, &a_process_stats, NULL, NULL);
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before",
+ g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event",
LTTV_POINTER, &value));
- g_assert((before_event = *(value.v_pointer)) != NULL);
- lttv_hooks_add(before_event, write_event_content, NULL);
+ g_assert((event_hook = *(value.v_pointer)) != NULL);
+ lttv_hooks_add(event_hook, write_event_content, NULL, LTTV_PRIO_DEFAULT);
g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
LTTV_POINTER, &value));
g_assert((before_trace = *(value.v_pointer)) != NULL);
- lttv_hooks_add(before_trace, write_trace_header, NULL);
+ lttv_hooks_add(before_trace, write_trace_header, NULL, LTTV_PRIO_DEFAULT);
g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
LTTV_POINTER, &value));
g_assert((before_traceset = *(value.v_pointer)) != NULL);
- lttv_hooks_add(before_traceset, write_traceset_header, NULL);
+ lttv_hooks_add(before_traceset, write_traceset_header, NULL,
+ LTTV_PRIO_DEFAULT);
g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
LTTV_POINTER, &value));
g_assert((after_traceset = *(value.v_pointer)) != NULL);
- lttv_hooks_add(after_traceset, write_traceset_footer, NULL);
+ lttv_hooks_add(after_traceset, write_traceset_footer, NULL,
+ LTTV_PRIO_DEFAULT);
}
g_string_free(a_string, TRUE);
- lttv_hooks_remove_data(before_event, write_event_content, NULL);
+ lttv_hooks_remove_data(event_hook, write_event_content, NULL);
lttv_hooks_remove_data(before_trace, write_trace_header, NULL);
LTTV_MODULE("textDump", "Print events in a file", \
"Produce a detailed text printout of a trace", \
- init, destroy, "stats", "batchAnalysis")
-
-
-
+ init, destroy, "stats", "batchAnalysis", "option")