X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=11a34af2a4e13a293d096b39d60251963f9d2705;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=273b04f9da85145de523c248cb09da1798e691ca;hpb=5da88b0f58d7f838068037ea449ddfb25d3e85ad;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 273b04f9d..11a34af2a 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -166,6 +156,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 			channel->channel->attr.tracefile_count,
 			monitor,
 			channel->channel->attr.live_timer_interval,
+			ksession->is_live_session,
 			channel_attr_extended->monitor_timer_interval,
 			ksession->current_trace_chunk);
 
@@ -184,11 +175,11 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	assert(session_trylock_list());
 
 	status = notification_thread_command_add_channel(
-			notification_thread_handle, session->name,
-			ksession->uid, ksession->gid,
-			channel->channel->name, channel->key,
-			LTTNG_DOMAIN_KERNEL,
-			channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
+			the_notification_thread_handle, session->name,
+			ksession->uid, ksession->gid, channel->channel->name,
+			channel->key, LTTNG_DOMAIN_KERNEL,
+			channel->channel->attr.subbuf_size *
+					channel->channel->attr.num_subbuf);
 	rcu_read_unlock();
 	if (status != LTTNG_OK) {
 		ret = -1;
@@ -238,12 +229,17 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			ksession->uid,
 			ksession->gid,
 			consumer->net_seq_index,
-			DEFAULT_METADATA_NAME,
+			ksession->metadata->conf->name,
 			1,
-			DEFAULT_KERNEL_CHANNEL_OUTPUT,
+			ksession->metadata->conf->attr.output,
 			CONSUMER_CHANNEL_TYPE_METADATA,
-			0, 0,
-			monitor, 0, 0, ksession->current_trace_chunk);
+			ksession->metadata->conf->attr.tracefile_size,
+			ksession->metadata->conf->attr.tracefile_count,
+			monitor,
+			ksession->metadata->conf->attr.live_timer_interval,
+			ksession->is_live_session,
+			0,
+			ksession->current_trace_chunk);
 
 	health_code_update();