X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=e07d27e678b93c718ff3dee1378706b3382a3692;hb=2223c96f0eecce28fe221eb19de4333156492337;hp=962255b5c930989100600592253e56589b1fe22d;hpb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 962255b5c..e07d27e67 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -26,6 +26,11 @@
 
 #include "trace-ust.h"
 
+/*
+ * Match function for the events hash table lookup.
+ *
+ * Matches by name only. Used by the disable command.
+ */
 int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
 		const void *_key)
 {
@@ -43,13 +48,19 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
 		goto no_match;
 	}
 
-	/* Match. */
+	/* Match */
 	return 1;
 
 no_match:
 	return 0;
 }
 
+/*
+ * Match function for the hash table lookup.
+ *
+ * It matches an ust event based on three attributes which are the event name,
+ * the filter bytecode and the loglevel.
+ */
 int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
 {
 	struct ltt_ust_event *event;
@@ -65,59 +76,48 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
 
 	/* Event name */
 	if (strncmp(event->attr.name, key->name, sizeof(event->attr.name)) != 0) {
-		DBG3("[Match] name failed: %s and %s",
-				event->attr.name, key->name);
 		goto no_match;
 	}
 
 	/* Event loglevel. */
 	if (event->attr.loglevel != key->loglevel) {
-		if (event->attr.loglevel_type == 0 && key->loglevel == 0 &&
-				event->attr.loglevel == -1) {
+		if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
+				&& key->loglevel == 0 && event->attr.loglevel == -1) {
 			/*
-			 * This is because on event creation, the loglevel is set to -1 if
-			 * the event loglevel type is ALL so 0 and -1 are accepted for this
-			 * loglevel type.
+			 * Match is accepted. This is because on event creation, the
+			 * loglevel is set to -1 if the event loglevel type is ALL so 0 and
+			 * -1 are accepted for this loglevel type since 0 is the one set by
+			 * the API when receiving an enable event.
 			 */
 		} else {
-			DBG3("[Match] loglevel failed: %d and %d",
-					event->attr.loglevel, key->loglevel);
 			goto no_match;
 		}
 	}
 
 	/* Only one of the filters is NULL, fail. */
 	if ((key->filter && !event->filter) || (!key->filter && event->filter)) {
-		DBG3("[Match] filters failed: k:%p and e:%p",
-				key->filter, event->filter);
 		goto no_match;
 	}
 
-	/* Both filters are NULL, success. */
-	if (!key->filter && !event->filter) {
-		goto match;
-	}
-
-	/* Both filters exists, check length followed by the bytecode. */
-	if (event->filter->len == key->filter->len &&
-			memcmp(event->filter->data, key->filter->data,
-				event->filter->len) == 0) {
-		goto match;
+	if (key->filter && event->filter) {
+		/* Both filters exists, check length followed by the bytecode. */
+		if (event->filter->len != key->filter->len ||
+				memcmp(event->filter->data, key->filter->data,
+					event->filter->len) != 0) {
+			goto no_match;
+		}
 	}
 
-	DBG3("[Match] filters failed: k:%p and e:%p",
-			key->filter, event->filter);
+	/* Match. */
+	return 1;
 
 no_match:
 	return 0;
-
-match:
-	DBG3("[MATCH] %s", key->name);
-	return 1;
 }
 
 /*
- * Find the channel in the hashtable.
+ * Find the channel in the hashtable and return channel pointer. RCU read side
+ * lock MUST be acquired before calling this.
  */
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 		char *name)
@@ -125,14 +125,11 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
-	rcu_read_lock();
 	lttng_ht_lookup(ht, (void *)name, &iter);
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
-		rcu_read_unlock();
 		goto error;
 	}
-	rcu_read_unlock();
 
 	DBG2("Trace UST channel %s found by name", name);
 
@@ -144,7 +141,8 @@ error:
 }
 
 /*
- * Find the event in the hashtable.
+ * Find the event in the hashtable and return event pointer. RCU read side lock
+ * MUST be acquired before calling this.
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 		char *name, struct lttng_filter_bytecode *filter, int loglevel)
@@ -152,7 +150,6 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 	struct ltt_ust_ht_key key;
-	void *orig_match_fct;
 
 	assert(name);
 	assert(ht);
@@ -161,10 +158,6 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 	key.filter = filter;
 	key.loglevel = loglevel;
 
-	/* Save match function so we can use the ust app event match. */
-	orig_match_fct = (void *) ht->match_fct;
-	ht->match_fct = trace_ust_ht_match_event;
-
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
 			trace_ust_ht_match_event, &key, &iter.iter);
 	node = lttng_ht_iter_get_node_str(&iter);
@@ -178,8 +171,6 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 
 error:
 	DBG2("Trace UST event %s NOT found", key.name);
-	/* Put back original match function. */
-	ht->match_fct = orig_match_fct;
 	return NULL;
 }
 
@@ -189,9 +180,8 @@ error:
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,
-		unsigned int session_id, struct lttng_domain *domain)
+		unsigned int session_id)
 {
-	int ret;
 	struct ltt_ust_session *lus;
 
 	/* Allocate a new ltt ust session */
@@ -227,6 +217,8 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
 
 	/* Use the default consumer output which is the tracing session path. */
 	if (path && strlen(path) > 0) {
+		int ret;
+
 		ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
 				"%s" DEFAULT_UST_TRACE_DIR, path);
 		if (ret < 0) {
@@ -269,6 +261,9 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 	int ret;
 	struct ltt_ust_channel *luc;
 
+	assert(chan);
+	assert(path);
+
 	luc = zmalloc(sizeof(struct ltt_ust_channel));
 	if (luc == NULL) {
 		PERROR("ltt_ust_channel zmalloc");
@@ -324,10 +319,13 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
+struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+		struct lttng_filter_bytecode *filter)
 {
 	struct ltt_ust_event *lue;
 
+	assert(ev);
+
 	lue = zmalloc(sizeof(struct ltt_ust_event));
 	if (lue == NULL) {
 		PERROR("ust event zmalloc");
@@ -374,6 +372,8 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 		goto error_free_event;
 	}
 
+	/* Same layout. */
+	lue->filter = (struct lttng_ust_filter_bytecode *) filter;
 
 	/* Init node */
 	lttng_ht_node_init_str(&lue->node, lue->attr.name);
@@ -400,6 +400,8 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 	int ret;
 	struct ltt_ust_metadata *lum;
 
+	assert(path);
+
 	lum = zmalloc(sizeof(struct ltt_ust_metadata));
 	if (lum == NULL) {
 		PERROR("ust metadata zmalloc");
@@ -441,6 +443,8 @@ struct ltt_ust_context *trace_ust_create_context(
 	struct ltt_ust_context *uctx;
 	enum lttng_ust_context_type utype;
 
+	assert(ctx);
+
 	switch (ctx->ctx) {
 	case LTTNG_EVENT_CONTEXT_VTID:
 		utype = LTTNG_UST_CONTEXT_VTID;
@@ -496,6 +500,8 @@ static void destroy_contexts(struct lttng_ht *ht)
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
 
+	assert(ht);
+
 	cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) {
 		ret = lttng_ht_del(ht, &iter);
 		if (!ret) {
@@ -511,6 +517,8 @@ static void destroy_contexts(struct lttng_ht *ht)
  */
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
+	assert(event);
+
 	DBG2("Trace destroy UST event %s", event->attr.name);
 	free(event->filter);
 	free(event);
@@ -538,6 +546,8 @@ static void destroy_events(struct lttng_ht *events)
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
+	assert(events);
+
 	cds_lfht_for_each_entry(events->ht, &iter.iter, node, node) {
 		ret = lttng_ht_del(events, &iter);
 		assert(!ret);
@@ -552,6 +562,8 @@ static void destroy_events(struct lttng_ht *events)
  */
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {
+	assert(channel);
+
 	DBG2("Trace destroy UST channel %s", channel->name);
 
 	rcu_read_lock();
@@ -584,6 +596,8 @@ static void destroy_channel_rcu(struct rcu_head *head)
  */
 void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
 {
+	assert(metadata);
+
 	if (!metadata->handle) {
 		return;
 	}
@@ -600,6 +614,8 @@ static void destroy_channels(struct lttng_ht *channels)
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
+	assert(channels);
+
 	rcu_read_lock();
 
 	cds_lfht_for_each_entry(channels->ht, &iter.iter, node, node) {
@@ -622,6 +638,8 @@ static void destroy_domain_pid(struct lttng_ht *ht)
 	struct lttng_ht_iter iter;
 	struct ltt_ust_domain_pid *dpid;
 
+	assert(ht);
+
 	cds_lfht_for_each_entry(ht->ht, &iter.iter, dpid, node.node) {
 		ret = lttng_ht_del(ht , &iter);
 		assert(!ret);
@@ -640,6 +658,8 @@ static void destroy_domain_exec(struct lttng_ht *ht)
 	struct lttng_ht_iter iter;
 	struct ltt_ust_domain_exec *dexec;
 
+	assert(ht);
+
 	cds_lfht_for_each_entry(ht->ht, &iter.iter, dexec, node.node) {
 		ret = lttng_ht_del(ht , &iter);
 		assert(!ret);
@@ -654,6 +674,8 @@ static void destroy_domain_exec(struct lttng_ht *ht)
  */
 static void destroy_domain_global(struct ltt_ust_domain_global *dom)
 {
+	assert(dom);
+
 	destroy_channels(dom->channels);
 }
 
@@ -662,10 +684,7 @@ static void destroy_domain_global(struct ltt_ust_domain_global *dom)
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
-	/* Extra protection */
-	if (session == NULL) {
-		return;
-	}
+	assert(session);
 
 	rcu_read_lock();