X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=373944c20c2144fd0e0d0ab20a56578f635cc641;hp=d6b1ec8b6ba71f48e5ffe9428baf3a89f8cc42df;hb=5f0b5523775fe5fe8dcc7c232aa831979a36498c;hpb=ca71827554747d1a4dabf9d82a7c4eacb6f908d5

diff --git a/lib/context.c b/lib/context.c
index d6b1ec8b..373944c2 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -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