X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=237a2cf8d75a3f3ee8dc1a68c7c63dfccc1526b2;hp=7dd652abc38b62994d9ed9c1c9df8a663fedabca;hb=4cec016f4a1cb76ec3d917c2d261c4081910a65a;hpb=601d5acf42ebdb05ff8aa19f12fd9bdad3602781

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7dd652abc..237a2cf8d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -59,7 +59,6 @@
 #include "ust-consumer.h"
 #include "utils.h"
 #include "fd-limit.h"
-#include "filter.h"
 #include "health.h"
 #include "testpoint.h"
 
@@ -462,7 +461,7 @@ static void cleanup(void)
 static int send_unix_sock(int sock, void *buf, size_t len)
 {
 	/* Check valid length */
-	if (len <= 0) {
+	if (len == 0) {
 		return -1;
 	}
 
@@ -634,7 +633,7 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 						assert(socket->fd >= 0);
 
 						pthread_mutex_lock(socket->lock);
-						ret = kernel_consumer_send_channel_stream(socket->fd,
+						ret = kernel_consumer_send_channel_stream(socket,
 								channel, ksess);
 						pthread_mutex_unlock(socket->lock);
 						if (ret < 0) {
@@ -690,34 +689,42 @@ static void *thread_manage_kernel(void *data)
 	char tmp;
 	struct lttng_poll_event events;
 
-	DBG("Thread manage kernel started");
+	DBG("[thread] Thread manage kernel started");
 
-	testpoint(thread_manage_kernel);
-
-	health_code_update(&health_thread_kernel);
-
-	testpoint(thread_manage_kernel_before_loop);
+	/*
+	 * This first step of the while is to clean this structure which could free
+	 * non NULL pointers so zero it before the loop.
+	 */
+	memset(&events, 0, sizeof(events));
 
-	ret = create_thread_poll_set(&events, 2);
-	if (ret < 0) {
-		goto error_poll_create;
+	if (testpoint(thread_manage_kernel)) {
+		goto error_testpoint;
 	}
 
-	ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN);
-	if (ret < 0) {
-		goto error;
+	health_code_update(&health_thread_kernel);
+
+	if (testpoint(thread_manage_kernel_before_loop)) {
+		goto error_testpoint;
 	}
 
 	while (1) {
 		health_code_update(&health_thread_kernel);
 
 		if (update_poll_flag == 1) {
-			/*
-			 * Reset number of fd in the poll set. Always 2 since there is the thread
-			 * quit pipe and the kernel pipe.
-			 */
-			events.nb_fd = 2;
+			/* Clean events object. We are about to populate it again. */
+			lttng_poll_clean(&events);
+
+			ret = create_thread_poll_set(&events, 2);
+			if (ret < 0) {
+				goto error_poll_create;
+			}
+
+			ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN);
+			if (ret < 0) {
+				goto error;
+			}
 
+			/* This will add the available kernel channel if any. */
 			ret = update_kernel_poll(&events);
 			if (ret < 0) {
 				goto error;
@@ -725,12 +732,7 @@ static void *thread_manage_kernel(void *data)
 			update_poll_flag = 0;
 		}
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
-		DBG("Thread kernel polling on %d fds", nb_fd);
-
-		/* Zeroed the poll events */
-		lttng_poll_reset(&events);
+		DBG("Thread kernel polling on %d fds", LTTNG_POLL_GETNB(&events));
 
 		/* Poll infinite value of time */
 	restart:
@@ -752,6 +754,8 @@ static void *thread_manage_kernel(void *data)
 			continue;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -768,7 +772,13 @@ static void *thread_manage_kernel(void *data)
 
 			/* Check for data on kernel pipe */
 			if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
-				ret = read(kernel_poll_pipe[0], &tmp, 1);
+				do {
+					ret = read(kernel_poll_pipe[0], &tmp, 1);
+				} while (ret < 0 && errno == EINTR);
+				/*
+				 * Ret value is useless here, if this pipe gets any actions an
+				 * update is required anyway.
+				 */
 				update_poll_flag = 1;
 				continue;
 			} else {
@@ -795,6 +805,7 @@ exit:
 error:
 	lttng_poll_clean(&events);
 error_poll_create:
+error_testpoint:
 	utils_close_pipe(kernel_poll_pipe);
 	kernel_poll_pipe[0] = kernel_poll_pipe[1] = -1;
 	if (err) {
@@ -882,15 +893,15 @@ static void *thread_manage_consumer(void *data)
 		goto error;
 	}
 
-	nb_fd = LTTNG_POLL_GETNB(&events);
-
 	health_code_update(&consumer_data->health);
 
 	/* Inifinite blocking call, waiting for transmission */
 restart:
 	health_poll_update(&consumer_data->health);
 
-	testpoint(thread_manage_consumer);
+	if (testpoint(thread_manage_consumer)) {
+		goto error;
+	}
 
 	ret = lttng_poll_wait(&events, -1);
 	health_poll_update(&consumer_data->health);
@@ -904,6 +915,8 @@ restart:
 		goto error;
 	}
 
+	nb_fd = ret;
+
 	for (i = 0; i < nb_fd; i++) {
 		/* Fetch once the poll data */
 		revents = LTTNG_POLL_GETEV(&events, i);
@@ -981,9 +994,6 @@ restart:
 
 	health_code_update(&consumer_data->health);
 
-	/* Update number of fd */
-	nb_fd = LTTNG_POLL_GETNB(&events);
-
 	/* Inifinite blocking call, waiting for transmission */
 restart_poll:
 	health_poll_update(&consumer_data->health);
@@ -999,6 +1009,8 @@ restart_poll:
 		goto error;
 	}
 
+	nb_fd = ret;
+
 	for (i = 0; i < nb_fd; i++) {
 		/* Fetch once the poll data */
 		revents = LTTNG_POLL_GETEV(&events, i);
@@ -1094,11 +1106,13 @@ static void *thread_manage_apps(void *data)
 
 	DBG("[thread] Manage application started");
 
-	testpoint(thread_manage_apps);
-
 	rcu_register_thread();
 	rcu_thread_online();
 
+	if (testpoint(thread_manage_apps)) {
+		goto error_testpoint;
+	}
+
 	health_code_update(&health_thread_app_manage);
 
 	ret = create_thread_poll_set(&events, 2);
@@ -1111,17 +1125,14 @@ static void *thread_manage_apps(void *data)
 		goto error;
 	}
 
-	testpoint(thread_manage_apps_before_loop);
+	if (testpoint(thread_manage_apps_before_loop)) {
+		goto error;
+	}
 
 	health_code_update(&health_thread_app_manage);
 
 	while (1) {
-		/* Zeroed the events structure */
-		lttng_poll_reset(&events);
-
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
-		DBG("Apps thread polling on %d fds", nb_fd);
+		DBG("Apps thread polling on %d fds", LTTNG_POLL_GETNB(&events));
 
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
@@ -1138,6 +1149,8 @@ static void *thread_manage_apps(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -1159,7 +1172,9 @@ static void *thread_manage_apps(void *data)
 					goto error;
 				} else if (revents & LPOLLIN) {
 					/* Empty pipe */
-					ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					do {
+						ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					} while (ret < 0 && errno == EINTR);
 					if (ret < 0 || ret < sizeof(ust_cmd)) {
 						PERROR("read apps cmd pipe");
 						goto error;
@@ -1251,6 +1266,7 @@ exit:
 error:
 	lttng_poll_clean(&events);
 error_poll_create:
+error_testpoint:
 	utils_close_pipe(apps_cmd_pipe);
 	apps_cmd_pipe[0] = apps_cmd_pipe[1] = -1;
 
@@ -1310,9 +1326,11 @@ static void *thread_dispatch_ust_registration(void *data)
 			 * at some point in time or wait to the end of the world :)
 			 */
 			if (apps_cmd_pipe[1] >= 0) {
-				ret = write(apps_cmd_pipe[1], ust_cmd,
-						sizeof(struct ust_command));
-				if (ret < 0) {
+				do {
+					ret = write(apps_cmd_pipe[1], ust_cmd,
+							sizeof(struct ust_command));
+				} while (ret < 0 && errno == EINTR);
+				if (ret < 0 || ret != sizeof(struct ust_command)) {
 					PERROR("write apps cmd pipe");
 					if (errno == EBADF) {
 						/*
@@ -1359,7 +1377,9 @@ static void *thread_registration_apps(void *data)
 
 	DBG("[thread] Manage application registration started");
 
-	testpoint(thread_registration_apps);
+	if (testpoint(thread_registration_apps)) {
+		goto error_testpoint;
+	}
 
 	ret = lttcomm_listen_unix_sock(apps_sock);
 	if (ret < 0) {
@@ -1392,8 +1412,6 @@ static void *thread_registration_apps(void *data)
 	while (1) {
 		DBG("Accepting application registration");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
 		health_poll_update(&health_thread_app_reg);
@@ -1409,6 +1427,8 @@ static void *thread_registration_apps(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			health_code_update(&health_thread_app_reg);
 
@@ -1514,7 +1534,6 @@ error:
 		health_error(&health_thread_app_reg);
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_exit(&health_thread_app_reg);
 
 	/* Notify that the registration thread is gone */
 	notify_ust_apps(0);
@@ -1538,7 +1557,9 @@ error_poll_add:
 	lttng_poll_clean(&events);
 error_listen:
 error_create_poll:
+error_testpoint:
 	DBG("UST Registration thread cleanup complete");
+	health_exit(&health_thread_app_reg);
 
 	return NULL;
 }
@@ -1670,10 +1691,10 @@ error:
 static int join_consumer_thread(struct consumer_data *consumer_data)
 {
 	void *status;
-	int ret;
 
 	/* Consumer pid must be a real one. */
 	if (consumer_data->pid > 0) {
+		int ret;
 		ret = kill(consumer_data->pid, SIGTERM);
 		if (ret) {
 			ERR("Error killing consumer daemon");
@@ -1852,7 +1873,7 @@ error:
  */
 static int start_consumerd(struct consumer_data *consumer_data)
 {
-	int ret, err;
+	int ret;
 
 	/*
 	 * Set the listen() state on the socket since there is a possible race
@@ -1895,6 +1916,8 @@ end:
 error:
 	/* Cleanup already created socket on error. */
 	if (consumer_data->err_sock >= 0) {
+		int err;
+
 		err = close(consumer_data->err_sock);
 		if (err < 0) {
 			PERROR("close consumer data error socket");
@@ -2525,7 +2548,7 @@ skip_domain:
 	{
 		ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.enable.channel_name,
-				&cmd_ctx->lsm->u.enable.event, kernel_poll_pipe[1]);
+				&cmd_ctx->lsm->u.enable.event, NULL, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_ENABLE_ALL_EVENT:
@@ -2534,7 +2557,7 @@ skip_domain:
 
 		ret = cmd_enable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.enable.channel_name,
-				cmd_ctx->lsm->u.enable.event.type, kernel_poll_pipe[1]);
+				cmd_ctx->lsm->u.enable.event.type, NULL, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_LIST_TRACEPOINTS:
@@ -2846,15 +2869,19 @@ skip_domain:
 				cmd_ctx->lsm->u.reg.path, cdata);
 		break;
 	}
-	case LTTNG_SET_FILTER:
+	case LTTNG_ENABLE_EVENT_WITH_FILTER:
 	{
 		struct lttng_filter_bytecode *bytecode;
 
-		if (cmd_ctx->lsm->u.filter.bytecode_len > LTTNG_FILTER_MAX_LEN) {
+		if (cmd_ctx->lsm->u.enable.bytecode_len > LTTNG_FILTER_MAX_LEN) {
+			ret = LTTNG_ERR_FILTER_INVAL;
+			goto error;
+		}
+		if (cmd_ctx->lsm->u.enable.bytecode_len == 0) {
 			ret = LTTNG_ERR_FILTER_INVAL;
 			goto error;
 		}
-		bytecode = zmalloc(cmd_ctx->lsm->u.filter.bytecode_len);
+		bytecode = zmalloc(cmd_ctx->lsm->u.enable.bytecode_len);
 		if (!bytecode) {
 			ret = LTTNG_ERR_FILTER_NOMEM;
 			goto error;
@@ -2862,7 +2889,7 @@ skip_domain:
 		/* Receive var. len. data */
 		DBG("Receiving var len data from client ...");
 		ret = lttcomm_recv_unix_sock(sock, bytecode,
-				cmd_ctx->lsm->u.filter.bytecode_len);
+				cmd_ctx->lsm->u.enable.bytecode_len);
 		if (ret <= 0) {
 			DBG("Nothing recv() from client var len data... continuing");
 			*sock_error = 1;
@@ -2871,16 +2898,15 @@ skip_domain:
 		}
 
 		if (bytecode->len + sizeof(*bytecode)
-				!= cmd_ctx->lsm->u.filter.bytecode_len) {
+				!= cmd_ctx->lsm->u.enable.bytecode_len) {
 			free(bytecode);
 			ret = LTTNG_ERR_FILTER_INVAL;
 			goto error;
 		}
 
-		ret = cmd_set_filter(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.filter.channel_name,
-				cmd_ctx->lsm->u.filter.event_name,
-				bytecode);
+		ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
+				cmd_ctx->lsm->u.enable.channel_name,
+				&cmd_ctx->lsm->u.enable.event, bytecode, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_DATA_PENDING:
@@ -2965,8 +2991,6 @@ static void *thread_manage_health(void *data)
 	while (1) {
 		DBG("Health check ready");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 restart:
 		ret = lttng_poll_wait(&events, -1);
@@ -2980,6 +3004,8 @@ restart:
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -3120,10 +3146,12 @@ static void *thread_manage_clients(void *data)
 
 	DBG("[thread] Manage client started");
 
-	testpoint(thread_manage_clients);
-
 	rcu_register_thread();
 
+	if (testpoint(thread_manage_clients)) {
+		goto error_testpoint;
+	}
+
 	health_code_update(&health_thread_cmd);
 
 	ret = lttcomm_listen_unix_sock(client_sock);
@@ -3153,15 +3181,15 @@ static void *thread_manage_clients(void *data)
 		kill(ppid, SIGUSR1);
 	}
 
-	testpoint(thread_manage_clients_before_loop);
+	if (testpoint(thread_manage_clients_before_loop)) {
+		goto error;
+	}
 
 	health_code_update(&health_thread_cmd);
 
 	while (1) {
 		DBG("Accepting client command ...");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
 		health_poll_update(&health_thread_cmd);
@@ -3177,6 +3205,8 @@ static void *thread_manage_clients(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -3328,6 +3358,7 @@ error:
 
 error_listen:
 error_create_poll:
+error_testpoint:
 	unlink(client_unix_sock_path);
 	if (client_sock >= 0) {
 		ret = close(client_sock);
@@ -3833,7 +3864,7 @@ int main(int argc, char **argv)
 
 	/* Parse arguments */
 	progname = argv[0];
-	if ((ret = parse_args(argc, argv) < 0)) {
+	if ((ret = parse_args(argc, argv)) < 0) {
 		goto error;
 	}