projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename consumer_init_channel_comm_msg()
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 44dc35d6b92e3fafd412e35fb95b838f986bb016..1ed1d7f81991422f9666541f7c24e85ec5549bf2 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-735,7
+735,8
@@
error:
*
* The consumer socket lock must be held by the caller.
*/
*
* The consumer socket lock must be held by the caller.
*/
-int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd)
+int consumer_send_fds(struct consumer_socket *sock, const int *fds,
+ size_t nb_fd)
{
int ret;
{
int ret;
@@
-889,8
+890,7
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
/*
* Init channel communication message structure.
*/
/*
* 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,
uint64_t channel_key,
uint64_t session_id,
const char *pathname,
@@
-913,7
+913,7
@@
void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
/* Send channel */
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;
msg->u.channel.channel_key = channel_key;
msg->u.channel.session_id = session_id;
msg->u.channel.uid = uid;
@@
-973,7
+973,7
@@
void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
*/
int consumer_send_stream(struct consumer_socket *sock,
struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
*/
int consumer_send_stream(struct consumer_socket *sock,
struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
- int *fds, size_t nb_fd)
+
const
int *fds, size_t nb_fd)
{
int ret;
{
int ret;
This page took
0.030684 seconds
and
4
git commands to generate.