X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=4c037a9eb25b426edb4677701349d560bc06d549;hp=5d690548c4e1153492246d485ee69f214088d75a;hb=37278a1e7efe00011260569fa90909601e8c5184;hpb=7717e3612c10d85507abc47fbde262d39edfb8b4 diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c index 5d690548c..4c037a9eb 100644 --- a/src/bin/lttng-sessiond/kernel-consumer.c +++ b/src/bin/lttng-sessiond/kernel-consumer.c @@ -269,54 +269,3 @@ int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session) error: return ret; } - -/* - * Send relayd socket to consumer associated with a session name. - * - * On success return positive value. On error, negative value. - */ -int kernel_consumer_send_relayd_socket(int consumer_sock, - struct lttcomm_sock *sock, struct consumer_output *consumer, - enum lttng_stream_type type) -{ - int ret; - struct lttcomm_consumer_msg msg; - - /* Code flow error. Safety net. */ - assert(sock); - assert(consumer); - - /* Bail out if consumer is disabled */ - if (!consumer->enabled) { - ret = LTTCOMM_OK; - goto error; - } - - msg.cmd_type = LTTNG_CONSUMER_ADD_RELAYD_SOCKET; - /* - * Assign network consumer output index using the temporary consumer since - * this call should only be made from within a set_consumer_uri() function - * call in the session daemon. - */ - msg.u.relayd_sock.net_index = consumer->net_seq_index; - msg.u.relayd_sock.type = type; - memcpy(&msg.u.relayd_sock.sock, sock, sizeof(msg.u.relayd_sock.sock)); - - DBG2("Sending relayd sock info to consumer"); - ret = lttcomm_send_unix_sock(consumer_sock, &msg, sizeof(msg)); - if (ret < 0) { - PERROR("send consumer relayd socket info"); - goto error; - } - - DBG2("Sending relayd socket file descriptor to consumer"); - ret = consumer_send_fds(consumer_sock, &sock->fd, 1); - if (ret < 0) { - goto error; - } - - DBG("Kernel consumer relayd socket sent"); - -error: - return ret; -}