X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=8806e9c322bef43b818975bee8f44bc520e3aa53;hp=39a1946380120db04419809e52a147a08b999726;hb=a4baae1b0463bc4ce65c2a458c4a941e7fabc594;hpb=4ce514c43483ba24fd935024da5b7aca681a7e52 diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c index 39a194638..8806e9c32 100644 --- a/src/bin/lttng-sessiond/consumer.c +++ b/src/bin/lttng-sessiond/consumer.c @@ -28,12 +28,101 @@ #include #include #include +#include #include "consumer.h" -#include "health.h" +#include "health-sessiond.h" #include "ust-app.h" #include "utils.h" +/* + * Send a data payload using a given consumer socket of size len. + * + * The consumer socket lock MUST be acquired before calling this since this + * function can change the fd value. + * + * Return 0 on success else a negative value on error. + */ +int consumer_socket_send(struct consumer_socket *socket, void *msg, size_t len) +{ + int fd; + ssize_t size; + + assert(socket); + assert(socket->fd_ptr); + assert(msg); + + /* Consumer socket is invalid. Stopping. */ + fd = *socket->fd_ptr; + if (fd < 0) { + goto error; + } + + size = lttcomm_send_unix_sock(fd, msg, len); + if (size < 0) { + /* The above call will print a PERROR on error. */ + DBG("Error when sending data to consumer on sock %d", fd); + /* + * At this point, the socket is not usable anymore thus closing it and + * setting the file descriptor to -1 so it is not reused. + */ + + /* This call will PERROR on error. */ + (void) lttcomm_close_unix_sock(fd); + *socket->fd_ptr = -1; + goto error; + } + + return 0; + +error: + return -1; +} + +/* + * Receive a data payload using a given consumer socket of size len. + * + * The consumer socket lock MUST be acquired before calling this since this + * function can change the fd value. + * + * Return 0 on success else a negative value on error. + */ +int consumer_socket_recv(struct consumer_socket *socket, void *msg, size_t len) +{ + int fd; + ssize_t size; + + assert(socket); + assert(socket->fd_ptr); + assert(msg); + + /* Consumer socket is invalid. Stopping. */ + fd = *socket->fd_ptr; + if (fd < 0) { + goto error; + } + + size = lttcomm_recv_unix_sock(fd, msg, len); + if (size <= 0) { + /* The above call will print a PERROR on error. */ + DBG("Error when receiving data from the consumer socket %d", fd); + /* + * At this point, the socket is not usable anymore thus closing it and + * setting the file descriptor to -1 so it is not reused. + */ + + /* This call will PERROR on error. */ + (void) lttcomm_close_unix_sock(fd); + *socket->fd_ptr = -1; + goto error; + } + + return 0; + +error: + return -1; +} + /* * Receive a reply command status message from the consumer. Consumer socket * lock MUST be acquired before calling this function. @@ -48,18 +137,12 @@ int consumer_recv_status_reply(struct consumer_socket *sock) assert(sock); - ret = lttcomm_recv_unix_sock(*sock->fd, &reply, sizeof(reply)); - if (ret <= 0) { - if (ret == 0) { - /* Orderly shutdown. Don't return 0 which means success. */ - ret = -1; - } - /* The above call will print a PERROR on error. */ - DBG("Fail to receive status reply on sock %d", *sock->fd); + ret = consumer_socket_recv(sock, &reply, sizeof(reply)); + if (ret < 0) { goto end; } - if (reply.ret_code == LTTNG_OK) { + if (reply.ret_code == LTTCOMM_CONSUMERD_SUCCESS) { /* All good. */ ret = 0; } else { @@ -89,25 +172,20 @@ int consumer_recv_status_channel(struct consumer_socket *sock, assert(stream_count); assert(key); - ret = lttcomm_recv_unix_sock(*sock->fd, &reply, sizeof(reply)); - if (ret <= 0) { - if (ret == 0) { - /* Orderly shutdown. Don't return 0 which means success. */ - ret = -1; - } - /* The above call will print a PERROR on error. */ - DBG("Fail to receive status reply on sock %d", *sock->fd); + ret = consumer_socket_recv(sock, &reply, sizeof(reply)); + if (ret < 0) { goto end; } /* An error is possible so don't touch the key and stream_count. */ - if (reply.ret_code != LTTNG_OK) { + if (reply.ret_code != LTTCOMM_CONSUMERD_SUCCESS) { ret = -1; goto end; } *key = reply.key; *stream_count = reply.stream_count; + ret = 0; end: return ret; @@ -127,24 +205,15 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock, assert(consumer); assert(sock); - DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd); - - /* Bail out if consumer is disabled */ - if (!consumer->enabled) { - ret = LTTNG_OK; - DBG3("Consumer is disabled"); - goto error; - } + DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd_ptr); msg.cmd_type = LTTNG_CONSUMER_DESTROY_RELAYD; msg.u.destroy_relayd.net_seq_idx = consumer->net_seq_index; pthread_mutex_lock(sock->lock); - ret = lttcomm_send_unix_sock(*sock->fd, &msg, sizeof(msg)); + ret = consumer_socket_send(sock, &msg, sizeof(msg)); if (ret < 0) { - /* Indicate that the consumer is probably closing at this point. */ - DBG("send consumer destroy relayd command"); - goto error_send; + goto error; } /* Don't check the return value. The caller will do it. */ @@ -152,9 +221,8 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock, DBG2("Consumer send destroy relayd command done"); -error_send: - pthread_mutex_unlock(sock->lock); error: + pthread_mutex_unlock(sock->lock); return ret; } @@ -312,7 +380,7 @@ struct consumer_socket *consumer_allocate_socket(int *fd) goto error; } - socket->fd = fd; + socket->fd_ptr = fd; lttng_ht_node_init_ulong(&socket->node, *fd); error: @@ -377,8 +445,8 @@ void consumer_destroy_socket(struct consumer_socket *sock) * consumer was registered, */ if (sock->registered) { - DBG3("Consumer socket was registered. Closing fd %d", *sock->fd); - lttcomm_close_unix_sock(*sock->fd); + DBG3("Consumer socket was registered. Closing fd %d", *sock->fd_ptr); + lttcomm_close_unix_sock(*sock->fd_ptr); } call_rcu(&sock->node.head, destroy_socket_rcu); @@ -509,13 +577,13 @@ int consumer_copy_sockets(struct consumer_output *dst, rcu_read_lock(); cds_lfht_for_each_entry(src->socks->ht, &iter.iter, socket, node.node) { /* Ignore socket that are already there. */ - copy_sock = consumer_find_socket(*socket->fd, dst); + copy_sock = consumer_find_socket(*socket->fd_ptr, dst); if (copy_sock) { continue; } /* Create new socket object. */ - copy_sock = consumer_allocate_socket(socket->fd); + copy_sock = consumer_allocate_socket(socket->fd_ptr); if (copy_sock == NULL) { rcu_read_unlock(); ret = -ENOMEM; @@ -648,13 +716,12 @@ int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd) assert(fds); assert(sock); - assert(sock->fd); assert(nb_fd > 0); - ret = lttcomm_send_fds_unix_sock(*sock->fd, fds, nb_fd); + ret = lttcomm_send_fds_unix_sock(*sock->fd_ptr, fds, nb_fd); if (ret < 0) { /* The above call will print a PERROR on error. */ - DBG("Error when sending consumer fds on sock %d", *sock->fd); + DBG("Error when sending consumer fds on sock %d", *sock->fd_ptr); goto error; } @@ -674,13 +741,9 @@ int consumer_send_msg(struct consumer_socket *sock, assert(msg); assert(sock); - assert(sock->fd); - ret = lttcomm_send_unix_sock(*sock->fd, msg, - sizeof(struct lttcomm_consumer_msg)); + ret = consumer_socket_send(sock, msg, sizeof(struct lttcomm_consumer_msg)); if (ret < 0) { - /* The above call will print a PERROR on error. */ - DBG("Error when sending consumer channel on sock %d", *sock->fd); goto error; } @@ -700,18 +763,12 @@ int consumer_send_channel(struct consumer_socket *sock, assert(msg); assert(sock); - assert(sock->fd); - ret = lttcomm_send_unix_sock(*sock->fd, msg, - sizeof(struct lttcomm_consumer_msg)); + ret = consumer_send_msg(sock, msg); if (ret < 0) { - /* The above call will print a PERROR on error. */ - DBG("Error when sending consumer channel on sock %d", *sock->fd); goto error; } - ret = consumer_recv_status_reply(sock); - error: return ret; } @@ -726,6 +783,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, int overwrite, unsigned int switch_timer_interval, unsigned int read_timer_interval, + unsigned int live_timer_interval, int output, int type, uint64_t session_id, @@ -754,6 +812,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, msg->u.ask_channel.overwrite = overwrite; msg->u.ask_channel.switch_timer_interval = switch_timer_interval; msg->u.ask_channel.read_timer_interval = read_timer_interval; + msg->u.ask_channel.live_timer_interval = live_timer_interval; msg->u.ask_channel.output = output; msg->u.ask_channel.type = type; msg->u.ask_channel.session_id = session_id; @@ -797,7 +856,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, int type, uint64_t tracefile_size, uint64_t tracefile_count, - unsigned int monitor) + unsigned int monitor, + unsigned int live_timer_interval) { assert(msg); @@ -817,6 +877,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, msg->u.channel.tracefile_size = tracefile_size; msg->u.channel.tracefile_count = tracefile_count; msg->u.channel.monitor = monitor; + msg->u.channel.live_timer_interval = live_timer_interval; strncpy(msg->u.channel.pathname, pathname, sizeof(msg->u.channel.pathname)); @@ -845,6 +906,19 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg, msg->u.stream.cpu = cpu; } +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) +{ + assert(msg); + + memset(msg, 0, sizeof(struct lttcomm_consumer_msg)); + + msg->cmd_type = cmd; + msg->u.sent_streams.channel_key = channel_key; + msg->u.sent_streams.net_seq_idx = net_seq_idx; +} + /* * Send stream communication structure to the consumer. */ @@ -857,19 +931,9 @@ int consumer_send_stream(struct consumer_socket *sock, assert(msg); assert(dst); assert(sock); - assert(sock->fd); assert(fds); - /* Send on socket */ - ret = lttcomm_send_unix_sock(*sock->fd, msg, - sizeof(struct lttcomm_consumer_msg)); - if (ret < 0) { - /* The above call will print a PERROR on error. */ - DBG("Error when sending consumer stream on sock %d", *sock->fd); - goto error; - } - - ret = consumer_recv_status_reply(sock); + ret = consumer_send_msg(sock, msg); if (ret < 0) { goto error; } @@ -890,7 +954,8 @@ error: */ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer, - enum lttng_stream_type type, uint64_t session_id) + enum lttng_stream_type type, uint64_t session_id, + char *session_name, char *hostname, int session_live_timer) { int ret; struct lttcomm_consumer_msg msg; @@ -899,7 +964,6 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, assert(rsock); assert(consumer); assert(consumer_sock); - assert(consumer_sock->fd); /* Bail out if consumer is disabled */ if (!consumer->enabled) { @@ -907,6 +971,18 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, goto error; } + if (type == LTTNG_STREAM_CONTROL) { + ret = relayd_create_session(rsock, + &msg.u.relayd_sock.relayd_session_id, + session_name, hostname, session_live_timer, + consumer->snapshot); + if (ret < 0) { + /* Close the control socket. */ + (void) relayd_close(rsock); + goto error; + } + } + msg.cmd_type = LTTNG_CONSUMER_ADD_RELAYD_SOCKET; /* * Assign network consumer output index using the temporary consumer since @@ -918,15 +994,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, msg.u.relayd_sock.session_id = session_id; memcpy(&msg.u.relayd_sock.sock, rsock, sizeof(msg.u.relayd_sock.sock)); - DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd); - ret = lttcomm_send_unix_sock(*consumer_sock->fd, &msg, sizeof(msg)); - if (ret < 0) { - /* The above call will print a PERROR on error. */ - DBG("Error when sending relayd sockets on sock %d", rsock->sock.fd); - goto error; - } - - ret = consumer_recv_status_reply(consumer_sock); + DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd_ptr); + ret = consumer_send_msg(consumer_sock, &msg); if (ret < 0) { goto error; } @@ -1019,15 +1088,9 @@ int consumer_is_data_pending(uint64_t session_id, rcu_read_lock(); cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket, node.node) { - /* Code flow error */ - assert(socket->fd); - pthread_mutex_lock(socket->lock); - - ret = lttcomm_send_unix_sock(*socket->fd, &msg, sizeof(msg)); + ret = consumer_socket_send(socket, &msg, sizeof(msg)); if (ret < 0) { - /* The above call will print a PERROR on error. */ - DBG("Error on consumer is data pending on sock %d", *socket->fd); pthread_mutex_unlock(socket->lock); goto error_unlock; } @@ -1037,18 +1100,11 @@ int consumer_is_data_pending(uint64_t session_id, * the reply status message. */ - ret = lttcomm_recv_unix_sock(*socket->fd, &ret_code, sizeof(ret_code)); - if (ret <= 0) { - if (ret == 0) { - /* Orderly shutdown. Don't return 0 which means success. */ - ret = -1; - } - /* The above call will print a PERROR on error. */ - DBG("Error on recv consumer is data pending on sock %d", *socket->fd); + ret = consumer_socket_recv(socket, &ret_code, sizeof(ret_code)); + if (ret < 0) { pthread_mutex_unlock(socket->lock); goto error_unlock; } - pthread_mutex_unlock(socket->lock); if (ret_code == 1) { @@ -1077,7 +1133,6 @@ int consumer_flush_channel(struct consumer_socket *socket, uint64_t key) struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd); DBG2("Consumer flush channel key %" PRIu64, key); @@ -1110,7 +1165,6 @@ int consumer_close_metadata(struct consumer_socket *socket, struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd); DBG2("Consumer close metadata channel key %" PRIu64, metadata_key); @@ -1143,7 +1197,6 @@ int consumer_setup_metadata(struct consumer_socket *socket, struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd); DBG2("Consumer setup metadata channel key %" PRIu64, metadata_key); @@ -1177,9 +1230,8 @@ int consumer_push_metadata(struct consumer_socket *socket, struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd); - DBG2("Consumer push metadata to consumer socket %d", *socket->fd); + DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr); msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA; msg.u.push_metadata.key = metadata_key; @@ -1192,9 +1244,10 @@ int consumer_push_metadata(struct consumer_socket *socket, goto end; } - DBG3("Consumer pushing metadata on sock %d of len %zu", *socket->fd, len); + DBG3("Consumer pushing metadata on sock %d of len %zu", *socket->fd_ptr, + len); - ret = lttcomm_send_unix_sock(*socket->fd, metadata_str, len); + ret = consumer_socket_send(socket, metadata_str, len); if (ret < 0) { goto end; } @@ -1223,7 +1276,6 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key, struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd); assert(output); assert(output->consumer);