X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.c;h=00d61432e33aea82a3d77fe17a96bdf00fad2646;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hp=793ff0f7b8b92580be90a9cf0a5bf443e81e4c6a;hpb=ed52805d21fb7a55ad066d4591f6a5f02c2108ba;p=lttng-tools.git

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index 793ff0f7b..00d61432e 100644
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -24,7 +24,7 @@
 #include <lttngerr.h>
 #include <lttng-share.h>
 
-#include "hashtable.h"
+#include "../common/hashtable.h"
 #include "trace-ust.h"
 
 /*
@@ -63,18 +63,19 @@ struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
 	struct cds_lfht_iter iter;
 
 	rcu_read_lock();
-	node = hashtable_lookup(ht, (void *) name, strlen(name), &iter);
+	node = hashtable_lookup(ht, (void *)name, strlen(name), &iter);
 	if (node == NULL) {
 		rcu_read_unlock();
 		goto error;
 	}
 	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;
 }
 
@@ -83,22 +84,21 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
+struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
 		struct lttng_domain *domain)
 {
 	int ret;
 	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->id = session_id;
 	lus->start_trace = 0;
 
 	/* Alloc UST domain hash tables */
@@ -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;
 	}
 
@@ -158,14 +158,14 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	}
 
 	/* Copy channel name */
-	strncpy(luc->name, chan->name, sizeof(&luc->name));
+	strncpy(luc->name, chan->name, sizeof(luc->name));
 	luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	/* Init node */
 	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);
@@ -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;
 	}
 
@@ -212,6 +212,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	case LTTNG_EVENT_TRACEPOINT:
 		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
 		break;
+	case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
+		break;
 	default:
 		ERR("Unknown ust instrumentation type (%d)", ev->type);
 		goto error_free_event;
@@ -225,7 +228,9 @@ 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);
 
 	return lue;
 
@@ -247,7 +252,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;
 	}
 
@@ -275,6 +280,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.
  */
@@ -331,20 +362,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);
 }
 
 /*
@@ -473,7 +507,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	rcu_read_lock();
 
-	DBG2("Trace UST destroy session %d", session->uid);
+	DBG2("Trace UST destroy session %d", session->id);
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);