X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=fe4a898bc6d349dfd866218e597d77ef12a746aa;hb=719af1bb6e6719c6170e059a7e473aa7923ddae9;hp=62e149ed2cbdaf574968cbbe93659c48c8907db3;hpb=c7759e6a503ebd197dd6a84de0eeaa52fbd0e81f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 62e149ed2..fe4a898bc 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -61,6 +61,7 @@
 #include "lttng-relayd.h"
 #include "live.h"
 #include "health-relayd.h"
+#include "testpoint.h"
 
 /* command line options */
 char *opt_output_path;
@@ -90,7 +91,7 @@ const char * const config_section_name = "relayd";
  * Quit pipe for all threads. This permits a single cancellation point
  * for all threads when receiving an event on the pipe.
  */
-static int thread_quit_pipe[2] = { -1, -1 };
+int thread_quit_pipe[2] = { -1, -1 };
 
 /*
  * This pipe is used to inform the worker thread that a command is queued and
@@ -753,6 +754,10 @@ void *relay_thread_listener(void *data)
 
 	lttng_relay_notify_ready();
 
+	if (testpoint(relayd_thread_listener)) {
+		goto error_testpoint;
+	}
+
 	while (1) {
 		health_code_update();
 
@@ -853,6 +858,7 @@ restart:
 exit:
 error:
 error_poll_add:
+error_testpoint:
 	lttng_poll_clean(&events);
 error_create_poll:
 	if (data_sock->fd >= 0) {
@@ -896,6 +902,10 @@ void *relay_thread_dispatcher(void *data)
 
 	health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER);
 
+	if (testpoint(relayd_thread_dispatcher)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
@@ -942,6 +952,7 @@ void *relay_thread_dispatcher(void *data)
 	err = 0;
 
 error:
+error_testpoint:
 	if (err) {
 		health_error();
 		ERR("Health error occurred in %s", __func__);
@@ -1154,6 +1165,10 @@ int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
 	reply.session_id = htobe64(session->id);
 
 	switch (cmd->minor) {
+		case 1:
+		case 2:
+		case 3:
+			break;
 		case 4: /* LTTng sessiond 2.4 */
 		default:
 			ret = cmd_create_session_2_4(cmd, session);
@@ -2560,6 +2575,10 @@ void *relay_thread_worker(void *data)
 
 	health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER);
 
+	if (testpoint(relayd_thread_worker)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	/* table of connections indexed on socket */
@@ -2821,6 +2840,7 @@ relay_connections_ht_error:
 	}
 	DBG("Worker thread cleanup complete");
 	free(data_buffer);
+error_testpoint:
 	if (err) {
 		health_error();
 		ERR("Health error occurred in %s", __func__);
@@ -2998,7 +3018,7 @@ int main(int argc, char **argv)
 		goto exit_listener;
 	}
 
-	ret = live_start_threads(live_uri, relay_ctx, thread_quit_pipe);
+	ret = live_start_threads(live_uri, relay_ctx);
 	if (ret != 0) {
 		ERR("Starting live viewer threads");
 		goto exit_live;