Namespace the struct mmap_stream

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index 9c1159860ebc7a0d7af512f0ede5cc5250cdb154..00409726e0d6d38714387b8af44e4354b87da1e8 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -60,19 +60,19 @@ struct bt_context *bt_context_create(void)
 
        ctx->current_iterator = NULL;
        ctx->tc = g_new0(struct trace_collection, 1);
-       init_trace_collection(ctx->tc);
+       bt_init_trace_collection(ctx->tc);
 
        return ctx;
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
                const char *format_name,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
-               struct mmap_stream_list *stream_list,
+               struct bt_mmap_stream_list *stream_list,
                FILE *metadata)
 {
-       struct trace_descriptor *td;
+       struct bt_trace_descriptor *td;
        struct format *fmt;
        struct bt_trace_handle *handle;
        int ret, closeret;
@@ -90,16 +90,16 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        if (path) {
                td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
                if (!td) {
-                       fprintf(stderr, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
-                                       path);
+                       fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n",
+                                       format_name, path);
                        ret = -1;
                        goto end;
                }
        } else {
                td = fmt->open_mmap_trace(stream_list, packet_seek, metadata);
                if (!td) {
-                       fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-                                       path);
+                       fprintf(stderr, "[error] [Context] Cannot open_mmap_trace of format %s.\n\n",
+                                       format_name);
                        ret = -1;
                        goto end;
                }
@@ -129,7 +129,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        g_hash_table_insert(ctx->trace_handles,
                (gpointer) (unsigned long) handle->id,
                handle);
-       ret = trace_collection_add(ctx->tc, td);
+       ret = bt_trace_collection_add(ctx->tc, td);
        if (ret != 0)
                goto error;
 
@@ -167,7 +167,7 @@ int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
                return -ENOENT;
 
        /* Remove from containers */
-       trace_collection_remove(ctx->tc, handle->td);
+       bt_trace_collection_remove(ctx->tc, handle->td);
        /* Close the trace */
        ret = handle->format->close_trace(handle->td);
        if (ret) {
@@ -184,7 +184,7 @@ static
 void bt_context_destroy(struct bt_context *ctx)
 {
        assert(ctx);
-       finalize_trace_collection(ctx->tc);
+       bt_finalize_trace_collection(ctx->tc);
 
        /*
         * Remove all traces. The g_hash_table_destroy will call