#include <ltt/trace.h>
#include <ltt/facility.h>
#include <stdio.h>
-
+#include <ctype.h>
void lttv_print_field(LttEvent *e, LttField *f, GString *s,
- gboolean field_names) {
+ gboolean field_names, guint element_index) {
LttType *type;
- LttField *element;
-
GQuark name;
int nb, i;
case LTT_LONG:
case LTT_SSIZE_T:
case LTT_INT_FIXED:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "%lld", ltt_event_get_long_int(e,f));
break;
case LTT_SIZE_T:
case LTT_OFF_T:
case LTT_UINT_FIXED:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "%llu", ltt_event_get_long_unsigned(e,f));
break;
case LTT_CHAR:
- g_string_append_printf(s, "%c", ltt_event_get_int(e,f));
- break;
case LTT_UCHAR:
- g_string_append_printf(s, "%c", ltt_event_get_unsigned(e,f));
+ {
+ unsigned car = ltt_event_get_unsigned(e,f);
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
+ if(isprint(car)) {
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
+ g_string_append_printf(s, "%c", car);
+ } else {
+ g_string_append_printf(s, "\\%x", car);
+ }
+ }
break;
case LTT_FLOAT:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "%g", ltt_event_get_double(e,f));
break;
case LTT_POINTER:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "0x%llx", ltt_event_get_long_unsigned(e,f));
break;
case LTT_STRING:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "\"%s\"", ltt_event_get_string(e,f));
break;
{
GQuark value = ltt_enum_string_get(type, ltt_event_get_unsigned(e,f));
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
if(value)
g_string_append_printf(s, "%s", g_quark_to_string(value));
else
case LTT_ARRAY:
case LTT_SEQUENCE:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
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);
- lttv_print_field(e, element, s, field_names);
- if(i != nb-1) g_string_append_printf(s, ", ");
+ LttField *child = ltt_event_field_element_select(e,f,i);
+ lttv_print_field(e, child, s, field_names, i);
}
g_string_append_printf(s, " }");
break;
case LTT_STRUCT:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "{ ");
nb = ltt_type_member_number(type);
for(i = 0 ; i < nb ; i++) {
+ LttField *element;
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));
- }
- lttv_print_field(e, element, s, field_names);
- if(i != nb-1) g_string_append_printf(s, ", ");
+ lttv_print_field(e, element, s, field_names, i);
}
g_string_append_printf(s, " }");
break;
case LTT_UNION:
+ if(element_index > 0)
+ g_string_append_printf(s, ", ");
+ if(field_names) {
+ name = ltt_field_name(f);
+ if(name)
+ g_string_append_printf(s, "%s = ", g_quark_to_string(name));
+ }
g_string_append_printf(s, "{ ");
nb = ltt_type_member_number(type);
for(i = 0 ; i < nb ; i++) {
+ LttField *element;
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));
- }
- lttv_print_field(e, element, s, field_names);
- if(i != nb-1) g_string_append_printf(s, ", ");
+ lttv_print_field(e, element, s, field_names, i);
}
g_string_append_printf(s, " }");
break;
-
+ case LTT_NONE:
+ break;
}
}
LttTime time;
- guint cpu = ltt_tracefile_num(tfs->parent.tf);
+ guint cpu = tfs->cpu;
LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
LttvProcessState *process = ts->running_process[cpu];
+ GQuark name;
+
+ guint i, num_fields;
+
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_quark_to_string(ltt_tracefile_name(tfs->parent.tf)),
cpu);
/* Print the process id and the state/interrupt type of the process */
- g_string_append_printf(s,", %u, %u, %s", process->pid,
- process->ppid,
- g_quark_to_string(process->state->t));
+ g_string_append_printf(s,", %u, %s, %u, 0x%llX, %s", process->pid,
+ g_quark_to_string(process->name),
+ process->ppid, process->current_function,
+ g_quark_to_string(process->state->t));
}
-
- if(field)
- lttv_print_field(e, field, s, field_names);
+ event_type = ltt_event_eventtype(e);
+
+ num_fields = ltt_eventtype_num_fields(event_type);
+ if(num_fields == 0) return;
+ g_string_append_printf(s, " ");
+ g_string_append_printf(s, "{ ");
+ for(i=0; i<num_fields; i++) {
+ field = ltt_eventtype_field(event_type, i);
+ lttv_print_field(e, field, s, field_names, i);
+ }
+ g_string_append_printf(s, " }");
}
static void init()
}
LTTV_MODULE("print", "Print events", \
- "Produce a detailed text printout of events", \
- init, destroy)
+ "Produce a detailed text printout of events", \
+ init, destroy)
projects / lttv.git / blobdiff