X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b1229e7214828af2fcb260c3983d0e4d7e3cd1be;hb=db66e57489e5014289dc1d831e1eac90ac4fc0da;hp=a6c45c2ed90942e03ba45a36f79a9ca6af538112;hpb=c996624c35518e5c90bcafbbfee5c9bcade1da49;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a6c45c2ed..b1229e721 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -73,6 +73,7 @@
 #include "load-session-thread.h"
 #include "notification-thread.h"
 #include "notification-thread-commands.h"
+#include "rotation-thread.h"
 #include "syscall.h"
 #include "agent.h"
 #include "ht-cleanup.h"
@@ -106,6 +107,7 @@ static struct consumer_data kconsumer_data = {
 	.err_sock = -1,
 	.cmd_sock = -1,
 	.channel_monitor_pipe = -1,
+	.channel_rotate_pipe = -1,
 	.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
 	.lock = PTHREAD_MUTEX_INITIALIZER,
 	.cond = PTHREAD_COND_INITIALIZER,
@@ -116,6 +118,7 @@ static struct consumer_data ustconsumer64_data = {
 	.err_sock = -1,
 	.cmd_sock = -1,
 	.channel_monitor_pipe = -1,
+	.channel_rotate_pipe = -1,
 	.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
 	.lock = PTHREAD_MUTEX_INITIALIZER,
 	.cond = PTHREAD_COND_INITIALIZER,
@@ -126,6 +129,7 @@ static struct consumer_data ustconsumer32_data = {
 	.err_sock = -1,
 	.cmd_sock = -1,
 	.channel_monitor_pipe = -1,
+	.channel_rotate_pipe = -1,
 	.pid_mutex = PTHREAD_MUTEX_INITIALIZER,
 	.lock = PTHREAD_MUTEX_INITIALIZER,
 	.cond = PTHREAD_COND_INITIALIZER,
@@ -205,6 +209,7 @@ static pthread_t ht_cleanup_thread;
 static pthread_t agent_reg_thread;
 static pthread_t load_session_thread;
 static pthread_t notification_thread;
+static pthread_t rotation_thread;
 
 /*
  * UST registration command queue. This queue is tied with a futex and uses a N
@@ -285,6 +290,9 @@ struct load_session_thread_data *load_info;
 /* Notification thread handle. */
 struct notification_thread_handle *notification_thread_handle;
 
+/* Rotation thread handle. */
+struct rotation_thread_handle *rotation_thread_handle;
+
 /* Global hash tables */
 struct lttng_ht *agent_apps_ht_by_sock = NULL;
 
@@ -294,7 +302,7 @@ struct lttng_ht *agent_apps_ht_by_sock = NULL;
  * NR_LTTNG_SESSIOND_READY must match the number of calls to
  * sessiond_notify_ready().
  */
-#define NR_LTTNG_SESSIOND_READY		4
+#define NR_LTTNG_SESSIOND_READY		5
 int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY;
 
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events)
@@ -471,6 +479,24 @@ static void close_consumer_sockets(void)
 			PERROR("UST consumerd64 channel monitor pipe close");
 		}
 	}
+	if (kconsumer_data.channel_rotate_pipe >= 0) {
+		ret = close(kconsumer_data.channel_rotate_pipe);
+		if (ret < 0) {
+			PERROR("kernel consumer channel rotate pipe close");
+		}
+	}
+	if (ustconsumer32_data.channel_rotate_pipe >= 0) {
+		ret = close(ustconsumer32_data.channel_rotate_pipe);
+		if (ret < 0) {
+			PERROR("UST consumerd32 channel rotate pipe close");
+		}
+	}
+	if (ustconsumer64_data.channel_rotate_pipe >= 0) {
+		ret = close(ustconsumer64_data.channel_rotate_pipe);
+		if (ret < 0) {
+			PERROR("UST consumerd64 channel rotate pipe close");
+		}
+	}
 }
 
 /*
@@ -1266,8 +1292,9 @@ restart:
 	health_code_update();
 
 	/*
-	 * Transfer the write-end of the channel monitoring pipe to the
-	 * by issuing a SET_CHANNEL_MONITOR_PIPE command.
+	 * Transfer the write-end of the channel monitoring and rotate pipe
+	 * to the consumer by issuing a SET_CHANNEL_MONITOR_PIPE and
+	 * SET_CHANNEL_ROTATE_PIPE commands.
 	 */
 	cmd_socket_wrapper = consumer_allocate_socket(&consumer_data->cmd_sock);
 	if (!cmd_socket_wrapper) {
@@ -1280,6 +1307,13 @@ restart:
 	if (ret) {
 		goto error;
 	}
+
+	ret = consumer_send_channel_rotate_pipe(cmd_socket_wrapper,
+			consumer_data->channel_rotate_pipe);
+	if (ret) {
+		goto error;
+	}
+
 	/* Discard the socket wrapper as it is no longer needed. */
 	consumer_destroy_socket(cmd_socket_wrapper);
 	cmd_socket_wrapper = NULL;
@@ -5447,6 +5481,10 @@ int main(int argc, char **argv)
 			*ust64_channel_monitor_pipe = NULL,
 			*kernel_channel_monitor_pipe = NULL;
 	bool notification_thread_running = false;
+	bool rotation_thread_running = false;
+	struct lttng_pipe *ust32_channel_rotate_pipe = NULL,
+			*ust64_channel_rotate_pipe = NULL,
+			*kernel_channel_rotate_pipe = NULL;
 
 	init_kernel_workarounds();
 
@@ -5594,6 +5632,19 @@ int main(int argc, char **argv)
 			retval = -1;
 			goto exit_init_data;
 		}
+		kernel_channel_rotate_pipe = lttng_pipe_open(0);
+		if (!kernel_channel_rotate_pipe) {
+			ERR("Failed to create kernel consumer channel rotate pipe");
+			retval = -1;
+			goto exit_init_data;
+		}
+		kconsumer_data.channel_rotate_pipe =
+				lttng_pipe_release_writefd(
+					kernel_channel_rotate_pipe);
+		if (kconsumer_data.channel_rotate_pipe < 0) {
+			retval = -1;
+			goto exit_init_data;
+		}
 	}
 
 	lockfile_fd = create_lockfile();
@@ -5618,6 +5669,19 @@ int main(int argc, char **argv)
 		retval = -1;
 		goto exit_init_data;
 	}
+	ust32_channel_rotate_pipe = lttng_pipe_open(0);
+	if (!ust32_channel_rotate_pipe) {
+		ERR("Failed to create 32-bit user space consumer channel rotate pipe");
+		retval = -1;
+		goto exit_init_data;
+	}
+	ustconsumer32_data.channel_rotate_pipe = lttng_pipe_release_writefd(
+			ust32_channel_rotate_pipe);
+	if (ustconsumer32_data.channel_rotate_pipe < 0) {
+		retval = -1;
+		goto exit_init_data;
+	}
+
 
 	ust64_channel_monitor_pipe = lttng_pipe_open(0);
 	if (!ust64_channel_monitor_pipe) {
@@ -5631,6 +5695,18 @@ int main(int argc, char **argv)
 		retval = -1;
 		goto exit_init_data;
 	}
+	ust64_channel_rotate_pipe = lttng_pipe_open(0);
+	if (!ust64_channel_rotate_pipe) {
+		ERR("Failed to create 64-bit user space consumer channel rotate pipe");
+		retval = -1;
+		goto exit_init_data;
+	}
+	ustconsumer64_data.channel_rotate_pipe = lttng_pipe_release_writefd(
+			ust64_channel_rotate_pipe);
+	if (ustconsumer64_data.channel_rotate_pipe < 0) {
+		retval = -1;
+		goto exit_init_data;
+	}
 
 	/*
 	 * See if daemon already exist.
@@ -5824,6 +5900,31 @@ int main(int argc, char **argv)
 	}
 	notification_thread_running = true;
 
+	/* rotation_thread_data acquires the pipes' read side. */
+	rotation_thread_handle = rotation_thread_handle_create(
+			ust32_channel_rotate_pipe,
+			ust64_channel_rotate_pipe,
+			kernel_channel_rotate_pipe,
+			thread_quit_pipe[0]);
+	if (!rotation_thread_handle) {
+		retval = -1;
+		ERR("Failed to create rotation thread shared data");
+		stop_threads();
+		goto exit_rotation;
+	}
+	rotation_thread_running = true;
+
+	/* Create rotation thread. */
+	ret = pthread_create(&rotation_thread, default_pthread_attr(),
+			thread_rotation, rotation_thread_handle);
+	if (ret) {
+		errno = ret;
+		PERROR("pthread_create rotation");
+		retval = -1;
+		stop_threads();
+		goto exit_rotation;
+	}
+
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&client_thread, default_pthread_attr(),
 			thread_manage_clients, (void *) NULL);
@@ -5990,6 +6091,7 @@ exit_dispatch:
 	}
 
 exit_client:
+exit_rotation:
 exit_notification:
 	ret = pthread_join(health_thread, &status);
 	if (ret) {
@@ -6039,6 +6141,18 @@ exit_init_data:
 		notification_thread_handle_destroy(notification_thread_handle);
 	}
 
+	if (rotation_thread_handle) {
+		if (rotation_thread_running) {
+			ret = pthread_join(rotation_thread, &status);
+			if (ret) {
+				errno = ret;
+				PERROR("pthread_join rotation thread");
+				retval = -1;
+			}
+		}
+		rotation_thread_handle_destroy(rotation_thread_handle);
+	}
+
 	rcu_thread_offline();
 	rcu_unregister_thread();
 
@@ -6049,6 +6163,9 @@ exit_init_data:
 	lttng_pipe_destroy(ust32_channel_monitor_pipe);
 	lttng_pipe_destroy(ust64_channel_monitor_pipe);
 	lttng_pipe_destroy(kernel_channel_monitor_pipe);
+	lttng_pipe_destroy(ust32_channel_rotate_pipe);
+	lttng_pipe_destroy(ust64_channel_rotate_pipe);
+	lttng_pipe_destroy(kernel_channel_rotate_pipe);
 exit_ht_cleanup:
 
 	health_app_destroy(health_sessiond);