Fix: add mmap_base_offset to ctf_stream_pos

[babeltrace.git] / lib / trace-handle.c

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index fce2397c0d2c4481bd7515db07ac004067e10f77..5058d37318f1fdb37148f82e9f4eb37bcf9a4a19 100644 (file)
--- 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,41 +31,76 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 {
        struct bt_trace_handle *th;
 
-       th = calloc(1, sizeof(struct bt_trace_handle));
-       if (!th) {
-               perror("allocating trace_handle");
-               return NULL;
-       }
-       if (!ctx)
-               return NULL;
-
+       th = g_new0(struct bt_trace_handle, 1);
        th->id = ctx->last_trace_handle_id++;
        return th;
 }
 
-void bt_trace_handle_destroy(struct bt_trace_handle *bt)
+void bt_trace_handle_destroy(struct bt_trace_handle *th)
 {
-       if (bt)
-               free(bt);
+       g_free(th);
 }
 
-char *bt_trace_handle_get_path(struct bt_trace_handle *th)
+int bt_trace_handle_get_id(struct bt_trace_handle *th)
 {
-       if (th && th->path)
-               return th->path;
-       return NULL;
+       return th->id;
 }
 
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_trace_handle *th)
+const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 {
-       if (th)
-               return th->timestamp_begin;
-       return -1ULL;
+       struct bt_trace_handle *handle;
+
+       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_end(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)
 {
-       if (th)
-               return th->timestamp_end;
-       return -1ULL;
+       struct bt_trace_handle *handle;
+       uint64_t ret;
+
+       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_context *ctx,
+               int handle_id, enum bt_clock_type type)
+{
+       struct bt_trace_handle *handle;
+       uint64_t ret;
+
+       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;
 }