X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextDump.c;h=e522595fabd8d87f0ead8e06b03550ded6d8cd19;hb=f82dffaef20dd0a80565842bf20b9de428850035;hp=96773a6c08bbff6d333736a97c3852fc0ee696f7;hpb=0bc23ba9a5357242cf0a72b12a3a3a393d248e94;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textDump.c b/ltt/branches/poly/lttv/modules/text/textDump.c index 96773a6c..e522595f 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 @@ -32,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,128 +56,6 @@ static LttvHooks *before_trace, *event_hook; -void print_field(LttEvent *e, LttField *f, GString *s, gboolean field_names) { - - LttType *type; - - LttField *element; - - GQuark name; - - int nb, i; - - type = ltt_field_type(f); - switch(ltt_type_class(type)) { - case LTT_INT: - case LTT_LONG: - case LTT_SSIZE_T: - g_string_append_printf(s, " %lld", ltt_event_get_long_int(e,f)); - break; - - case LTT_UINT: - 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)); - 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 = ", 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, 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)", - 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(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) @@ -190,10 +70,15 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree) LttvAttributeType type; + gboolean is_named; + nb = lttv_attribute_get_number(tree); for(i = 0 ; i < nb ; i++) { - type = lttv_attribute_get(tree, i, &name, &value); - fprintf(fp, "%s%s: ", indent->str, g_quark_to_string(name)); + type = lttv_attribute_get(tree, i, &name, &value, &is_named); + if(is_named) + fprintf(fp, "%s%s: ", indent->str, g_quark_to_string(name)); + else + fprintf(fp, "%s%lu: ", indent->str, name); switch(type) { case LTTV_INT: @@ -356,8 +241,11 @@ static int write_event_content(void *hook_data, void *call_data) LttvFilter *filter; - e = ltt_tracefile_get_event(tfc->tf); + guint cpu = tfs->cpu; + 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)); @@ -367,7 +255,8 @@ static int write_event_content(void *hook_data, void *call_data) * call to the filter if available */ if(filter->head != NULL) - if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,tfc->t_context->t,tfs->process,tfc)) + 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); @@ -375,7 +264,7 @@ static int write_event_content(void *hook_data, void *call_data) 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); @@ -446,7 +335,6 @@ static void init() LTTV_PRIO_DEFAULT); } - static void destroy() { g_info("Destroy textDump"); @@ -475,5 +363,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")