Add babeltrace option parsing

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 3ecca8c2c24d61f3637f78d090479eabc0832d9b..66032beb290f71d45b5861f23625668a54db4704 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
 
 bin_PROGRAMS = babeltrace
 
@@ -9,4 +9,3 @@ babeltrace_LDADD = \
        $(top_srcdir)/types/libtypes.a \
        $(top_srcdir)/formats/libregistry.a
 
-

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 900768879830dbb718f1bac8e230b731d5f7dfc0..8ec3d64b9b892c9c9071c2e8432db24a21713599 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -1,6 +1,137 @@
+/*
+ * babeltrace.c
+ *
+ * Babeltrace Trace Converter
+ *
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
 
+#include <babeltrace/babeltrace.h>
+#include <popt.h>
+#include <errno.h>
+#include <stdlib.h>
 
-int main(int argv, char **argc)
+static const char *opt_input_format;
+static const char *opt_output_format;
+
+static const char *opt_input_path;
+static const char *opt_output_path;
+
+int babeltrace_verbose, babeltrace_debug;
+
+enum {
+       OPT_NONE = 0,
+       OPT_HELP,
+       OPT_VERBOSE,
+       OPT_DEBUG,
+};
+
+static struct poptOption long_options[] = {
+       /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+       { "input-format", 'i', POPT_ARG_STRING, &opt_input_format, OPT_NONE, NULL, NULL },
+       { "output-format", 'o', POPT_ARG_STRING, &opt_output_format, OPT_NONE, NULL, NULL },
+       { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
+       { "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
+       { "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
+       { NULL, 0, 0, NULL, 0, NULL, NULL },
+};
+
+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, "\n");
+       fprintf(fp, "  INPUT               Input trace path\n");
+       fprintf(fp, "  OUTPUT              Output trace path\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "  -i, --input-format  Input trace path\n");
+       fprintf(fp, "  -o, --output-format Input trace path\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "  -h, --help          This help message\n");
+       fprintf(fp, "  -v, --verbose       Verbose mode\n");
+       fprintf(fp, "  -d, --debug         Debug mode\n");
+       fprintf(fp, "\n");
+}
+
+/*
+ * 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)
+{
+       poptContext pc;
+       int opt, ret = 0;
+
+       pc = poptGetContext(NULL, argc, argv, long_options, 0);
+       poptReadDefaultConfig(pc, 0);
+
+       while ((opt = poptGetNextOpt(pc)) != -1) {
+               switch (opt) {
+               case OPT_HELP:
+                       usage(stderr);
+                       ret = 1;        /* exit cleanly */
+                       goto end;
+               case OPT_VERBOSE:
+                       babeltrace_verbose = 1;
+                       break;
+               case OPT_DEBUG:
+                       babeltrace_debug = 1;
+                       break;
+               default:
+                       ret = -EINVAL;
+                       goto end;
+               }
+       }
+
+       opt_input_path = poptGetArg(pc);
+       if (!opt_input_path) {
+               ret = -EINVAL;
+               goto end;
+       }
+       opt_output_path = poptGetArg(pc);
+       if (!opt_output_path) {
+               ret = -EINVAL;
+               goto end;
+       }
+end:
+       if (pc) {
+               poptFreeContext(pc);
+       }
+       return ret;
+}
+
+int main(int argc, const char **argv)
+{
+       int ret;
+
+       ret = parse_options(argc, argv);
+       if (ret < 0) {
+               fprintf(stdout, "Error parsing options.\n");
+               usage(stdout);
+               exit(EXIT_FAILURE);
+       } else if (ret > 0) {
+               exit(EXIT_SUCCESS);
+       }
+       printf_verbose("Verbose mode active.\n");
+       printf_debug("Debug mode active.\n");
+
+       printf_verbose("Converting from file: %s\n", opt_input_path);
+       printf_verbose("Converting from format: %s\n",
+               opt_input_format ? : "<autodetect>");
+       printf_verbose("Converting to file: %s\n", opt_output_path);
+       printf_verbose("Converting to format: %s\n",
+               opt_output_format ? : "CTF");
+
        return 0;
 }

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
new file mode 100644 (file)
index 0000000..a32ed9d
--- /dev/null
+++ b/include/babeltrace/babeltrace.h
@@ -0,0 +1,21 @@
+#ifndef _BABELTRACE_H
+#define _BABELTRACE_H
+
+#define BABELTRACE_VERSION_MAJOR       0
+#define BABELTRACE_VERSION_MINOR       1
+
+extern int babeltrace_verbose, babeltrace_debug;
+
+#define printf_verbose(fmt, args...)                           \
+       do {                                                    \
+               if (babeltrace_verbose)                         \
+                       printf("[verbose] " fmt, ## args);      \
+       } while (0)
+
+#define printf_debug(fmt, args...)                             \
+       do {                                                    \
+               if (babeltrace_debug)                           \
+                       printf("[debug] " fmt, ## args);        \
+       } while (0)
+
+#endif