X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=d292779d156dca47d2ce1d861ac35d216811d731;hp=e496a5f5548f78975fba58d773da3c8aa45d8d58;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=3a6922c6ab7b4d9455f517ac0bf86dfcede0ef3d

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index e496a5f55..d292779d1 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -41,6 +41,8 @@
 #include "ust-ctl.h"
 #include "utils.h"
 #include "session.h"
+#include "lttng-sessiond.h"
+#include "notification-thread-commands.h"
 
 static
 int ust_app_flush_app_session(struct ust_app *app, struct ust_app_session *ua_sess);
@@ -482,7 +484,8 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 		/* Wipe and free registry from session registry. */
 		registry = get_session_registry(ua_chan->session);
 		if (registry) {
-			ust_registry_channel_del_free(registry, ua_chan->key);
+			ust_registry_channel_del_free(registry, ua_chan->key,
+				true);
 		}
 		save_per_pid_lost_discarded_counters(ua_chan);
 	}
@@ -566,18 +569,6 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
 		return 0;
 	}
 
-	/*
-	 * On a push metadata error either the consumer is dead or the
-	 * metadata channel has been destroyed because its endpoint
-	 * might have died (e.g: relayd), or because the application has
-	 * exited. If so, the metadata closed flag is set to 1 so we
-	 * deny pushing metadata again which is not valid anymore on the
-	 * consumer side.
-	 */
-	if (registry->metadata_closed) {
-		return -EPIPE;
-	}
-
 	offset = registry->metadata_len_sent;
 	len = registry->metadata_len - registry->metadata_len_sent;
 	new_metadata_len_sent = registry->metadata_len;
@@ -1805,6 +1796,7 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan,
 	ua_chan->attr.overwrite = uchan->attr.overwrite;
 	ua_chan->attr.switch_timer_interval = uchan->attr.switch_timer_interval;
 	ua_chan->attr.read_timer_interval = uchan->attr.read_timer_interval;
+	ua_chan->monitor_timer_interval = uchan->monitor_timer_interval;
 	ua_chan->attr.output = uchan->attr.output;
 	/*
 	 * Note that the attribute channel type is not set since the channel on the
@@ -2851,6 +2843,7 @@ static int create_channel_per_uid(struct ust_app *app,
 	int ret;
 	struct buffer_reg_uid *reg_uid;
 	struct buffer_reg_channel *reg_chan;
+	bool created = false;
 
 	assert(app);
 	assert(usess);
@@ -2894,7 +2887,7 @@ static int create_channel_per_uid(struct ust_app *app,
 			 * it's not visible anymore in the session registry.
 			 */
 			ust_registry_channel_del_free(reg_uid->registry->reg.ust,
-					ua_chan->tracing_channel_id);
+					ua_chan->tracing_channel_id, false);
 			buffer_reg_channel_remove(reg_uid->registry, reg_chan);
 			buffer_reg_channel_destroy(reg_chan, LTTNG_DOMAIN_UST);
 			goto error;
@@ -2910,7 +2903,7 @@ static int create_channel_per_uid(struct ust_app *app,
 				ua_chan->name);
 			goto error;
 		}
-
+		created = true;
 	}
 
 	/* Send buffers to the application. */
@@ -2922,6 +2915,41 @@ static int create_channel_per_uid(struct ust_app *app,
 		goto error;
 	}
 
+	if (created) {
+		enum lttng_error_code cmd_ret;
+		struct ltt_session *session;
+		uint64_t chan_reg_key;
+		struct ust_registry_channel *chan_reg;
+
+		rcu_read_lock();
+		chan_reg_key = ua_chan->tracing_channel_id;
+
+		pthread_mutex_lock(&reg_uid->registry->reg.ust->lock);
+		chan_reg = ust_registry_channel_find(reg_uid->registry->reg.ust,
+				chan_reg_key);
+		assert(chan_reg);
+		chan_reg->consumer_key = ua_chan->key;
+		chan_reg = NULL;
+		pthread_mutex_unlock(&reg_uid->registry->reg.ust->lock);
+
+		session = session_find_by_id(ua_sess->tracing_id);
+		assert(session);
+
+		cmd_ret = notification_thread_command_add_channel(
+				notification_thread_handle, session->name,
+				ua_sess->euid, ua_sess->egid,
+				ua_chan->name,
+				ua_chan->key,
+				LTTNG_DOMAIN_UST,
+				ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
+		rcu_read_unlock();
+		if (cmd_ret != LTTNG_OK) {
+			ret = - (int) cmd_ret;
+			ERR("Failed to add channel to notification thread");
+			goto error;
+		}
+	}
+
 error:
 	return ret;
 }
@@ -2937,6 +2965,10 @@ static int create_channel_per_pid(struct ust_app *app,
 {
 	int ret;
 	struct ust_registry_session *registry;
+	enum lttng_error_code cmd_ret;
+	struct ltt_session *session;
+	uint64_t chan_reg_key;
+	struct ust_registry_channel *chan_reg;
 
 	assert(app);
 	assert(usess);
@@ -2975,6 +3007,29 @@ static int create_channel_per_pid(struct ust_app *app,
 		goto error;
 	}
 
+	session = session_find_by_id(ua_sess->tracing_id);
+	assert(session);
+
+	chan_reg_key = ua_chan->key;
+	pthread_mutex_lock(&registry->lock);
+	chan_reg = ust_registry_channel_find(registry, chan_reg_key);
+	assert(chan_reg);
+	chan_reg->consumer_key = ua_chan->key;
+	pthread_mutex_unlock(&registry->lock);
+
+	cmd_ret = notification_thread_command_add_channel(
+			notification_thread_handle, session->name,
+			ua_sess->euid, ua_sess->egid,
+			ua_chan->name,
+			ua_chan->key,
+			LTTNG_DOMAIN_UST,
+			ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
+	if (cmd_ret != LTTNG_OK) {
+		ret = - (int) cmd_ret;
+		ERR("Failed to add channel to notification thread");
+		goto error;
+	}
+
 error:
 	rcu_read_unlock();
 	return ret;
@@ -3087,7 +3142,6 @@ static int create_ust_app_channel(struct ust_app_session *ua_sess,
 
 	/* Only add the channel if successful on the tracer side. */
 	lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
-
 end:
 	if (ua_chanp) {
 		*ua_chanp = ua_chan;