From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 8 May 2018 16:11:19 +0000 (-0400)
Subject: Rename kernel_consumer_send_channel_stream()
X-Git-Tag: v2.11.0-rc1~243
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=1fc1b7c8ac91a5d3a468ee64a862f4df9592b1c5

Rename kernel_consumer_send_channel_stream()

kernel_consumer_send_channel_stream() sends _all_ streams of
a given channel. It is renamed kernel_consumer_send_channel_streams()
to ensure its name is no longer misleading.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index ea16e1d1a..247894968 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -357,7 +357,7 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
 		unsigned int monitor)
 {
@@ -444,7 +444,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	/* Send channel and streams of it */
 	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
-		ret = kernel_consumer_send_channel_stream(sock, chan, session,
+		ret = kernel_consumer_send_channel_streams(sock, chan, session,
 				monitor);
 		if (ret < 0) {
 			goto error;
diff --git a/src/bin/lttng-sessiond/kernel-consumer.h b/src/bin/lttng-sessiond/kernel-consumer.h
index b58626c2c..11574de61 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.h
+++ b/src/bin/lttng-sessiond/kernel-consumer.h
@@ -21,7 +21,7 @@
 
 #include "trace-kernel.h"
 
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
 		unsigned int monitor);
 
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index fdea20ca4..37c0a9325 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -860,7 +860,7 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 			cds_lfht_for_each_entry(ksess->consumer->socks->ht,
 					&iter.iter, socket, node.node) {
 				pthread_mutex_lock(socket->lock);
-				ret = kernel_consumer_send_channel_stream(socket,
+				ret = kernel_consumer_send_channel_streams(socket,
 						channel, ksess,
 						session->output_traces ? 1 : 0);
 				pthread_mutex_unlock(socket->lock);