X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=14ea876f91ff0ad7b38e3cbc0bf9d53f3166421b;hb=d448fce24840c50fbd998d06a7daa595859df2ff;hp=c105a07c9bb80a06188a6bfbd9ff81472cadf217;hpb=08b1c66e3a5ad9588d08f9477af98c0cda4f070c;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c index c105a07c..14ea876f 100644 --- a/ltt/branches/poly/lttv/modules/text/textDump.c +++ b/ltt/branches/poly/lttv/modules/text/textDump.c @@ -20,6 +20,10 @@ before each trace, to print each event, and to print statistics after each trace. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -27,10 +31,12 @@ #include #include #include +#include #include #include #include #include +#include #include static gboolean @@ -46,8 +52,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) { @@ -55,31 +60,41 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { LttField *element; - char *name; + GQuark name; int nb, i; 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)); + case LTT_LONG: + case LTT_SSIZE_T: + 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)); + case LTT_ULONG: + case LTT_SIZE_T: + case LTT_OFF_T: + g_string_append_printf(s, " %llu", ltt_event_get_long_unsigned(e,f)); break; case LTT_FLOAT: g_string_append_printf(s, " %g", ltt_event_get_double(e,f)); break; + case LTT_POINTER: + g_string_append_printf(s, " 0x%llx", ltt_event_get_long_unsigned(e,f)); + break; + case LTT_STRING: g_string_append_printf(s, " \"%s\"", ltt_event_get_string(e,f)); break; case LTT_ENUM: - g_string_append_printf(s, " %s", ltt_enum_string_get(type, - ltt_event_get_unsigned(e,f)-1)); + g_string_append_printf(s, " %s", + g_quark_to_string(ltt_enum_string_get(type, + ltt_event_get_unsigned(e,f)-1))); break; case LTT_ARRAY: @@ -101,17 +116,32 @@ void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { element = ltt_field_member(f,i); if(field_names) { ltt_type_member_type(type, i, &name); - g_string_append_printf(s, " %s = ", name); + g_string_append_printf(s, " %s = ", g_quark_to_string(name)); } print_field(e, element, s, 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 = ", g_quark_to_string(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; @@ -124,6 +154,10 @@ void lttv_event_to_string(LttEvent *e, LttTracefile *tf, GString *s, LttTime time; + guint cpu = ltt_tracefile_num(tfs->parent.tf); + LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context; + LttvProcessState *process = ts->running_process[cpu]; + g_string_set_size(s,0); facility = ltt_event_facility(e); @@ -133,13 +167,14 @@ void lttv_event_to_string(LttEvent *e, LttTracefile *tf, GString *s, if(mandatory_fields) { time = ltt_event_time(e); g_string_append_printf(s,"%s.%s: %ld.%09ld (%s)", - ltt_facility_name(facility), - ltt_eventtype_name(event_type), (long)time.tv_sec, time.tv_nsec, - g_quark_to_string(tfs->cpu_name)); + g_quark_to_string(ltt_facility_name(facility)), + g_quark_to_string(ltt_eventtype_name(event_type)), + (long)time.tv_sec, time.tv_nsec, + g_quark_to_string(ltt_tracefile_name(tfs->parent.tf))); /* Print the process id and the state/interrupt type of the process */ - g_string_append_printf(s,", %u, %u, %s", tfs->process->pid, - tfs->process->ppid, - g_quark_to_string(tfs->process->state->t)); + g_string_append_printf(s,", %u, %u, %s", process->pid, + process->ppid, + g_quark_to_string(process->state->t)); } if(field) @@ -185,7 +220,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: @@ -235,10 +270,14 @@ print_stats(FILE *fp, LttvTracesetStats *tscs) for(i = 0 ; i < nb ; i++) { tcs = (LttvTraceStats *)(LTTV_TRACESET_CONTEXT(tscs)->traces[i]); +#if 0 //FIXME 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); +#endif //FIXME saved_length = indent->len; g_string_append(indent, " "); print_tree(fp, indent, tcs->stats); @@ -283,6 +322,7 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data) 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); } @@ -295,33 +335,56 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data) static gboolean write_trace_header(void *hook_data, void *call_data) { LttvTraceContext *tc = (LttvTraceContext *)call_data; - +#if 0 //FIXME LttSystemDescription *system = ltt_trace_system_description(tc->t); fprintf(a_file," Trace from %s in %s\n%s\n\n", ltt_trace_system_description_node_name(system), ltt_trace_system_description_domain_name(system), ltt_trace_system_description_description(system)); +#endif //0 return FALSE; } 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; - e = tfc->e; + LttvAttributeValue value_filter; + + LttvFilter *filter; - lttv_event_to_string(e, tfc->tf, a_string, TRUE, a_field_names, tfs); + guint cpu = ltt_tracefile_num(tfs->parent.tf); + LttvTraceState *ts = (LttvTraceState*)tfc->t_context; + LttvProcessState *process = ts->running_process[cpu]; + + e = ltt_tracefile_get_event(tfc->tf); + + 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(filter->head != NULL) + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,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) { g_string_append_printf(a_string, " %s ", - g_quark_to_string(tfs->process->state->s)); + g_quark_to_string(process->state->s)); } fputs(a_string->str, a_file); @@ -369,25 +432,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); } @@ -407,7 +472,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); @@ -419,8 +484,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")