Fix: handle 64-bit trace IDs on 32-bit systems

[babeltrace.git] / formats / lttng-live / lttng-live-plugin.c

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index 608a6dab7321382bf79c8ddff5c7945075d38b44..643129c8c7c881190a9d92f3e3e5942a59014dbe 100644 (file)
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -135,7 +135,7 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
                                if (ret < 0) {
                                        goto end;
                                }
-                       } else {
+                       } else if (ret == 0) {
                                fprintf(stderr, "[error] Missing port number after delimitor ':'\n");
                                ret = -1;
                                goto end;
@@ -187,6 +187,30 @@ end:
        return ret;
 }
 
+static
+guint g_uint64p_hash(gconstpointer key)
+{
+       uint64_t v = *(uint64_t *) key;
+
+       if (sizeof(gconstpointer) == sizeof(uint64_t)) {
+               return g_direct_hash((gconstpointer) (unsigned long) v);
+       } else {
+               return g_direct_hash((gconstpointer) (unsigned long) (v >> 32))
+                       ^ g_direct_hash((gconstpointer) (unsigned long) v);
+       }
+}
+
+static
+gboolean g_uint64p_equal(gconstpointer a, gconstpointer b)
+{
+       uint64_t va = *(uint64_t *) a;
+       uint64_t vb = *(uint64_t *) b;
+
+       if (va != vb)
+               return FALSE;
+       return TRUE;
+}
+
 static int lttng_live_open_trace_read(const char *path)
 {
        int ret = 0;
@@ -199,8 +223,8 @@ static int lttng_live_open_trace_read(const char *path)
        ctx->session->ctx = ctx;
 
        /* HT to store the CTF traces. */
-       ctx->session->ctf_traces = g_hash_table_new(g_direct_hash,
-                       g_direct_equal);
+       ctx->session->ctf_traces = g_hash_table_new(g_uint64p_hash,
+                       g_uint64p_equal);
        ctx->port = -1;
        ctx->session_ids = g_array_new(FALSE, TRUE, sizeof(uint64_t));
 
@@ -230,7 +254,7 @@ static int lttng_live_open_trace_read(const char *path)
        }
 
        if (ctx->session_ids->len > 0) {
-               lttng_live_read(ctx);
+               ret = lttng_live_read(ctx);
        }
 
 end_free:
@@ -268,7 +292,9 @@ struct bt_trace_descriptor *lttng_live_open_trace(const char *path, int flags,
        pos->parent.rw_table = NULL;
        pos->parent.event_cb = NULL;
        pos->parent.trace = &pos->trace_descriptor;
-       lttng_live_open_trace_read(path);
+       if (lttng_live_open_trace_read(path) < 0) {
+               goto error;
+       }
        return &pos->trace_descriptor;
 
 error: