X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=14ea876f91ff0ad7b38e3cbc0bf9d53f3166421b;hb=d730b5c8b76588740d11bd12c6e85ed26bebdb4e;hp=5c4cd4261846b9029bedc3654acf657ba65bbfa2;hpb=ba6f11f1da1c46e16008a60c6a05e36943f8721d;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c index 5c4cd426..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,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -49,38 +54,47 @@ static LttvHooks *before_trace, *event_hook; - void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { LttType *type; 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: @@ -102,7 +116,7 @@ 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); } @@ -116,7 +130,7 @@ 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); } @@ -140,6 +154,10 @@ void lttv_event_to_string(LttEvent *e, 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); @@ -149,13 +167,14 @@ void lttv_event_to_string(LttEvent *e, 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) @@ -251,12 +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); 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); @@ -314,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; + + 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);