{ "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL },
{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
{ "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
- { "names", 'n', POPT_ARG_NONE, NULL, OPT_NAMES, NULL, NULL },
+ { "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
fprintf(fp, " -h, --help This help message\n");
fprintf(fp, " -l, --list List available formats\n");
fprintf(fp, " -v, --verbose Verbose mode\n");
- fprintf(fp, " (or set BABELTRACE_VERBOSE env. var.)\n");
+ fprintf(fp, " (or set BABELTRACE_VERBOSE environment variable)\n");
fprintf(fp, " -d, --debug Debug mode\n");
- fprintf(fp, " (or set BABELTRACE_DEBUG env. var.)\n");
- fprintf(fp, " -n, --names Print field names\n");
+ fprintf(fp, " (or set BABELTRACE_DEBUG environment variable)\n");
+ fprintf(fp, " -n, --names name1<,name2,...> Print field names.\n");
+ fprintf(fp, " Available field names:\n");
+ fprintf(fp, " payload OR args OR arg\n");
+ fprintf(fp, " all, scope, header, context OR ctx\n");
+ fprintf(fp, " (payload active by default)\n");
list_formats(fp);
fprintf(fp, "\n");
}
+static int get_names_args(poptContext *pc)
+{
+ char *str, *strlist, *strctx;
+
+ opt_payload_field_names = 0;
+ strlist = (char *) poptGetOptArg(*pc);
+ if (!strlist) {
+ return -EINVAL;
+ }
+ str = strtok_r(strlist, ",", &strctx);
+ do {
+ if (!strcmp(str, "all"))
+ opt_all_field_names = 1;
+ else if (!strcmp(str, "scope"))
+ opt_scope_field_names = 1;
+ else if (!strcmp(str, "context") || !strcmp(str, "ctx"))
+ opt_context_field_names = 1;
+ else if (!strcmp(str, "header"))
+ opt_header_field_names = 1;
+ else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
+ opt_payload_field_names = 1;
+ else {
+ fprintf(stdout, "[error] unknown field name type %s\n", str);
+ return -EINVAL;
+ }
+ } while ((str = strtok_r(NULL, ",", &strctx)));
+ return 0;
+}
+
/*
* Return 0 if caller should continue, < 0 if caller should return
* error, > 0 if caller should exit without reporting error.
pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
+ /* set default */
+ opt_payload_field_names = 1;
+
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
case OPT_VERBOSE:
babeltrace_verbose = 1;
break;
+ case OPT_NAMES:
+ if (get_names_args(&pc)) {
+ ret = -EINVAL;
+ goto end;
+ }
+ break;
case OPT_DEBUG:
babeltrace_debug = 1;
break;
- case OPT_NAMES:
- opt_field_names = 1;
- break;
default:
ret = -EINVAL;
goto end;
goto end;
}
opt_output_path = poptGetArg(pc);
+
end:
if (pc) {
poptFreeContext(pc);
#include <unistd.h>
#include <stdlib.h>
-int opt_field_names;
+int opt_all_field_names,
+ opt_scope_field_names,
+ opt_header_field_names,
+ opt_context_field_names,
+ opt_payload_field_names;
+
+enum field_item {
+ ITEM_SCOPE,
+ ITEM_HEADER,
+ ITEM_CONTEXT,
+ ITEM_PAYLOAD,
+};
struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
return 1;
}
+static
+void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item)
+{
+ switch (item) {
+ case ITEM_SCOPE:
+ if (opt_all_field_names || opt_scope_field_names)
+ pos->print_names = 1;
+ else
+ pos->print_names = 0;
+ break;
+ case ITEM_HEADER:
+ if (opt_all_field_names || opt_header_field_names)
+ pos->print_names = 1;
+ else
+ pos->print_names = 0;
+ break;
+ case ITEM_CONTEXT:
+ if (opt_all_field_names || opt_context_field_names)
+ pos->print_names = 1;
+ else
+ pos->print_names = 0;
+ break;
+ case ITEM_PAYLOAD:
+ if (opt_all_field_names || opt_payload_field_names)
+ pos->print_names = 1;
+ else
+ pos->print_names = 0;
+
+ break;
+ default:
+ assert(0);
+ }
+}
+
static
int ctf_text_write_event(struct stream_pos *ppos,
struct ctf_stream *stream)
}
if (stream->has_timestamp) {
+ set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names)
fprintf(pos->fp, "timestamp = ");
else
else
fprintf(pos->fp, " ");
}
+ set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names)
fprintf(pos->fp, "name = ");
fprintf(pos->fp, "%s", g_quark_to_string(event_class->name));
if (stream->stream_packet_context) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
+ set_field_names_print(pos, ITEM_SCOPE);
if (pos->print_names)
fprintf(pos->fp, " stream.packet.context =");
field_nr_saved = pos->field_nr;
pos->field_nr = 0;
+ set_field_names_print(pos, ITEM_CONTEXT);
ret = generic_rw(ppos, &stream->stream_packet_context->p);
if (ret)
goto error;
if (babeltrace_verbose && stream->stream_event_header) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
+ set_field_names_print(pos, ITEM_SCOPE);
if (pos->print_names)
fprintf(pos->fp, " stream.event.header =");
field_nr_saved = pos->field_nr;
pos->field_nr = 0;
+ set_field_names_print(pos, ITEM_CONTEXT);
ret = generic_rw(ppos, &stream->stream_event_header->p);
if (ret)
goto error;
if (stream->stream_event_context) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
+ set_field_names_print(pos, ITEM_SCOPE);
if (pos->print_names)
fprintf(pos->fp, " stream.event.context =");
field_nr_saved = pos->field_nr;
pos->field_nr = 0;
+ set_field_names_print(pos, ITEM_CONTEXT);
ret = generic_rw(ppos, &stream->stream_event_context->p);
if (ret)
goto error;
if (event->event_context) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
+ set_field_names_print(pos, ITEM_SCOPE);
if (pos->print_names)
fprintf(pos->fp, " event.context =");
field_nr_saved = pos->field_nr;
pos->field_nr = 0;
+ set_field_names_print(pos, ITEM_CONTEXT);
ret = generic_rw(ppos, &event->event_context->p);
if (ret)
goto error;
if (event->event_fields) {
if (pos->field_nr++ != 0)
fprintf(pos->fp, ",");
+ set_field_names_print(pos, ITEM_SCOPE);
if (pos->print_names)
fprintf(pos->fp, " event.fields =");
field_nr_saved = pos->field_nr;
pos->field_nr = 0;
+ set_field_names_print(pos, ITEM_PAYLOAD);
ret = generic_rw(ppos, &event->event_fields->p);
if (ret)
goto error;
pos->fp = fp;
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_text_write_event;
- pos->print_names = opt_field_names;
+ pos->print_names = 0;
break;
case O_RDONLY:
default: