X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=dbb8ec0fbcf1d09c7e21f38b4cd2d4c4631199c6;hb=6da3640c5dfff6319edcb000391cb2fdfa5abe56;hp=9502aa0d696da0f8d49dc2dfadcd0158160d25b1;hpb=46c40a931ca7e93b2b5f8665039e95217f987d47;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c index 9502aa0d..dbb8ec0f 100644 --- a/ltt/branches/poly/lttv/modules/text/textDump.c +++ b/ltt/branches/poly/lttv/modules/text/textDump.c @@ -1,5 +1,6 @@ /* This file is part of the Linux Trace Toolkit viewer * Copyright (C) 2003-2004 Michel Dagenais + * 2005 Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -20,6 +21,10 @@ before each trace, to print each event, and to print statistics after each trace. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -28,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -50,120 +56,6 @@ static LttvHooks *before_trace, *event_hook; -extern LttvFilter *a_lttv_filter; - -void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { - - LttType *type; - - LttField *element; - - char *name; - - int nb, i; - - type = ltt_field_type(f); - switch(ltt_type_class(type)) { - case LTT_INT: - g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f)); - break; - - case LTT_UINT: - 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_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)); - break; - - case LTT_ARRAY: - case LTT_SEQUENCE: - g_string_append_printf(s, " {"); - nb = ltt_event_field_element_number(e,f); - element = ltt_field_element(f); - for(i = 0 ; i < nb ; i++) { - ltt_event_field_element_select(e,f,i); - print_field(e, element, s, field_names); - } - g_string_append_printf(s, " }"); - break; - - case LTT_STRUCT: - 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; - - 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, GString *s, - gboolean mandatory_fields, gboolean field_names, LttvTracefileState *tfs) -{ - LttFacility *facility; - - LttEventType *event_type; - - LttType *type; - - LttField *field; - - LttTime time; - - g_string_set_size(s,0); - - facility = ltt_event_facility(e); - event_type = ltt_event_eventtype(e); - field = ltt_event_field(e); - - 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)); - /* 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)); - } - - if(field) - print_field(e, field, s, field_names); -} - static void print_tree(FILE *fp, GString *indent, LttvAttribute *tree) @@ -253,12 +145,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); 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), start_time.tv_sec, start_time.tv_nsec); +#endif //FIXME saved_length = indent->len; g_string_append(indent, " "); print_tree(fp, indent, tcs->stats); @@ -316,40 +210,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; + + 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(!lttv_filter_tree_parse(a_lttv_filter->head,e,tfc->t_context->t,tfc->tf,tfs->process,tfc)) { + if(filter->head != NULL) + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,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); @@ -420,7 +330,6 @@ static void init() LTTV_PRIO_DEFAULT); } - static void destroy() { g_info("Destroy textDump"); @@ -449,5 +358,5 @@ static void destroy() LTTV_MODULE("textDump", "Print events in a file", \ "Produce a detailed text printout of a trace", \ - init, destroy, "stats", "batchAnalysis", "option") + init, destroy, "stats", "batchAnalysis", "option", "print")