X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=a7004e1b1e60a21e1531d463f98380afe5dfe7b2;hp=63ade113c81f719a1cb4b1a5b0178a5567fb826b;hb=02dc4610b1dccefaf545ba77378857ee6188ea33;hpb=7fb210365ad968646a0088d80f709165bf068950 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 63ade113..a7004e1b 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -3,7 +3,9 @@ * * Babeltrace Trace Converter * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -16,19 +18,44 @@ * all copies or substantial portions of the Software. */ +#define _XOPEN_SOURCE 700 +#include #include #include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + +#include /* for clocks */ -static const char *opt_input_format; -static const char *opt_output_format; +#define DEFAULT_FILE_ARRAY_SIZE 1 +static char *opt_input_format; +static char *opt_output_format; static const char *opt_input_path; static const char *opt_output_path; -int babeltrace_verbose, babeltrace_debug; +static struct format *fmt_read; + +void strlower(char *str) +{ + while (*str) { + *str = tolower(*str); + str++; + } +} enum { OPT_NONE = 0, @@ -36,6 +63,14 @@ enum { OPT_LIST, OPT_VERBOSE, OPT_DEBUG, + OPT_NAMES, + OPT_FIELDS, + OPT_NO_DELTA, + OPT_CLOCK_OFFSET, + OPT_CLOCK_RAW, + OPT_CLOCK_SECONDS, + OPT_CLOCK_DATE, + OPT_CLOCK_GMT, }; static struct poptOption long_options[] = { @@ -46,6 +81,14 @@ 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_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 }, + { "clock-offset", 0, POPT_ARG_STRING, NULL, OPT_CLOCK_OFFSET, NULL, NULL }, + { "clock-raw", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_RAW, NULL, NULL }, + { "clock-seconds", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_SECONDS, NULL, NULL }, + { "clock-date", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL }, + { "clock-gmt", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_GMT, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -57,36 +100,118 @@ static void list_formats(FILE *fp) static void usage(FILE *fp) { - fprintf(fp, "Babeltrace %u.%u\n\n", BABELTRACE_VERSION_MAJOR, - BABELTRACE_VERSION_MINOR); - fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n"); + fprintf(fp, "BabelTrace Trace Viewer and Converter %s\n\n", VERSION); + fprintf(fp, "usage : babeltrace [OPTIONS] INPUT \n"); fprintf(fp, "\n"); - fprintf(fp, " INPUT Input trace path\n"); - fprintf(fp, " OUTPUT Output trace path\n"); + fprintf(fp, " INPUT Input trace path\n"); + fprintf(fp, " OUTPUT Output trace path (default: stdout)\n"); fprintf(fp, "\n"); - fprintf(fp, " -i, --input-format Input trace path\n"); - fprintf(fp, " -o, --output-format Input trace path\n"); + fprintf(fp, " -i, --input-format FORMAT Input trace format (default: ctf)\n"); + fprintf(fp, " -o, --output-format FORMAT Output trace format (default: text)\n"); fprintf(fp, "\n"); - 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, " -d, --debug Debug mode\n"); + 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, " (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, " (payload OR args OR arg)\n"); + fprintf(fp, " all, scope, header, (context OR ctx)\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"); + fprintf(fp, " --clock-raw Disregard internal clock offset (use raw value)\n"); + fprintf(fp, " --clock-offset seconds Clock offset in seconds\n"); + fprintf(fp, " --clock-seconds Print the timestamps as [sec.ns]\n"); + fprintf(fp, " (default is: [hh:mm:ss.ns])\n"); + fprintf(fp, " --clock-date Print clock date\n"); + fprintf(fp, " --clock-gmt Print clock in GMT time zone (default: local time zone)\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(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; + + 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_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, "loglevel")) + opt_loglevel_field = 1; + else { + fprintf(stderr, "[error] unknown field 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. */ -static int parse_options(int argc, const char **argv) +static int parse_options(int argc, char **argv) { poptContext pc; int opt, ret = 0; - pc = poptGetContext(NULL, argc, argv, long_options, 0); + if (argc == 1) { + usage(stdout); + return 1; /* exit cleanly */ + } + + 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: @@ -100,9 +225,56 @@ static int parse_options(int argc, const char **argv) case OPT_VERBOSE: babeltrace_verbose = 1; break; + case OPT_NAMES: + if (get_names_args(&pc)) { + ret = -EINVAL; + 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; + case OPT_CLOCK_RAW: + opt_clock_raw = 1; + break; + case OPT_CLOCK_OFFSET: + { + char *str, *endptr; + + str = poptGetOptArg(pc); + if (!str) { + fprintf(stderr, "[error] Missing --clock-offset argument\n"); + ret = -EINVAL; + goto end; + } + errno = 0; + opt_clock_offset = strtoull(str, &endptr, 0); + if (*endptr != '\0' || str == endptr || errno != 0) { + fprintf(stderr, "[error] Incorrect --clock-offset argument: %s\n", str); + ret = -EINVAL; + goto end; + } + break; + } + case OPT_CLOCK_SECONDS: + opt_clock_seconds = 1; + break; + case OPT_CLOCK_DATE: + opt_clock_date = 1; + break; + case OPT_CLOCK_GMT: + opt_clock_gmt = 1; + break; + default: ret = -EINVAL; goto end; @@ -115,10 +287,7 @@ static int parse_options(int argc, const char **argv) goto end; } opt_output_path = poptGetArg(pc); - if (!opt_output_path) { - ret = -EINVAL; - goto end; - } + end: if (pc) { poptFreeContext(pc); @@ -126,14 +295,58 @@ end: return ret; } -int main(int argc, const char **argv) + + + + +int convert_trace(struct trace_descriptor *td_write, + struct bt_context *ctx) { + struct bt_iter *iter; + struct ctf_stream *stream; + struct ctf_stream_event *event; + struct ctf_text_stream_pos *sout; + struct bt_iter_pos begin_pos; int ret; + sout = container_of(td_write, struct ctf_text_stream_pos, + trace_descriptor); + + begin_pos.type = BT_SEEK_BEGIN; + iter = bt_iter_create(ctx, &begin_pos, NULL); + if (!iter) { + ret = -1; + goto error_iter; + } + while (bt_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 = bt_iter_next(iter); + if (ret < 0) + goto end; + } + ret = 0; + +end: + bt_iter_destroy(iter); +error_iter: + return ret; +} + +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) { - fprintf(stdout, "Error parsing options.\n"); - usage(stdout); + fprintf(stderr, "Error parsing options.\n\n"); + usage(stderr); exit(EXIT_FAILURE); } else if (ret > 0) { exit(EXIT_SUCCESS); @@ -141,12 +354,71 @@ int main(int argc, const char **argv) printf_verbose("Verbose mode active.\n"); printf_debug("Debug mode active.\n"); - printf_verbose("Converting from file: %s\n", opt_input_path); + if (opt_input_format) + strlower(opt_input_format); + if (opt_output_format) + strlower(opt_output_format); + + printf_verbose("Converting from directory: %s\n", opt_input_path); printf_verbose("Converting from format: %s\n", - opt_input_format ? : ""); - printf_verbose("Converting to file: %s\n", opt_output_path); + opt_input_format ? : "ctf "); + printf_verbose("Converting to directory: %s\n", + opt_output_path ? : ""); printf_verbose("Converting to format: %s\n", - opt_output_format ? : "CTF"); + opt_output_format ? : "text "); - return 0; + if (!opt_input_format) + opt_input_format = "ctf"; + if (!opt_output_format) + opt_output_format = "text"; + fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format)); + if (!fmt_read) { + 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(stderr, "[error] format \"%s\" is not supported.\n\n", + opt_output_format); + exit(EXIT_FAILURE); + } + + ctx = bt_context_create(); + + ret = bt_context_add_traces_recursive(ctx, opt_input_path, + opt_input_format); + if (ret) { + fprintf(stderr, "[error] opening trace \"%s\" for reading.\n\n", + opt_input_path); + goto error_td_read; + } + + td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL); + if (!td_write) { + fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n", + opt_output_path ? : ""); + goto error_td_write; + } + + ret = convert_trace(td_write, ctx); + if (ret) { + fprintf(stderr, "Error printing trace.\n\n"); + goto error_copy_trace; + } + + fmt_write->close_trace(td_write); + + bt_context_put(ctx); + printf_verbose("finished converting. Output written to:\n%s\n", + opt_output_path ? : ""); + exit(EXIT_SUCCESS); + + /* Error handling */ +error_copy_trace: + fmt_write->close_trace(td_write); +error_td_write: + bt_context_put(ctx); +error_td_read: + exit(EXIT_FAILURE); }