More compile fixes

[lttng-ust.git] / liblttng-ust / ltt-events.c

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index d31412c6747490db0428826c0c028d2c36c25d6d..c97727348cb18834fb4a38e3b763f30e7fab3eae 100644 (file)
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -27,11 +27,11 @@
 #include "lttng/core.h"
 #include "ltt-tracer.h"
 #include "ltt-tracer-core.h"
-#include "lttng/wait.h"
+#include "wait.h"
 #include "../libringbuffer/shm.h"
-
-typedef u32 uint32_t;
-#include <lttng/kcompat/jhash.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <urcu/arch.h>
 
 /*
  * The sessions mutex is the centralized mutex across UST tracing
@@ -87,7 +87,7 @@ int add_pending_probe(struct ltt_event *event, const char *name)
        struct cds_hlist_head *head;
        struct ust_pending_probe *e;
        size_t name_len = strlen(name) + 1;
-       u32 hash = jhash(name, name_len - 1, 0);
+       uint32_t hash = jhash(name, name_len - 1, 0);
 
        head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
        e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
@@ -126,7 +126,7 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
        struct ust_pending_probe *e;
        const char *name = desc->name;
        size_t name_len = strlen(name) + 1;
-       u32 hash = jhash(name, name_len - 1, 0);
+       uint32_t hash = jhash(name, name_len - 1, 0);
        int ret = 0;
 
        head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
@@ -293,7 +293,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
                                       unsigned int switch_timer_interval,
                                       unsigned int read_timer_interval,
                                       int *shm_fd, int *wait_fd,
-                                      uint64_t *memory_map_size)
+                                      uint64_t *memory_map_size,
+                                      struct ltt_channel *chan_priv_init)
 {
        struct ltt_channel *chan = NULL;
        struct ltt_transport *transport;
@@ -306,6 +307,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
                       transport_name);
                goto notransport;
        }
+       chan_priv_init->id = session->free_chan_id++;
+       chan_priv_init->session = session;
        /*
         * Note: the channel creation op already writes into the packet
         * headers. Therefore the "chan" information used as input
@@ -314,11 +317,9 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
        chan = transport->ops.channel_create("[lttng]", buf_addr,
                        subbuf_size, num_subbuf, switch_timer_interval,
                        read_timer_interval, shm_fd, wait_fd,
-                       memory_map_size);
+                       memory_map_size, chan_priv_init);
        if (!chan)
                goto create_error;
-       chan->session = session;
-       chan->id = session->free_chan_id++;
        chan->enabled = 1;
        chan->ops = &transport->ops;
        cds_list_add(&chan->list, &session->chan);
@@ -717,7 +718,7 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 
        ret = lttng_metadata_printf(session,
                "event {\n"
-               "       name = %s;\n"
+               "       name = \"%s\";\n"
                "       id = %u;\n"
                "       stream_id = %u;\n",
                event->desc->name,