Fix --enable-lttng-ust configure option

[lttng-tools.git] / lttng-sessiond / trace-ust.c

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index 793ff0f7b8b92580be90a9cf0a5bf443e81e4c6a..20e3dc5f149127d16768ad45381c200fb27c2a03 100644 (file)
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -70,11 +70,12 @@ struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
        }
        rcu_read_unlock();
 
-       DBG2("Found UST event by name %s", name);
+       DBG2("Trace UST event found by name %s", name);
 
        return caa_container_of(node, struct ltt_ust_event, node);
 
 error:
+       DBG2("Trace UST event NOT found by name %s", name);
        return NULL;
 }
 
@@ -90,14 +91,13 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
        struct ltt_ust_session *lus;
 
        /* Allocate a new ltt ust session */
-       lus = malloc(sizeof(struct ltt_ust_session));
+       lus = zmalloc(sizeof(struct ltt_ust_session));
        if (lus == NULL) {
-               PERROR("create ust session malloc");
+               PERROR("create ust session zmalloc");
                goto error;
        }
 
        /* Init data structure */
-       lus->consumer_fds_sent = 0;
        lus->uid = uid;
        lus->start_trace = 0;
 
@@ -136,9 +136,9 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        int ret;
        struct ltt_ust_channel *luc;
 
-       luc = malloc(sizeof(struct ltt_ust_channel));
+       luc = zmalloc(sizeof(struct ltt_ust_channel));
        if (luc == NULL) {
-               perror("ltt_ust_channel malloc");
+               perror("ltt_ust_channel zmalloc");
                goto error;
        }
 
@@ -193,9 +193,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 {
        struct ltt_ust_event *lue;
 
-       lue = malloc(sizeof(struct ltt_ust_event));
+       lue = zmalloc(sizeof(struct ltt_ust_event));
        if (lue == NULL) {
-               PERROR("ust event malloc");
+               PERROR("ust event zmalloc");
                goto error;
        }
 
@@ -227,6 +227,8 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        /* Alloc context hash tables */
        lue->ctx = hashtable_new_str(0);
 
+       DBG2("Trace UST event %s created", lue->attr.name);
+
        return lue;
 
 error_free_event:
@@ -247,7 +249,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
        lum = zmalloc(sizeof(struct ltt_ust_metadata));
        if (lum == NULL) {
-               perror("ust metadata malloc");
+               perror("ust metadata zmalloc");
                goto error;
        }
 
@@ -331,20 +333,23 @@ static void destroy_event_rcu(struct rcu_head *head)
        trace_ust_destroy_event(event);
 }
 
-static void destroy_event(struct cds_lfht *ht)
+/*
+ * Cleanup UST events hashtable.
+ */
+static void destroy_event(struct cds_lfht *events)
 {
        int ret;
        struct cds_lfht_node *node;
        struct cds_lfht_iter iter;
 
-       cds_lfht_for_each(ht, &iter, node) {
-               ret = hashtable_del(ht, &iter);
+       cds_lfht_for_each(events, &iter, node) {
+               ret = hashtable_del(events, &iter);
                if (!ret) {
                        call_rcu(&node->head, destroy_event_rcu);
                }
        }
 
-       hashtable_destroy(ht);
+       hashtable_destroy(events);
 }
 
 /*