X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=e2c1739c41ff548a21ae13a3e62f983779590e5b;hp=bedcc42042e0c95353e930aa0ede89ba2297c45d;hb=f7bbd50246fde81a4ef90fa6bd78e441fccdbb40;hpb=188e72bf705ebe0276e7966a9bf46b74e583bcfc

diff --git a/lib/context.c b/lib/context.c
index bedcc420..e2c1739c 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -104,10 +104,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,8 +119,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;
 }