X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=3c917b25f51c87f484a33096873f441c0c2da92b;hb=4063050c0e90b27d34ee8de570b049cc076119a4;hp=8d0a841ed8e71cc88a2f5a7d688ecbf1e3c49d3e;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 8d0a841ed..3c917b25f 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -54,6 +54,7 @@
 #include "shm.h"
 #include "ust-ctl.h"
 #include "utils.h"
+#include "fd-limit.h"
 
 #define CONSUMERD_FILE	"lttng-consumerd"
 
@@ -595,7 +596,7 @@ static int send_kconsumer_session_streams(struct consumer_data *consumer_data,
 		lkm.u.channel.channel_key = session->metadata->fd;
 		lkm.u.channel.max_sb_size = session->metadata->conf->attr.subbuf_size;
 		lkm.u.channel.mmap_len = 0;	/* for kernel */
-		DBG("Sending metadata channel %d to consumer", lkm.u.stream.stream_key);
+		DBG("Sending metadata channel %d to consumer", lkm.u.channel.channel_key);
 		ret = lttcomm_send_unix_sock(sock, &lkm, sizeof(lkm));
 		if (ret < 0) {
 			PERROR("send consumer channel");
@@ -1424,6 +1425,17 @@ static void *thread_registration_apps(void *data)
 					 * Using message-based transmissions to ensure we don't
 					 * have to deal with partially received messages.
 					 */
+					ret = lttng_fd_get(LTTNG_FD_APPS, 1);
+					if (ret < 0) {
+						ERR("Exhausted file descriptors allowed for applications.");
+						free(ust_cmd);
+						ret = close(sock);
+						if (ret) {
+							PERROR("close");
+						}
+						sock = -1;
+						continue;
+					}
 					ret = lttcomm_recv_unix_sock(sock, &ust_cmd->reg_msg,
 							sizeof(struct ust_register_msg));
 					if (ret < 0 || ret < sizeof(struct ust_register_msg)) {
@@ -1437,6 +1449,7 @@ static void *thread_registration_apps(void *data)
 						if (ret) {
 							PERROR("close");
 						}
+						lttng_fd_put(LTTNG_FD_APPS, 1);
 						sock = -1;
 						continue;
 					}
@@ -1482,6 +1495,7 @@ error:
 		if (ret) {
 			PERROR("close");
 		}
+		lttng_fd_put(LTTNG_FD_APPS, 1);
 	}
 	unlink(apps_unix_sock_path);
 
@@ -3303,9 +3317,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		break;
 	default:
 		DBG("Getting session %s by name", cmd_ctx->lsm->session.name);
+		/*
+		 * We keep the session list lock across _all_ commands
+		 * for now, because the per-session lock does not
+		 * handle teardown properly.
+		 */
 		session_lock_list();
 		cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name);
-		session_unlock_list();
 		if (cmd_ctx->session == NULL) {
 			if (cmd_ctx->lsm->session.name != NULL) {
 				ret = LTTCOMM_SESS_NOT_FOUND;
@@ -3535,6 +3553,11 @@ skip_domain:
 	{
 		ret = cmd_destroy_session(cmd_ctx->session,
 				cmd_ctx->lsm->session.name);
+		/*
+		 * Set session to NULL so we do not unlock it after
+		 * free.
+		 */
+		cmd_ctx->session = NULL;
 		break;
 	}
 	case LTTNG_LIST_DOMAINS:
@@ -3669,6 +3692,9 @@ setup_error:
 	if (cmd_ctx->session) {
 		session_unlock(cmd_ctx->session);
 	}
+	if (need_tracing_session) {
+		session_unlock_list();
+	}
 init_setup_error:
 	return ret;
 }
@@ -3798,7 +3824,7 @@ static void *thread_manage_clients(void *data)
 				PERROR("close");
 			}
 			sock = -1;
-			free(cmd_ctx);
+			clean_command_ctx(&cmd_ctx);
 			continue;
 		}
 
@@ -4516,6 +4542,12 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
+	/*
+	 * Init UST app hash table. Alloc hash table before this point since
+	 * cleanup() can get called after that point.
+	 */
+	ust_app_ht_alloc();
+
 	/* After this point, we can safely call cleanup() with "goto exit" */
 
 	/*
@@ -4538,6 +4570,8 @@ int main(int argc, char **argv)
 		/* Set ulimit for open files */
 		set_ulimit();
 	}
+	/* init lttng_fd tracking must be done after set_ulimit. */
+	lttng_fd_init();
 
 	ret = set_consumer_sockets(&ustconsumer64_data, rundir);
 	if (ret < 0) {
@@ -4581,9 +4615,6 @@ int main(int argc, char **argv)
 	/* Init UST command queue. */
 	cds_wfq_init(&ust_cmd_queue.queue);
 
-	/* Init UST app hash table */
-	ust_app_ht_alloc();
-
 	/*
 	 * Get session list pointer. This pointer MUST NOT be free(). This list is
 	 * statically declared in session.c