Remove trace-collection.h from include_headers

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index d3232fe9720878f6f1b9cde0ebe27b1f5a7072ea..373944c20c2144fd0e0d0ab20a56578f635cc641 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -79,7 +79,7 @@ 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, "[error] [Context] Cannot open_trace of the format %s .\n\n",
+                       fprintf(stderr, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
                                        path);
                        ret = -1;
                        goto end;
@@ -104,8 +104,6 @@ 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';
 
@@ -119,8 +117,19 @@ 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;
 }
@@ -135,14 +144,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