X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-handle.c;h=f981adda410ab19266c2213c6ce50cae09a0b73d;hp=73c137b3464011ffaf8e491f567f27bebb80103f;hb=50052405724a3b901b258c00beb424751c579217;hpb=6cba487f031260536d6a77acde888c8b1a876fcf

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index 73c137b3..f981adda 100644
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/context.h>
+#include <babeltrace/context-internal.h>
 #include <babeltrace/trace-handle.h>
 #include <babeltrace/trace-handle-internal.h>
 
@@ -30,6 +31,9 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 {
 	struct bt_trace_handle *th;
 
+	if (!ctx)
+		return NULL;
+
 	th = g_new0(struct bt_trace_handle, 1);
 	th->id = ctx->last_trace_handle_id++;
 	return th;
@@ -42,20 +46,76 @@ void bt_trace_handle_destroy(struct bt_trace_handle *th)
 
 int bt_trace_handle_get_id(struct bt_trace_handle *th)
 {
+	if (!th)
+		return -1;
+
 	return th->id;
 }
 
-const char *bt_trace_handle_get_path(struct bt_trace_handle *th)
+const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 {
-	return th->path;
+	struct bt_trace_handle *handle;
+
+	if (!ctx)
+		return NULL;
+
+	handle = g_hash_table_lookup(ctx->trace_handles,
+			(gpointer) (unsigned long) handle_id);
+	if (!handle)
+		return NULL;
+	return handle->path;
 }
 
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_trace_handle *th)
+uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
+		int handle_id, enum bt_clock_type type)
 {
-	return th->timestamp_begin;
+	struct bt_trace_handle *handle;
+	uint64_t ret;
+
+	if (!ctx)
+		return -1ULL;
+
+	handle = g_hash_table_lookup(ctx->trace_handles,
+			(gpointer) (unsigned long) handle_id);
+	if (!handle) {
+		ret = -1ULL;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		ret = handle->real_timestamp_begin;
+	} else if (type == BT_CLOCK_CYCLES) {
+		ret = handle->cycles_timestamp_begin;
+	} else {
+		ret = -1ULL;
+	}
+
+end:
+	return ret;
 }
 
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_trace_handle *th)
+uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
+		int handle_id, enum bt_clock_type type)
 {
-	return th->timestamp_end;
+	struct bt_trace_handle *handle;
+	uint64_t ret;
+
+	if (!ctx)
+		return -1ULL;
+
+	handle = g_hash_table_lookup(ctx->trace_handles,
+			(gpointer) (unsigned long) handle_id);
+	if (!handle) {
+		ret = -1ULL;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		ret = handle->real_timestamp_end;
+	} else if (type == BT_CLOCK_CYCLES) {
+		ret = handle->cycles_timestamp_end;
+	} else {
+		ret = -1ULL;
+	}
+
+end:
+	return ret;
 }