X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=43f750a820fbf7c087ca9e5df4d275b3cc065cc9;hp=792f519abbddb3cae7c2a1714a42ed96fff16361;hb=0658924ecc1b36649ec467474bb82db8032a80c0;hpb=f6151c55e2af06fe2204bcab62cc19e33964e5ce

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 792f519ab..43f750a82 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1216,6 +1216,9 @@ static void *thread_manage_consumer(void *data)
 
 	DBG("[thread] Manage consumer started");
 
+	rcu_register_thread();
+	rcu_thread_online();
+
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CONSUMER);
 
 	health_code_update();
@@ -1514,6 +1517,9 @@ error_poll:
 	health_unregister(health_sessiond);
 	DBG("consumer thread cleanup completed");
 
+	rcu_thread_offline();
+	rcu_unregister_thread();
+
 	return NULL;
 }
 
@@ -2025,6 +2031,22 @@ error:
 		free(wait_node);
 	}
 
+	/* Empty command queue. */
+	for (;;) {
+		/* Dequeue command for registration */
+		node = cds_wfcq_dequeue_blocking(&ust_cmd_queue.head, &ust_cmd_queue.tail);
+		if (node == NULL) {
+			break;
+		}
+		ust_cmd = caa_container_of(node, struct ust_command, node);
+		ret = close(ust_cmd->sock);
+		if (ret < 0) {
+			PERROR("close ust sock exit dispatch %d", ust_cmd->sock);
+		}
+		lttng_fd_put(LTTNG_FD_APPS, 1);
+		free(ust_cmd);
+	}
+
 error_testpoint:
 	DBG("Dispatch thread dying");
 	if (err) {
@@ -2157,6 +2179,10 @@ static void *thread_registration_apps(void *data)
 					ust_cmd = zmalloc(sizeof(struct ust_command));
 					if (ust_cmd == NULL) {
 						PERROR("ust command zmalloc");
+						ret = close(sock);
+						if (ret) {
+							PERROR("close");
+						}
 						goto error;
 					}
 
@@ -2713,7 +2739,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		 * domain.
 		 */
 		if (session->kernel_session->consumer) {
-			consumer_destroy_output(session->kernel_session->consumer);
+			consumer_output_put(session->kernel_session->consumer);
 		}
 		session->kernel_session->consumer =
 			consumer_copy_output(session->consumer);
@@ -2727,7 +2753,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 	case LTTNG_DOMAIN_UST:
 		DBG3("Copying tracing session consumer output in UST session");
 		if (session->ust_session->consumer) {
-			consumer_destroy_output(session->ust_session->consumer);
+			consumer_output_put(session->ust_session->consumer);
 		}
 		session->ust_session->consumer =
 			consumer_copy_output(session->consumer);
@@ -2847,7 +2873,7 @@ static int create_kernel_session(struct ltt_session *session)
 				session->kernel_session->consumer->dst.trace_path,
 				S_IRWXU | S_IRWXG, session->uid, session->gid);
 		if (ret < 0) {
-			if (ret != -EEXIST) {
+			if (errno != EEXIST) {
 				ERR("Trace directory creation error");
 				goto error;
 			}
@@ -3267,8 +3293,34 @@ skip_domain:
 	}
 	case LTTNG_DISABLE_EVENT:
 	{
+
+		/*
+		 * FIXME: handle filter; for now we just receive the filter's
+		 * bytecode along with the filter expression which are sent by
+		 * liblttng-ctl and discard them.
+		 *
+		 * This fixes an issue where the client may block while sending
+		 * the filter payload and encounter an error because the session
+		 * daemon closes the socket without ever handling this data.
+		 */
+		size_t count = cmd_ctx->lsm->u.disable.expression_len +
+			cmd_ctx->lsm->u.disable.bytecode_len;
+
+		if (count) {
+			char data[LTTNG_FILTER_MAX_LEN];
+
+			DBG("Discarding disable event command payload of size %zu", count);
+			while (count) {
+				ret = lttcomm_recv_unix_sock(sock, data,
+				        count > sizeof(data) ? sizeof(data) : count);
+				if (ret < 0) {
+					goto error;
+				}
+
+				count -= (size_t) ret;
+			}
+		}
 		/* FIXME: passing packed structure to non-packed pointer */
-		/* TODO: handle filter */
 		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.disable.channel_name,
 				&cmd_ctx->lsm->u.disable.event);
@@ -5937,6 +5989,10 @@ exit_apps:
 	}
 exit_reg_apps:
 
+	/*
+	 * Join dispatch thread after joining reg_apps_thread to ensure
+	 * we don't leak applications in the queue.
+	 */
 	ret = pthread_join(dispatch_thread, &status);
 	if (ret) {
 		errno = ret;
@@ -6002,6 +6058,9 @@ exit_options:
 	sessiond_cleanup_options();
 
 exit_set_signal_handler:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	if (!retval) {
 		exit(EXIT_SUCCESS);
 	} else {