#define _XOPEN_SOURCE 700
#include <config.h>
-#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/babeltrace.h>
#include <babeltrace/format.h>
+#include <babeltrace/context.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-text/types.h>
+#include <babeltrace/iterator.h>
#include <popt.h>
#include <errno.h>
#include <stdlib.h>
OPT_VERBOSE,
OPT_DEBUG,
OPT_NAMES,
+ OPT_FIELDS,
+ OPT_NO_DELTA,
};
static struct poptOption long_options[] = {
{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
{ "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
{ "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL },
+ { "fields", 'f', POPT_ARG_STRING, NULL, OPT_FIELDS, NULL, NULL },
+ { "no-delta", 0, POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
fprintf(fp, " (or set BABELTRACE_VERBOSE environment variable)\n");
fprintf(fp, " -d, --debug Debug mode\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, " --no-delta Do not print time delta between consecutive events\n");
+ fprintf(fp, " -n, --names name1<,name2,...> Print field names:\n");
fprintf(fp, " (payload OR args OR arg)\n");
fprintf(fp, " all, scope, header, (context OR ctx)\n");
- fprintf(fp, " trace, trace:domain, trace:procname, trace:vpid\n");
fprintf(fp, " (payload active by default)\n");
+ fprintf(fp, " -f, --fields name1<,name2,...> Print additional fields:\n");
+ fprintf(fp, " all, trace, trace:domain, trace:procname,\n");
+ fprintf(fp, " trace:vpid, loglevel.\n");
list_formats(fp);
fprintf(fp, "\n");
}
opt_header_field_names = 1;
else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
opt_payload_field_names = 1;
+ else {
+ fprintf(stderr, "[error] unknown field name type %s\n", str);
+ return -EINVAL;
+ }
+ } while ((str = strtok_r(NULL, ",", &strctx)));
+ return 0;
+}
+
+static int get_fields_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_fields = 1;
else if (!strcmp(str, "trace"))
- opt_trace_name = 1;
+ opt_trace_field = 1;
else if (!strcmp(str, "trace:domain"))
- opt_trace_domain = 1;
+ opt_trace_domain_field = 1;
else if (!strcmp(str, "trace:procname"))
- opt_trace_procname = 1;
+ opt_trace_procname_field = 1;
else if (!strcmp(str, "trace:vpid"))
- opt_trace_vpid = 1;
+ opt_trace_vpid_field = 1;
+ else if (!strcmp(str, "loglevel"))
+ opt_loglevel_field = 1;
else {
- fprintf(stdout, "[error] unknown field name type %s\n", str);
+ fprintf(stderr, "[error] unknown field type %s\n", str);
return -EINVAL;
}
} while ((str = strtok_r(NULL, ",", &strctx)));
goto end;
}
break;
+ case OPT_FIELDS:
+ if (get_fields_args(&pc)) {
+ ret = -EINVAL;
+ goto end;
+ }
+ break;
case OPT_DEBUG:
babeltrace_debug = 1;
break;
+ case OPT_NO_DELTA:
+ opt_delta_field = 0;
+ break;
default:
ret = -EINVAL;
goto end;
g_ptr_array_add(tc->array, td);
}
+int convert_trace(struct trace_descriptor *td_write,
+ struct bt_context *ctx)
+{
+ struct babeltrace_iter *iter;
+ struct ctf_stream *stream;
+ struct ctf_stream_event *event;
+ struct ctf_text_stream_pos *sout;
+ struct trace_collection_pos begin_pos;
+ int ret;
+
+ sout = container_of(td_write, struct ctf_text_stream_pos,
+ trace_descriptor);
+
+ begin_pos.type = BT_SEEK_BEGIN;
+ iter = babeltrace_iter_create(ctx, &begin_pos, NULL);
+ if (!iter) {
+ ret = -1;
+ goto error_iter;
+ }
+ while (babeltrace_iter_read_event(iter, &stream, &event) == 0) {
+ ret = sout->parent.event_cb(&sout->parent, stream);
+ if (ret) {
+ fprintf(stderr, "[error] Writing event failed.\n");
+ goto end;
+ }
+ ret = babeltrace_iter_next(iter);
+ if (ret < 0)
+ goto end;
+ }
+ ret = 0;
+
+end:
+ babeltrace_iter_destroy(iter);
+error_iter:
+ return ret;
+}
+
+
/*
* traverse_dir() is the callback functiion for File Tree Walk (nftw).
* it receives the path of the current entry (file, dir, link..etc) with
return 0;
dirfd = open(fpath, 0);
if (dirfd < 0) {
- fprintf(stdout, "[error] unable to open trace "
+ fprintf(stderr, "[error] unable to open trace "
"directory file descriptor.\n");
return -1;
}
fpath, O_RDONLY, ctf_move_pos_slow,
NULL);
if (!td_read) {
- fprintf(stdout, "Error opening trace \"%s\" "
+ fprintf(stderr, "Error opening trace \"%s\" "
"for reading.\n\n", fpath);
return -1; /* error */
}
int ret;
struct format *fmt_write;
struct trace_descriptor *td_write;
+ struct bt_context *ctx;
ret = parse_options(argc, argv);
if (ret < 0) {
- fprintf(stdout, "Error parsing options.\n\n");
- usage(stdout);
+ fprintf(stderr, "Error parsing options.\n\n");
+ usage(stderr);
exit(EXIT_FAILURE);
} else if (ret > 0) {
exit(EXIT_SUCCESS);
opt_output_format = "text";
fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
if (!fmt_read) {
- fprintf(stdout, "[error] Format \"%s\" is not supported.\n\n",
+ fprintf(stderr, "[error] Format \"%s\" is not supported.\n\n",
opt_input_format);
exit(EXIT_FAILURE);
}
fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format));
if (!fmt_write) {
- fprintf(stdout, "[error] format \"%s\" is not supported.\n\n",
+ fprintf(stderr, "[error] format \"%s\" is not supported.\n\n",
opt_output_format);
exit(EXIT_FAILURE);
}
init_trace_collection(&trace_collection_read);
ret = nftw(opt_input_path, traverse_dir, 10, 0);
if (ret != 0) {
- fprintf(stdout, "[error] opening trace \"%s\" for reading.\n\n",
+ fprintf(stderr, "[error] opening trace \"%s\" for reading.\n\n",
opt_input_path);
goto error_td_read;
}
if (trace_collection_read.array->len == 0) {
- fprintf(stdout, "[warning] no metadata file was found."
+ fprintf(stderr, "[warning] no metadata file was found."
" no output was generated\n");
return 0;
}
-
+ ctx = bt_context_create(&trace_collection_read);
+ if (!ctx) {
+ fprintf(stderr, "Error allocating a new context\n");
+ goto error_td_read;
+ }
td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL);
if (!td_write) {
- fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
+ fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n",
opt_output_path ? : "<none>");
goto error_td_write;
}
- ret = convert_trace(td_write, &trace_collection_read);
+ ret = convert_trace(td_write, ctx);
if (ret) {
- fprintf(stdout, "Error printing trace.\n\n");
+ fprintf(stderr, "Error printing trace.\n\n");
goto error_copy_trace;
}
fmt_write->close_trace(td_write);
finalize_trace_collection(&trace_collection_read);
+ bt_context_destroy(ctx);
printf_verbose("finished converting. Output written to:\n%s\n",
opt_output_path ? : "<stdout>");
exit(EXIT_SUCCESS);