Describe autotools/libtool/automake version dependency

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

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index 4df481c12e28d4ccecdbede01c65d01779674db2..1a1304ac1db9a16d0f3cfd5ca05ddbd9fd3cdc37 100644 (file)
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -98,7 +98,6 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
        }
 
        /* Init data structure */
-       lus->consumer_fds_sent = 0;
        lus->uid = uid;
        lus->start_trace = 0;
 
@@ -166,7 +165,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        hashtable_node_init(&luc->node, (void *) luc->name, strlen(luc->name));
        /* Alloc hash tables */
        luc->events = hashtable_new_str(0);
-       luc->ctx = hashtable_new_str(0);
+       luc->ctx = hashtable_new(0);
 
        /* Set trace output path */
        ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
@@ -226,7 +225,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        hashtable_node_init(&lue->node, (void *) lue->attr.name,
                        strlen(lue->attr.name));
        /* Alloc context hash tables */
-       lue->ctx = hashtable_new_str(0);
+       lue->ctx = hashtable_new(0);
 
        DBG2("Trace UST event %s created", lue->attr.name);
 
@@ -278,6 +277,32 @@ error:
        return NULL;
 }
 
+/*
+ * Allocate and initialize an UST context.
+ *
+ * Return pointer to structure or NULL.
+ */
+struct ltt_ust_context *trace_ust_create_context(
+               struct lttng_event_context *ctx)
+{
+       struct ltt_ust_context *uctx;
+
+       uctx = zmalloc(sizeof(struct ltt_ust_context));
+       if (uctx == NULL) {
+               PERROR("zmalloc ltt_ust_context");
+               goto error;
+       }
+
+       uctx->ctx.ctx = ctx->ctx;
+       hashtable_node_init(&uctx->node, (void *)((unsigned long) uctx->ctx.ctx),
+                               sizeof(void *));
+
+       return uctx;
+
+error:
+       return NULL;
+}
+
 /*
  * RCU safe free context structure.
  */