X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=163767d15cb8ef70101b9428f269b321c1c6ae57;hb=1083b49aa3c4914193157ca25978c01f4f8bca4c;hp=5db8366ad6edf01d270f06182291daf686791e18;hpb=cf771fa9335f4b9a9b4ddf8bca2da155de5283a1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 5db8366ad..163767d15 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -116,14 +116,12 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 {
 	struct ust_app_event *event;
 	const struct ust_app_ht_key *key;
-	int ev_loglevel_value;
 
 	assert(node);
 	assert(_key);
 
 	event = caa_container_of(node, struct ust_app_event, node.node);
 	key = _key;
-	ev_loglevel_value = event->attr.loglevel;
 
 	/* Match the 4 elements of the key: name, filter, loglevel, exclusions */
 
@@ -133,19 +131,10 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 	}
 
 	/* Event loglevel. */
-	if (ev_loglevel_value != key->loglevel_type) {
-		if (event->attr.loglevel_type == LTTNG_UST_ABI_LOGLEVEL_ALL
-				&& key->loglevel_type == 0 &&
-				ev_loglevel_value == -1) {
-			/*
-			 * 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 {
-			goto no_match;
-		}
+	if (!loglevels_match(event->attr.loglevel_type, event->attr.loglevel,
+			    key->loglevel_type, key->loglevel_value,
+			    LTTNG_UST_ABI_LOGLEVEL_ALL)) {
+		goto no_match;
 	}
 
 	/* One of the filters is NULL, fail. */
@@ -202,7 +191,9 @@ static void add_unique_ust_app_event(struct ust_app_channel *ua_chan,
 	ht = ua_chan->events;
 	key.name = event->attr.name;
 	key.filter = event->filter;
-	key.loglevel_type = event->attr.loglevel;
+	key.loglevel_type = (enum lttng_ust_abi_loglevel_type)
+					    event->attr.loglevel_type;
+	key.loglevel_value = event->attr.loglevel;
 	key.exclusion = event->exclusion;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
@@ -1499,7 +1490,9 @@ error:
  * Return an ust_app_event object or NULL on error.
  */
 static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht,
-		const char *name, const struct lttng_bytecode *filter,
+		const char *name,
+		const struct lttng_bytecode *filter,
+		enum lttng_ust_abi_loglevel_type loglevel_type,
 		int loglevel_value,
 		const struct lttng_event_exclusion *exclusion)
 {
@@ -1514,7 +1507,8 @@ static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht,
 	/* Setup key for event lookup. */
 	key.name = name;
 	key.filter = filter;
-	key.loglevel_type = loglevel_value;
+	key.loglevel_type = loglevel_type;
+	key.loglevel_value = loglevel_value;
 	/* lttng_event_exclusion and lttng_ust_event_exclusion structures are similar */
 	key.exclusion = exclusion;
 
@@ -3317,7 +3311,7 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *buf_reg_chan,
 	/* Send all streams to application. */
 	pthread_mutex_lock(&buf_reg_chan->stream_list_lock);
 	cds_list_for_each_entry(reg_stream, &buf_reg_chan->streams, lnode) {
-		struct ust_app_stream stream;
+		struct ust_app_stream stream = {};
 
 		ret = duplicate_stream_object(reg_stream, &stream);
 		if (ret < 0) {
@@ -3334,8 +3328,8 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *buf_reg_chan,
 				 * Treat this the same way as an application
 				 * that is exiting.
 				 */
-				WARN("Communication with application %d timed out on send_stream for stream \"%s\" of channel \"%s\" of session \"%" PRIu64 "\".",
-						app->pid, stream.name,
+				WARN("Communication with application %d timed out on send_stream for stream of channel \"%s\" of session \"%" PRIu64 "\".",
+						app->pid,
 						ua_chan->name,
 						ua_sess->tracing_id);
 				ret = -ENOTCONN;
@@ -4841,9 +4835,11 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
 		}
 		ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
 
-		ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-				uevent->filter, uevent->attr.loglevel,
-				uevent->exclusion);
+		ua_event = find_ust_app_event(ua_chan->events,
+				uevent->attr.name, uevent->filter,
+				(enum lttng_ust_abi_loglevel_type)
+						uevent->attr.loglevel_type,
+				uevent->attr.loglevel, uevent->exclusion);
 		if (ua_event == NULL) {
 			DBG2("Event %s not found in channel %s for app pid %d."
 					"Skipping", uevent->attr.name, uchan->name, app->pid);
@@ -5001,8 +4997,11 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess,
 		ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
 
 		/* Get event node */
-		ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-				uevent->filter, uevent->attr.loglevel, uevent->exclusion);
+		ua_event = find_ust_app_event(ua_chan->events,
+				uevent->attr.name, uevent->filter,
+				(enum lttng_ust_abi_loglevel_type)
+						uevent->attr.loglevel_type,
+				uevent->attr.loglevel, uevent->exclusion);
 		if (ua_event == NULL) {
 			DBG3("UST app enable event %s not found for app PID %d."
 					"Skipping app", uevent->attr.name, app->pid);
@@ -5776,7 +5775,10 @@ int ust_app_channel_synchronize_event(struct ust_app_channel *ua_chan,
 	struct ust_app_event *ua_event = NULL;
 
 	ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-		uevent->filter, uevent->attr.loglevel, uevent->exclusion);
+			uevent->filter,
+			(enum lttng_ust_abi_loglevel_type)
+					uevent->attr.loglevel_type,
+			uevent->attr.loglevel, uevent->exclusion);
 	if (!ua_event) {
 		ret = create_ust_app_event(ua_sess, ua_chan, uevent, app);
 		if (ret < 0) {