X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=dd335edbb20d56374559d450cdcbbfdf8b29861b;hp=63ade113c81f719a1cb4b1a5b0178a5567fb826b;hb=22133895a9a6b29ec17211f8d437bc128a7e4dfc;hpb=7fb210365ad968646a0088d80f709165bf068950 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 63ade113..dd335edb 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 @@ -21,14 +23,27 @@ #include #include #include +#include +#include +#include +#include -static const char *opt_input_format; -static const char *opt_output_format; +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; +int opt_field_names; + +void strlower(char *str) +{ + while (*str) { + *str = tolower(*str); + str++; + } +} enum { OPT_NONE = 0, @@ -36,6 +51,7 @@ enum { OPT_LIST, OPT_VERBOSE, OPT_DEBUG, + OPT_NAMES, }; static struct poptOption long_options[] = { @@ -46,6 +62,7 @@ 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 }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -57,20 +74,22 @@ static void list_formats(FILE *fp) static void usage(FILE *fp) { - fprintf(fp, "Babeltrace %u.%u\n\n", BABELTRACE_VERSION_MAJOR, + fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n", + BABELTRACE_VERSION_MAJOR, BABELTRACE_VERSION_MINOR); - fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n"); + 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, " -d, --debug Debug mode\n"); + fprintf(fp, " -n, --names Print field names\n"); list_formats(fp); fprintf(fp, "\n"); } @@ -79,12 +98,17 @@ static void usage(FILE *fp) * 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); while ((opt = poptGetNextOpt(pc)) != -1) { @@ -103,6 +127,9 @@ static int parse_options(int argc, const char **argv) case OPT_DEBUG: babeltrace_debug = 1; break; + case OPT_NAMES: + opt_field_names = 1; + break; default: ret = -EINVAL; goto end; @@ -115,10 +142,6 @@ 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,13 +149,15 @@ end: return ret; } -int main(int argc, const char **argv) +int main(int argc, char **argv) { int ret; + struct format *fmt_read, *fmt_write; + struct trace_descriptor *td_read, *td_write; ret = parse_options(argc, argv); if (ret < 0) { - fprintf(stdout, "Error parsing options.\n"); + fprintf(stdout, "Error parsing options.\n\n"); usage(stdout); exit(EXIT_FAILURE); } else if (ret > 0) { @@ -141,12 +166,65 @@ int main(int argc, const char **argv) printf_verbose("Verbose mode active.\n"); printf_debug("Debug mode active.\n"); + if (opt_input_format) + strlower(opt_input_format); + if (opt_output_format) + strlower(opt_output_format); + printf_verbose("Converting from file: %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 file: %s\n", + opt_output_path ? : ""); printf_verbose("Converting to format: %s\n", - opt_output_format ? : "CTF"); + opt_output_format ? : "text "); + + 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(stdout, "[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", + opt_output_format); + exit(EXIT_FAILURE); + } + + td_read = fmt_read->open_trace(opt_input_path, O_RDONLY); + if (!td_read) { + fprintf(stdout, "[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); + 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, td_read); + if (ret) { + fprintf(stdout, "Error printing trace.\n\n"); + goto error_copy_trace; + } - return 0; + fmt_write->close_trace(td_write); + fmt_read->close_trace(td_read); + exit(EXIT_SUCCESS); + + /* Error handling */ +error_copy_trace: + fmt_write->close_trace(td_write); +error_td_write: + fmt_read->close_trace(td_read); +error_td_read: + exit(EXIT_FAILURE); }