X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c8484b93cb8a7006b708f562466cffc75aa4c767;hb=fa64dfb477cac50bb0b8a02fcf6b5a16a426d43b;hp=e5054735efd6279aec0fe5648a122dca3f366943;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index e5054735e..c8484b93c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1116,7 +1116,7 @@ static void signal_consumer_condition(struct consumer_data *data, int state)
  */
 static void *thread_manage_consumer(void *data)
 {
-	int sock = -1, i, ret, pollfd, err = -1;
+	int sock = -1, i, ret, pollfd, err = -1, should_quit = 0;
 	uint32_t revents, nb_fd;
 	enum lttcomm_return_code code;
 	struct lttng_poll_event events;
@@ -1274,6 +1274,15 @@ restart:
 	/* Infinite blocking call, waiting for transmission */
 restart_poll:
 	while (1) {
+		health_code_update();
+
+		/* Exit the thread because the thread quit pipe has been triggered. */
+		if (should_quit) {
+			/* Not a health error. */
+			err = 0;
+			goto exit;
+		}
+
 		health_poll_entry();
 		ret = lttng_poll_wait(&events, -1);
 		health_poll_exit();
@@ -1296,12 +1305,12 @@ restart_poll:
 
 			health_code_update();
 
-			/* Thread quit pipe has been closed. Killing thread. */
-			ret = sessiond_check_thread_quit_pipe(pollfd, revents);
-			if (ret) {
-				err = 0;
-				goto exit;
-			}
+			/*
+			 * Thread quit pipe has been triggered, flag that we should stop
+			 * but continue the current loop to handle potential data from
+			 * consumer.
+			 */
+			should_quit = sessiond_check_thread_quit_pipe(pollfd, revents);
 
 			if (pollfd == sock) {
 				/* Event on the consumerd socket */
@@ -1330,11 +1339,8 @@ restart_poll:
 					ERR("Handling metadata request");
 					goto error;
 				}
-				break;
-			} else {
-				ERR("Unknown pollfd");
-				goto error;
 			}
+			/* No need for an else branch all FDs are tested prior. */
 		}
 		health_code_update();
 	}
@@ -2597,6 +2603,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		break;
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
 	case LTTNG_DOMAIN_UST:
 		DBG3("Copying tracing session consumer output in UST session");
 		if (session->ust_session->consumer) {
@@ -2642,6 +2649,7 @@ static int create_ust_session(struct ltt_session *session,
 	switch (domain->type) {
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
 	case LTTNG_DOMAIN_UST:
 		break;
 	default:
@@ -2889,6 +2897,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			break;
 		case LTTNG_DOMAIN_JUL:
 		case LTTNG_DOMAIN_LOG4J:
+		case LTTNG_DOMAIN_PYTHON:
 		case LTTNG_DOMAIN_UST:
 			if (!cmd_ctx->session->ust_session) {
 				ret = LTTNG_ERR_NO_CHANNEL;
@@ -2971,6 +2980,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		break;
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
 	case LTTNG_DOMAIN_UST:
 	{
 		if (!ust_app_supported()) {
@@ -3065,6 +3075,7 @@ skip_domain:
 		switch (cmd_ctx->lsm->domain.type) {
 		case LTTNG_DOMAIN_JUL:
 		case LTTNG_DOMAIN_LOG4J:
+		case LTTNG_DOMAIN_PYTHON:
 		case LTTNG_DOMAIN_UST:
 			if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
 				ret = LTTNG_ERR_NO_USTCONSUMERD;
@@ -3463,7 +3474,7 @@ skip_domain:
 	case LTTNG_LIST_DOMAINS:
 	{
 		ssize_t nb_dom;
-		struct lttng_domain *domains;
+		struct lttng_domain *domains = NULL;
 
 		nb_dom = cmd_list_domains(cmd_ctx->session, &domains);
 		if (nb_dom < 0) {
@@ -5230,10 +5241,12 @@ int main(int argc, char **argv)
 		/* Setup kernel tracer */
 		if (!opt_no_kernel) {
 			init_kernel_tracer();
-			ret = syscall_init_table();
-			if (ret < 0) {
-				ERR("Unable to populate syscall table. Syscall tracing won't"
-						" work for this session daemon.");
+			if (kernel_tracer_fd >= 0) {
+				ret = syscall_init_table();
+				if (ret < 0) {
+					ERR("Unable to populate syscall table. Syscall tracing"
+							" won't work for this session daemon.");
+				}
 			}
 		}