X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.cpp;h=b51b56c3e772e2e1a213853266f10b79f30591ab;hb=139a8d250fb18f8ffc95b0936f7285f7b484b72f;hp=364705fcb31d7f91e5d095d0740b38488c0bd712;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.cpp b/src/bin/lttng-sessiond/kernel-consumer.cpp
index 364705fcb..b51b56c3e 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.cpp
+++ b/src/bin/lttng-sessiond/kernel-consumer.cpp
@@ -12,16 +12,16 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/compat/string.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/string.hpp>
 
-#include "consumer.h"
-#include "health-sessiond.h"
-#include "kernel-consumer.h"
-#include "notification-thread-commands.h"
-#include "session.h"
-#include "lttng-sessiond.h"
+#include "consumer.hpp"
+#include "health-sessiond.hpp"
+#include "kernel-consumer.hpp"
+#include "notification-thread-commands.hpp"
+#include "session.hpp"
+#include "lttng-sessiond.hpp"
 
 static char *create_channel_path(struct consumer_output *consumer,
 		size_t *consumer_path_offset)
@@ -145,8 +145,6 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 			channel->key,
 			ksession->id,
 			&pathname[consumer_path_offset],
-			ksession->uid,
-			ksession->gid,
 			consumer->net_seq_index,
 			channel->channel->name,
 			channel->stream_count,
@@ -171,15 +169,12 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	rcu_read_lock();
 	session = session_find_by_id(ksession->id);
 	LTTNG_ASSERT(session);
-	LTTNG_ASSERT(pthread_mutex_trylock(&session->lock));
-	LTTNG_ASSERT(session_trylock_list());
-
-	status = notification_thread_command_add_channel(
-			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);
+	ASSERT_LOCKED(session->lock);
+	ASSERT_SESSION_LIST_LOCKED();
+
+	status = notification_thread_command_add_channel(the_notification_thread_handle,
+			session->id, 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;
@@ -226,8 +221,6 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			ksession->metadata->key,
 			ksession->id,
 			"",
-			ksession->uid,
-			ksession->gid,
 			consumer->net_seq_index,
 			ksession->metadata->conf->name,
 			1,
@@ -279,7 +272,7 @@ static
 int kernel_consumer_add_stream(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel,
 		struct ltt_kernel_stream *stream,
-		struct ltt_kernel_session *session, unsigned int monitor)
+		struct ltt_kernel_session *session)
 {
 	int ret;
 	struct lttcomm_consumer_msg lkm;
@@ -396,7 +389,7 @@ int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
 
 		/* Add stream on the kernel consumer side. */
 		ret = kernel_consumer_add_stream(sock, channel, stream,
-				ksession, monitor);
+				ksession);
 		if (ret < 0) {
 			goto error;
 		}