X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=984576edc2e03b68595348f643dfa2e9c19ebdbb;hp=8f835fd8b6276385dd9bc068dca7a92b0202233e;hb=27babd3a0a164f71d4dc02884ef20099ddfc6755;hpb=0a9c649428b2ea8d4e743aebc12585eeb58fcf64

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 8f835fd8b..984576edc 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -25,6 +25,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "channel.h"
+#include "lttng-sessiond.h"
 #include "kernel.h"
 #include "ust-ctl.h"
 #include "utils.h"
@@ -183,6 +184,12 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 		attr = defattr;
 	}
 
+	if (ksession->snapshot_mode) {
+		/* Force channel attribute for snapshot mode. */
+		attr->attr.overwrite = 1;
+		attr->attr.output = LTTNG_EVENT_MMAP;
+	}
+
 	/* Channel not found, creating it */
 	ret = kernel_create_channel(ksession, attr);
 	if (ret < 0) {
@@ -262,6 +269,12 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		attr = defattr;
 	}
 
+	if (usess->snapshot_mode) {
+		/* Force channel attribute for snapshot mode. */
+		attr->attr.overwrite = 1;
+		attr->attr.output = LTTNG_EVENT_MMAP;
+	}
+
 	/*
 	 * Validate UST buffer size and number of buffers: must both be power of 2
 	 * and nonzero. We validate right here for UST, because applications will
@@ -273,6 +286,14 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		goto error;
 	}
 
+	/*
+	 * Invalid subbuffer size if it's lower then the page size.
+	 */
+	if (attr->attr.subbuf_size < page_size) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	if (!attr->attr.num_subbuf ||
 			(attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
 		ret = LTTNG_ERR_INVALID;
@@ -297,18 +318,8 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	/* Validate buffer type. */
 	switch (type) {
 	case LTTNG_BUFFER_PER_PID:
-		if (attr->attr.subbuf_size <
-				default_get_ust_pid_channel_subbuf_size()) {
-			ret = LTTNG_ERR_INVALID;
-			goto error;
-		}
 		break;
 	case LTTNG_BUFFER_PER_UID:
-		if (attr->attr.subbuf_size <
-				default_get_ust_uid_channel_subbuf_size()) {
-			ret = LTTNG_ERR_INVALID;
-			goto error;
-		}
 		break;
 	default:
 		ret = LTTNG_ERR_BUFFER_NOT_SUPPORTED;