Rename consumer_init_channel_comm_msg()

consumer_init_channel_comm_msg() is only used for the ADD_CHANNEL
command. It is therefore renamed to
consumer_init_add_channel_comm_msg()

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

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 4a19c93475802af9e4e5f98a37325b1db207a7c4..1ed1d7f81991422f9666541f7c24e85ec5549bf2 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -890,8 +890,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 /*
  * Init channel communication message structure.
  */
-void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
-               enum lttng_consumer_command cmd,
+void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t channel_key,
                uint64_t session_id,
                const char *pathname,
@@ -914,7 +913,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
 
        /* Send channel */
-       msg->cmd_type = cmd;
+       msg->cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
        msg->u.channel.channel_key = channel_key;
        msg->u.channel.session_id = session_id;
        msg->u.channel.uid = uid;

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index b1189cc87b80c35bc1910501d4a5e9283fac37ad..1018d7aa4f28ba83f612e54b63dd5024fa94d36f 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -285,8 +285,7 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
                enum lttng_consumer_command cmd,
                uint64_t channel_key, uint64_t net_seq_idx);
-void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
-               enum lttng_consumer_command cmd,
+void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t channel_key,
                uint64_t session_id,
                const char *pathname,

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 74c4b302320de5b49926f1ff497c31b59f4fb9fa..ea16e1d1a7fb2b3711b8f73d0daba3938c5553e0 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -145,8 +145,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
        }
 
        /* Prep channel message structure */
-       consumer_init_channel_comm_msg(&lkm,
-                       LTTNG_CONSUMER_ADD_CHANNEL,
+       consumer_init_add_channel_comm_msg(&lkm,
                        channel->key,
                        ksession->id,
                        pathname,
@@ -229,8 +228,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        }
 
        /* Prep channel message structure */
-       consumer_init_channel_comm_msg(&lkm,
-                       LTTNG_CONSUMER_ADD_CHANNEL,
+       consumer_init_add_channel_comm_msg(&lkm,
                        session->metadata->key,
                        session->id,
                        pathname,