X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=817100ff449128e2f71705623d6ac4a39d95e0f4;hb=ca3aecdf2e5c045ad2f027b3dc474815d375a280;hp=d826125c9b8c7acaf5a57f294aeb7d29f78803ea;hpb=12744796179ed3bfa9c3b6e22bfdeabf2e6081bf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index d826125c9..817100ff4 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -65,6 +65,7 @@ struct lttng_channel *channel_new_default_attr(int dom,
 		chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
 		chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
 		chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
+		chan->attr.live_timer_interval = DEFAULT_KERNEL_CHANNEL_LIVE_TIMER;
 		break;
 	case LTTNG_DOMAIN_UST:
 		switch (type) {
@@ -76,6 +77,8 @@ struct lttng_channel *channel_new_default_attr(int dom,
 				DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
 			chan->attr.read_timer_interval =
 				DEFAULT_UST_UID_CHANNEL_READ_TIMER;
+			chan->attr.live_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
 			break;
 		case LTTNG_BUFFER_PER_PID:
 		default:
@@ -86,6 +89,8 @@ struct lttng_channel *channel_new_default_attr(int dom,
 				DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
 			chan->attr.read_timer_interval =
 				DEFAULT_UST_PID_CHANNEL_READ_TIMER;
+			chan->attr.live_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
 			break;
 		}
 		break;
@@ -184,6 +189,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) {
@@ -263,6 +274,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