X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=269ed4639d75b5db219013898d007e45b0f8f5e1;hp=ded493cede3e6c37c5d8d46de56452e0d82d6fa3;hb=95d36295f18e15c7f68a97fbab3eb1961d21cd70;hpb=00f7fbf0bcce4662bf7e755ecee0517bfebf6ae2 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index ded493ce..269ed463 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -40,9 +43,6 @@ static char *opt_output_format; static const char *opt_input_path; static const char *opt_output_path; -int babeltrace_verbose, babeltrace_debug; -int opt_field_names; - static struct trace_collection trace_collection_read; static struct format *fmt_read; @@ -61,6 +61,7 @@ enum { OPT_VERBOSE, OPT_DEBUG, OPT_NAMES, + OPT_NO_DELTA, }; static struct poptOption long_options[] = { @@ -71,7 +72,8 @@ static struct poptOption long_options[] = { { "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 }, + { "no-delta", 0, POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -95,12 +97,60 @@ static void usage(FILE *fp) 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 environment variable)\n"); fprintf(fp, " -d, --debug Debug mode\n"); - fprintf(fp, " -n, --names Print field names\n"); + fprintf(fp, " (or set BABELTRACE_DEBUG environment variable)\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, " Available 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, " loglevel.\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 if (!strcmp(str, "trace")) + opt_trace_name = 1; + else if (!strcmp(str, "trace:domain")) + opt_trace_domain = 1; + else if (!strcmp(str, "trace:procname")) + opt_trace_procname = 1; + else if (!strcmp(str, "trace:vpid")) + opt_trace_vpid = 1; + else if (!strcmp(str, "loglevel")) + opt_loglevel = 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. @@ -118,6 +168,9 @@ static int parse_options(int argc, char **argv) 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: @@ -131,11 +184,17 @@ static int parse_options(int argc, char **argv) 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; + case OPT_NO_DELTA: + opt_delta = 0; break; default: ret = -EINVAL; @@ -149,6 +208,7 @@ static int parse_options(int argc, char **argv) goto end; } opt_output_path = poptGetArg(pc); + end: if (pc) { poptFreeContext(pc); @@ -183,6 +243,44 @@ static void trace_collection_add(struct trace_collection *tc, 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(stdout, "[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 @@ -212,7 +310,9 @@ static int traverse_dir(const char *fpath, const struct stat *sb, } else { close(fd); close(dirfd); - td_read = fmt_read->open_trace(fpath, O_RDONLY); + td_read = fmt_read->open_trace(opt_input_path, + fpath, O_RDONLY, ctf_move_pos_slow, + NULL); if (!td_read) { fprintf(stdout, "Error opening trace \"%s\" " "for reading.\n\n", fpath); @@ -228,6 +328,7 @@ int main(int argc, char **argv) int ret; struct format *fmt_write; struct trace_descriptor *td_write; + struct bt_context *ctx; ret = parse_options(argc, argv); if (ret < 0) { @@ -289,15 +390,19 @@ int main(int argc, char **argv) " no output was generated\n"); return 0; } - - td_write = fmt_write->open_trace(opt_output_path, O_RDWR); + ctx = bt_context_create(&trace_collection_read); + if (!ctx) { + fprintf(stdout, "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", opt_output_path ? : ""); 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"); goto error_copy_trace; @@ -305,6 +410,7 @@ int main(int argc, char **argv) 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 ? : ""); exit(EXIT_SUCCESS);