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 ea16e1d1a7fb2b3711b8f73d0daba3938c5553e0..247894968534e0fdcaf53fdffaaa2b7d57a8ff19 100644 (file)
--- 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 b58626c2c2f7d49e3faa6b2cf0f7ac6bf94d6913..11574de6132b2f6c354093634276236fd0e481e0 100644 (file)
--- 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 fdea20ca4981e942f6c176ae4b6b3ad70aea192f..37c0a9325960f84940ae268039b3c4e8bea212ce 100644 (file)
--- 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);