Add time delta to ctf-text

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 04d2615e788dd470693c9d7a10a13b2f33545d4f..6af4a8b9bccf1a816c4993bf10b42507b0b8f19e 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -58,6 +58,7 @@ enum {
        OPT_VERBOSE,
        OPT_DEBUG,
        OPT_NAMES,
+       OPT_NO_DELTA,
 };
 
 static struct poptOption long_options[] = {
@@ -68,7 +69,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 },
 };
 
@@ -92,14 +94,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 env. var.)\n");
+       fprintf(fp, "                                 (or set BABELTRACE_VERBOSE environment variable)\n");
        fprintf(fp, "  -d, --debug                    Debug mode\n");
-       fprintf(fp, "                                 (or set BABELTRACE_DEBUG env. var.)\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.
@@ -117,6 +165,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:
@@ -130,11 +181,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;
@@ -148,6 +205,7 @@ static int parse_options(int argc, char **argv)
                goto end;
        }
        opt_output_path = poptGetArg(pc);
+
 end:
        if (pc) {
                poptFreeContext(pc);
@@ -211,7 +269,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, ctf_move_pos_slow,
+               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\" "
@@ -290,7 +349,7 @@ int main(int argc, char **argv)
                return 0;
        }
 
-       td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
+       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 ? : "<none>");