From c3815874ce57c8b9dbceda4e5b7db5fdf869559c Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 26 Aug 2012 21:15:32 -0400 Subject: [PATCH] Change default printout to add host, process names and vpid Showing the hostname:procname:vpid is a very useful default behavior. Signed-off-by: Mathieu Desnoyers Acked-by: David Goulet Acked-by: Julien Desfossez --- converter/babeltrace.c | 6 ++++-- formats/ctf-text/ctf-text.c | 12 ++++++++---- include/babeltrace/babeltrace-internal.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index a6020737..b8caa6a0 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -135,6 +135,7 @@ static void usage(FILE *fp) fprintf(fp, " -f, --fields name1<,name2,...> Print additional fields:\n"); fprintf(fp, " all, trace, trace:hostname, trace:domain,\n"); fprintf(fp, " trace:procname, trace:vpid, loglevel.\n"); + fprintf(fp, " (default: trace:hostname,trace:procname,trace:vpid)\n"); fprintf(fp, " --clock-cycles Timestamp in cycles\n"); fprintf(fp, " --clock-offset seconds Clock offset in seconds\n"); fprintf(fp, " --clock-seconds Print the timestamps as [sec.ns]\n"); @@ -193,18 +194,19 @@ static int get_fields_args(poptContext *pc) } str = strtok_r(strlist, ",", &strctx); do { + opt_trace_default_fields = 0; if (!strcmp(str, "all")) opt_all_fields = 1; else if (!strcmp(str, "trace")) opt_trace_field = 1; + else if (!strcmp(str, "trace:hostname")) + opt_trace_hostname_field = 1; else if (!strcmp(str, "trace:domain")) opt_trace_domain_field = 1; else if (!strcmp(str, "trace:procname")) opt_trace_procname_field = 1; else if (!strcmp(str, "trace:vpid")) opt_trace_vpid_field = 1; - else if (!strcmp(str, "trace:hostname")) - opt_trace_hostname_field = 1; else if (!strcmp(str, "loglevel")) opt_loglevel_field = 1; else { diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index d209eca2..7211c97f 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -47,6 +47,7 @@ int opt_all_field_names, opt_trace_procname_field, opt_trace_vpid_field, opt_trace_hostname_field, + opt_trace_default_fields = 1, opt_loglevel_field, opt_delta_field = 1; @@ -323,7 +324,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * else fprintf(pos->fp, " "); } - if ((opt_trace_hostname_field && !opt_all_fields) && stream_class->trace->env.hostname[0] != '\0') { + if ((opt_trace_hostname_field || opt_all_fields || opt_trace_default_fields) + && stream_class->trace->env.hostname[0] != '\0') { set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) { fprintf(pos->fp, "trace:hostname = "); @@ -333,7 +335,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * fprintf(pos->fp, ", "); dom_print = 1; } - if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') { + if ((opt_trace_domain_field || opt_all_fields) && stream_class->trace->env.domain[0] != '\0') { set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) { fprintf(pos->fp, "trace:domain = "); @@ -343,7 +345,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * fprintf(pos->fp, ", "); dom_print = 1; } - if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') { + if ((opt_trace_procname_field || opt_all_fields || opt_trace_default_fields) + && stream_class->trace->env.procname[0] != '\0') { set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) { fprintf(pos->fp, "trace:procname = "); @@ -355,7 +358,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * fprintf(pos->fp, ", "); dom_print = 1; } - if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) { + if ((opt_trace_vpid_field || opt_all_fields || opt_trace_default_fields) + && stream_class->trace->env.vpid != -1) { set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) { fprintf(pos->fp, "trace:vpid = "); diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h index 92e2f512..9f14177d 100644 --- a/include/babeltrace/babeltrace-internal.h +++ b/include/babeltrace/babeltrace-internal.h @@ -60,6 +60,7 @@ extern int opt_all_field_names, opt_trace_procname_field, opt_trace_vpid_field, opt_trace_hostname_field, + opt_trace_default_fields, opt_loglevel_field, opt_delta_field, opt_clock_cycles, -- 2.34.1