Cleanup: update ifdef wrapper name

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index d6b1ec8b6ba71f48e5ffe9428baf3a89f8cc42df..dca4cb2b4fc4605735f795872570ae34456c82b7 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <errno.h>
 
 #include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
@@ -69,6 +70,9 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        struct bt_trace_handle *handle;
        int ret;
 
+       if (!ctx || !format_name || (!path && !stream_list))
+               return -EINVAL;
+
        fmt = bt_lookup_format(g_quark_from_string(format_name));
        if (!fmt) {
                fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n",
@@ -104,10 +108,10 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        }
        handle->format = fmt;
        handle->td = td;
-       handle->timestamp_begin = fmt->timestamp_begin(td, handle);
-       handle->timestamp_end = fmt->timestamp_end(td, handle);
-       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);
@@ -119,35 +123,50 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                (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;
 }
 
-void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
+int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 {
        struct bt_trace_handle *handle;
 
+       if (!ctx)
+               return -EINVAL;
+
        handle = g_hash_table_lookup(ctx->trace_handles,
                (gpointer) (unsigned long) handle_id);
-       assert(handle != NULL);
+       if (!handle)
+               return -ENOENT;
 
        /* 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);
+       return 0;
 }
 
 static
 void bt_context_destroy(struct bt_context *ctx)
 {
+       assert(ctx);
        finalize_trace_collection(ctx->tc);
 
        /* Remote all traces. The g_hash_table_destroy will call
@@ -163,11 +182,13 @@ void bt_context_destroy(struct bt_context *ctx)
 
 void bt_context_get(struct bt_context *ctx)
 {
+       assert(ctx);
        ctx->refcount++;
 }
 
 void bt_context_put(struct bt_context *ctx)
 {
+       assert(ctx);
        ctx->refcount--;
        if (ctx->refcount == 0)
                bt_context_destroy(ctx);