X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=4ebd1e7d6c50d89da95aae89ff7e4d7b1ea77c59;hb=b51ec5b4b698a201dbd081ed5104591db44e38e9;hp=1d047fd85240582854f5a6c50744b23ce7ac4cb1;hpb=27babd3a0a164f71d4dc02884ef20099ddfc6755;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 1d047fd85..4ebd1e7d6 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -446,7 +446,10 @@ static void cleanup(void)
 
 	DBG("Cleaning up");
 
-	/* First thing first, stop all threads */
+	/*
+	 * Close the thread quit pipe. It has already done its job,
+	 * since we are now called.
+	 */
 	utils_close_pipe(thread_quit_pipe);
 
 	/*
@@ -675,6 +678,8 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 				if (ret < 0) {
 					goto error;
 				}
+				/* Update the stream global counter */
+				ksess->stream_count_global += ret;
 
 				/*
 				 * Have we already sent fds to the consumer? If yes, it means
@@ -1293,11 +1298,17 @@ static void *thread_manage_apps(void *data)
 						goto error;
 					}
 
-					/* Set socket timeout for both receiving and ending */
+					/*
+					 * Set socket timeout for both receiving and ending.
+					 * app_socket_timeout is in seconds, whereas
+					 * lttcomm_setsockopt_rcv_timeout and
+					 * lttcomm_setsockopt_snd_timeout expect msec as
+					 * parameter.
+					 */
 					(void) lttcomm_setsockopt_rcv_timeout(sock,
-							app_socket_timeout);
+							app_socket_timeout * 1000);
 					(void) lttcomm_setsockopt_snd_timeout(sock,
-							app_socket_timeout);
+							app_socket_timeout * 1000);
 
 					DBG("Apps with sock %d added to poll set", sock);
 
@@ -2699,6 +2710,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		break;
 	case LTTNG_DOMAIN_UST:
 	{
+		if (!ust_app_supported()) {
+			ret = LTTNG_ERR_NO_UST;
+			goto error;
+		}
 		/* Consumer is in an ERROR state. Report back to client */
 		if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_USTCONSUMERD;
@@ -4064,12 +4079,12 @@ static int set_permissions(char *rundir)
 	ret = allowed_group();
 	if (ret < 0) {
 		WARN("No tracing group detected");
-		ret = 0;
-		goto end;
+		/* Setting gid to 0 if no tracing group is found */
+		gid = 0;
+	} else {
+		gid = ret;
 	}
 
-	gid = ret;
-
 	/* Set lttng run dir */
 	ret = chown(rundir, 0, gid);
 	if (ret < 0) {
@@ -4077,7 +4092,7 @@ static int set_permissions(char *rundir)
 		PERROR("chown");
 	}
 
-	/* Ensure tracing group can search the run dir */
+	/* Ensure all applications and tracing group can search the run dir */
 	ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
 	if (ret < 0) {
 		ERR("Unable to set permissions on %s", rundir);
@@ -4114,7 +4129,6 @@ static int set_permissions(char *rundir)
 
 	DBG("All permissions are set");
 
-end:
 	return ret;
 }
 
@@ -4626,6 +4640,9 @@ int main(int argc, char **argv)
 
 	write_pidfile();
 
+	/* Initialize communication library */
+	lttcomm_init();
+
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&ht_cleanup_thread, NULL,
 			thread_ht_cleanup, (void *) NULL);