Add "-n trace" option to print trace name

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 5c3724252936392b0ae110c2691a71bb2b37d8b5..bac8a85f700a2f7b14dc5fbe4265d24e47aeadca 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -40,9 +40,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;
 
@@ -71,7 +68,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 },
+       { "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL },
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -95,12 +92,50 @@ 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, "  -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\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 {
+                       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 +153,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,12 +169,15 @@ 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;
-                       break;
                default:
                        ret = -EINVAL;
                        goto end;
@@ -149,6 +190,7 @@ static int parse_options(int argc, char **argv)
                goto end;
        }
        opt_output_path = poptGetArg(pc);
+
 end:
        if (pc) {
                poptFreeContext(pc);
@@ -212,7 +254,8 @@ 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(fpath, O_RDONLY, ctf_move_pos_slow,
+                               NULL);
                if (!td_read) {
                        fprintf(stdout, "Error opening trace \"%s\" "
                                        "for reading.\n\n", fpath);
@@ -290,7 +333,7 @@ int main(int argc, char **argv)
                return 0;
        }
 
-       td_write = fmt_write->open_trace(opt_output_path, O_RDWR);
+       td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
        if (!td_write) {
                fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
                        opt_output_path ? : "<none>");