Introduce contexts

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 22743c96878a1072585315e3d4eb0fb571d52a83..269ed4639d75b5db219013898d007e45b0f8f5e1 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -20,8 +20,11 @@
 
 #define _XOPEN_SOURCE 700
 #include <config.h>
-#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/format.h>
+#include <babeltrace/context.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-text/types.h>
 #include <popt.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -58,6 +61,7 @@ enum {
        OPT_VERBOSE,
        OPT_DEBUG,
        OPT_NAMES,
+       OPT_NO_DELTA,
 };
 
 static struct poptOption long_options[] = {
@@ -69,6 +73,7 @@ static struct poptOption long_options[] = {
        { "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 },
+       { "no-delta", 0, POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL },
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -95,10 +100,13 @@ static void usage(FILE *fp)
        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, "                                 Available field names:\n");
-       fprintf(fp, "                                     payload OR args OR arg\n");
-       fprintf(fp, "                                     all, scope, header, context OR ctx\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");
@@ -125,6 +133,16 @@ static int get_names_args(poptContext *pc)
                        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;
@@ -175,6 +193,9 @@ static int parse_options(int argc, char **argv)
                case OPT_DEBUG:
                        babeltrace_debug = 1;
                        break;
+               case OPT_NO_DELTA:
+                       opt_delta = 0;
+                       break;
                default:
                        ret = -EINVAL;
                        goto end;
@@ -222,6 +243,44 @@ static void trace_collection_add(struct trace_collection *tc,
        g_ptr_array_add(tc->array, td);
 }
 
+int convert_trace(struct trace_descriptor *td_write,
+                 struct bt_context *ctx)
+{
+       struct babeltrace_iter *iter;
+       struct ctf_stream *stream;
+       struct ctf_stream_event *event;
+       struct ctf_text_stream_pos *sout;
+       struct trace_collection_pos begin_pos;
+       int ret;
+
+       sout = container_of(td_write, struct ctf_text_stream_pos,
+                       trace_descriptor);
+
+       begin_pos.type = BT_SEEK_BEGIN;
+       iter = babeltrace_iter_create(ctx, &begin_pos, NULL);
+       if (!iter) {
+               ret = -1;
+               goto error_iter;
+       }
+       while (babeltrace_iter_read_event(iter, &stream, &event) == 0) {
+               ret = sout->parent.event_cb(&sout->parent, stream);
+               if (ret) {
+                       fprintf(stdout, "[error] Writing event failed.\n");
+                       goto end;
+               }
+               ret = babeltrace_iter_next(iter);
+               if (ret < 0)
+                       goto end;
+       }
+       ret = 0;
+
+end:
+       babeltrace_iter_destroy(iter);
+error_iter:
+       return ret;
+}
+
+
 /*
  * traverse_dir() is the callback functiion for File Tree Walk (nftw).
  * it receives the path of the current entry (file, dir, link..etc) with
@@ -251,7 +310,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\" "
@@ -268,6 +328,7 @@ 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) {
@@ -329,15 +390,19 @@ int main(int argc, char **argv)
                                                " no output was generated\n");
                return 0;
        }
-
-       td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
+       ctx = bt_context_create(&trace_collection_read);
+       if (!ctx) {
+               fprintf(stdout, "Error allocating a new context\n");
+               goto error_td_read;
+       }
+       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>");
                goto error_td_write;
        }
 
-       ret = convert_trace(td_write, &trace_collection_read);
+       ret = convert_trace(td_write, ctx);
        if (ret) {
                fprintf(stdout, "Error printing trace.\n\n");
                goto error_copy_trace;
@@ -345,6 +410,7 @@ int main(int argc, char **argv)
 
        fmt_write->close_trace(td_write);
        finalize_trace_collection(&trace_collection_read);
+       bt_context_destroy(ctx);
        printf_verbose("finished converting. Output written to:\n%s\n",
                        opt_output_path ? : "<stdout>");
        exit(EXIT_SUCCESS);