X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=f9f7646ca05b82ac08b27a77cc2b2e58b58ba8ce;hb=5061fb43b5c8177ae43a19b296640e94aab06fdf;hp=9b6f70cd08134acfa45afa1d970735d3d2ee6a4c;hpb=6be1a3866f735b0fea61044bd3b6079f5be6aaae;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 9b6f70cd0..f9f7646ca 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1934,12 +1934,16 @@ static void *thread_dispatch_ust_registration(void *data)
 
 	DBG("[thread] Dispatch UST command started");
 
-	while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
+	for (;;) {
 		health_code_update();
 
 		/* Atomically prepare the queue futex */
 		futex_nto1_prepare(&ust_cmd_queue.futex);
 
+		if (CMM_LOAD_SHARED(dispatch_thread_exit)) {
+			break;
+		}
+
 		do {
 			struct ust_app *app = NULL;
 			ust_cmd = NULL;
@@ -2793,6 +2797,18 @@ static int init_kernel_tracer(void)
 		goto error_modules;
 	}
 
+	ret = kernel_supports_ring_buffer_snapshot_sample_positions(
+			kernel_tracer_fd);
+	if (ret < 0) {
+		goto error_modules;
+	}
+
+	if (ret < 1) {
+		WARN("Kernel tracer does not support buffer monitoring. "
+			"The monitoring timer of channels in the kernel domain "
+			"will be set to 0 (disabled).");
+	}
+
 	DBG("Kernel tracer fd %d", kernel_tracer_fd);
 	return 0;
 
@@ -5392,13 +5408,10 @@ static int set_consumer_sockets(struct consumer_data *consumer_data,
 	DBG2("Creating consumer directory: %s", path);
 
 	ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP);
-	if (ret < 0) {
-		if (errno != EEXIST) {
-			PERROR("mkdir");
-			ERR("Failed to create %s", path);
-			goto error;
-		}
-		ret = -1;
+	if (ret < 0 && errno != EEXIST) {
+		PERROR("mkdir");
+		ERR("Failed to create %s", path);
+		goto error;
 	}
 	if (is_root) {
 		ret = chown(path, 0, utils_get_group_id(tracing_group_name));