cleanup: protected -> hidden: cleanup symbol table

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index 5021d7add1c56ab92386e4f93cdd43c520509086..e2c1739c41ff548a21ae13a3e62f983779590e5b 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -50,6 +50,7 @@ struct bt_context *bt_context_create(void)
                                g_direct_equal, NULL,
                                (GDestroyNotify) bt_trace_handle_destroy);
 
+       ctx->current_iterator = NULL;
        ctx->tc = g_new0(struct trace_collection, 1);
        init_trace_collection(ctx->tc);
 
@@ -58,8 +59,10 @@ struct bt_context *bt_context_create(void)
 
 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 offset, int whence))
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
+                       int whence),
+               struct mmap_stream_list *stream_list,
+               FILE *metadata)
 {
        struct trace_descriptor *td;
        struct format *fmt;
@@ -73,12 +76,22 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                ret = -1;
                goto end;
        }
-       td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
-       if (!td) {
-               fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-                               path);
-               ret = -1;
-               goto end;
+       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);
+                       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);
+                       ret = -1;
+                       goto end;
+               }
        }
 
        /* Create an handle for the trace */
@@ -91,16 +104,34 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        }
        handle->format = fmt;
        handle->td = td;
-       strncpy(handle->path, path, PATH_MAX);
-       handle->path[PATH_MAX - 1] = '\0';
+       if (path) {
+               strncpy(handle->path, path, PATH_MAX);
+               handle->path[PATH_MAX - 1] = '\0';
+       }
+
+       if (fmt->set_handle)
+               fmt->set_handle(td, handle);
+       if (fmt->set_context)
+               fmt->set_context(td, ctx);
 
        /* Add new handle to container */
        g_hash_table_insert(ctx->trace_handles,
                (gpointer) (unsigned long) handle->id,
                handle);
        ret = trace_collection_add(ctx->tc, td);
-       if (ret == 0)
-               return handle->id;
+       if (ret != 0)
+               goto end;
+
+       ret = fmt->convert_index_timestamp(td);
+       if (ret < 0)
+               goto end;
+
+       handle->real_timestamp_begin = fmt->timestamp_begin(td, handle, BT_CLOCK_REAL);
+       handle->real_timestamp_end = fmt->timestamp_end(td, handle, BT_CLOCK_REAL);
+       handle->cycles_timestamp_begin = fmt->timestamp_begin(td, handle, BT_CLOCK_CYCLES);
+       handle->cycles_timestamp_end = fmt->timestamp_end(td, handle, BT_CLOCK_CYCLES);
+
+       return handle->id;
 end:
        return ret;
 }
@@ -115,14 +146,13 @@ void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 
        /* Remove from containers */
        trace_collection_remove(ctx->tc, handle->td);
-       g_hash_table_remove(ctx->trace_handles,
-               (gpointer) (unsigned long) handle_id);
-
        /* Close the trace */
        handle->format->close_trace(handle->td);
 
-       /* Destory the handle */
-       bt_trace_handle_destroy(handle);
+       /* Remove and free the handle */
+       g_hash_table_remove(ctx->trace_handles,
+                       (gpointer) (unsigned long) handle_id);
+
 }
 
 static