X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=11afbed4ccf2aecc711f819aa9e2c029d0c6fb46;hb=94fe07f4f00135c1d5fab2e304b620c8be570121;hp=cc400d9299ffb8a5ca748e84a14d7000006bdd49;hpb=f95bc8309fe113855266f4445874248b6a285062;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c index cc400d92..11afbed4 100644 --- a/ltt/branches/poly/lttv/modules/text/textDump.c +++ b/ltt/branches/poly/lttv/modules/text/textDump.c @@ -27,10 +27,12 @@ #include #include #include +#include #include #include #include #include +#include #include static gboolean @@ -46,8 +48,7 @@ static LttvHooks *before_traceset, *after_traceset, *before_trace, - *before_event; - + *event_hook; void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { @@ -62,11 +63,11 @@ 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: @@ -107,11 +108,26 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { } 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; @@ -185,7 +201,7 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree) 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: @@ -236,9 +252,11 @@ print_stats(FILE *fp, LttvTracesetStats *tscs) 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); @@ -309,15 +327,33 @@ static gboolean write_trace_header(void *hook_data, void *call_data) static int write_event_content(void *hook_data, void *call_data) { + LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; LttEvent *e; + LttvAttributeValue value_filter; + + LttvFilter *filter; + e = tfc->e; - lttv_event_to_string(e, tfc->tf, a_string, TRUE, a_field_names, tfs); + + g_assert(lttv_iattribute_find_by_path(attributes, "filter/lttv_filter", + LTTV_POINTER, &value_filter)); + filter = (LttvFilter*)*(value_filter.v_pointer); + + /* + * call to the filter if available + */ + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,tfc->t_context->t,tfs->process,tfc)) { + return FALSE; + } + + lttv_event_to_string(e, a_string, TRUE, a_field_names, tfs); g_string_append_printf(a_string,"\n"); if(a_state) { @@ -370,25 +406,27 @@ static void init() "", 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); } @@ -408,7 +446,7 @@ static void destroy() 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); @@ -420,8 +458,5 @@ static void destroy() 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")