X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=e9529f1bf9378dc46bb3ddeaa250b10fafaef249;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hp=84b3f20ed5420b03210e8c80c4f638f4f5072d3b;hpb=855060f867357c4ed856d7b5940cf77513f7fccf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 84b3f20ed..e9529f1bf 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -664,14 +664,13 @@ error:
 }
 
 /*
- * For each tracing session, update newly registered apps.
+ * For each tracing session, update newly registered apps. The session list
+ * lock MUST be acquired before calling this.
  */
 static void update_ust_app(int app_sock)
 {
 	struct ltt_session *sess, *stmp;
 
-	session_lock_list();
-
 	/* For all tracing session(s) */
 	cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
 		session_lock(sess);
@@ -680,8 +679,6 @@ static void update_ust_app(int app_sock)
 		}
 		session_unlock(sess);
 	}
-
-	session_unlock_list();
 }
 
 /*
@@ -1179,12 +1176,22 @@ static void *thread_manage_apps(void *data)
 
 					health_code_update();
 
+					/*
+					 * @session_lock
+					 * Lock the global session list so from the register up to
+					 * the registration done message, no thread can see the
+					 * application and change its state.
+					 */
+					session_lock_list();
+
 					/* Register applicaton to the session daemon */
 					ret = ust_app_register(&ust_cmd.reg_msg,
 							ust_cmd.sock);
 					if (ret == -ENOMEM) {
+						session_unlock_list();
 						goto error;
 					} else if (ret < 0) {
+						session_unlock_list();
 						break;
 					}
 
@@ -1220,6 +1227,7 @@ static void *thread_manage_apps(void *data)
 						ret = lttng_poll_add(&events, ust_cmd.sock,
 								LPOLLERR & LPOLLHUP & LPOLLRDHUP);
 						if (ret < 0) {
+							session_unlock_list();
 							goto error;
 						}
 
@@ -1232,6 +1240,7 @@ static void *thread_manage_apps(void *data)
 						DBG("Apps with sock %d added to poll set",
 								ust_cmd.sock);
 					}
+					session_unlock_list();
 
 					health_code_update();
 
@@ -2334,8 +2343,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			/* Start the kernel consumer daemon */
 			pthread_mutex_lock(&kconsumer_data.pid_mutex);
 			if (kconsumer_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER &&
-					cmd_ctx->session->start_consumer) {
+					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&kconsumer_data.pid_mutex);
 				ret = start_consumerd(&kconsumer_data);
 				if (ret < 0) {
@@ -2382,8 +2390,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
 			if (consumerd64_bin[0] != '\0' &&
 					ustconsumer64_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER &&
-					cmd_ctx->session->start_consumer) {
+					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
 				ret = start_consumerd(&ustconsumer64_data);
 				if (ret < 0) {
@@ -2411,8 +2418,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			/* 32-bit */
 			if (consumerd32_bin[0] != '\0' &&
 					ustconsumer32_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER &&
-					cmd_ctx->session->start_consumer) {
+					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
 				ret = start_consumerd(&ustconsumer32_data);
 				if (ret < 0) {
@@ -2476,6 +2482,21 @@ skip_domain:
 		}
 	}
 
+	/*
+	 * Send relayd information to consumer as soon as we have a domain and a
+	 * session defined.
+	 */
+	if (cmd_ctx->session && need_domain) {
+		/*
+		 * Setup relayd if not done yet. If the relayd information was already
+		 * sent to the consumer, this call will gracefully return.
+		 */
+		ret = cmd_setup_relayd(cmd_ctx->session);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+	}
+
 	/* Process by command type */
 	switch (cmd_ctx->lsm->cmd_type) {
 	case LTTNG_ADD_CONTEXT:
@@ -2506,41 +2527,12 @@ skip_domain:
 				cmd_ctx->lsm->u.disable.channel_name);
 		break;
 	}
-	case LTTNG_DISABLE_CONSUMER:
-	{
-		ret = cmd_disable_consumer(cmd_ctx->lsm->domain.type, cmd_ctx->session);
-		break;
-	}
 	case LTTNG_ENABLE_CHANNEL:
 	{
 		ret = cmd_enable_channel(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				&cmd_ctx->lsm->u.channel.chan, kernel_poll_pipe[1]);
 		break;
 	}
-	case LTTNG_ENABLE_CONSUMER:
-	{
-		/*
-		 * XXX: 0 means that this URI should be applied on the session. Should
-		 * be a DOMAIN enuam.
-		 */
-		ret = cmd_enable_consumer(cmd_ctx->lsm->domain.type, cmd_ctx->session);
-		if (ret != LTTNG_OK) {
-			goto error;
-		}
-
-		if (cmd_ctx->lsm->domain.type == 0) {
-			/* Add the URI for the UST session if a consumer is present. */
-			if (cmd_ctx->session->ust_session &&
-					cmd_ctx->session->ust_session->consumer) {
-				ret = cmd_enable_consumer(LTTNG_DOMAIN_UST, cmd_ctx->session);
-			} else if (cmd_ctx->session->kernel_session &&
-					cmd_ctx->session->kernel_session->consumer) {
-				ret = cmd_enable_consumer(LTTNG_DOMAIN_KERNEL,
-						cmd_ctx->session);
-			}
-		}
-		break;
-	}
 	case LTTNG_ENABLE_EVENT:
 	{
 		ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,