X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=92abcf21d07257ce4cfa83ad44dbf79bd833508d;hp=3a4577ab0bb36dfa98aa655447526bfdf8717131;hb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;hpb=806e2684ce24d3772af37ee46c5f0500c7a0723f diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c index 3a4577ab0..92abcf21d 100644 --- a/src/bin/lttng-sessiond/consumer.c +++ b/src/bin/lttng-sessiond/consumer.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -30,6 +31,85 @@ #include "consumer.h" +/* + * Receive a reply command status message from the consumer. Consumer socket + * lock MUST be acquired before calling this function. + * + * Return 0 on success, -1 on recv error or a negative lttng error code which + * was possibly returned by the consumer. + */ +int consumer_recv_status_reply(struct consumer_socket *sock) +{ + int ret; + struct lttcomm_consumer_status_msg reply; + + 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); + goto end; + } + + if (reply.ret_code == LTTNG_OK) { + /* All good. */ + ret = 0; + } else { + ret = -reply.ret_code; + DBG("Consumer ret code %d", ret); + } + +end: + return ret; +} + +/* + * Once the ASK_CHANNEL command is sent to the consumer, the channel + * information are sent back. This call receives that data and populates key + * and stream_count. + * + * On success return 0 and both key and stream_count are set. On error, a + * negative value is sent back and both parameters are untouched. + */ +int consumer_recv_status_channel(struct consumer_socket *sock, + uint64_t *key, unsigned int *stream_count) +{ + int ret; + struct lttcomm_consumer_status_channel reply; + + assert(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); + goto end; + } + + /* An error is possible so don't touch the key and stream_count. */ + if (reply.ret_code != LTTNG_OK) { + ret = -1; + goto end; + } + + *key = reply.key; + *stream_count = reply.stream_count; + +end: + return ret; +} + /* * Send destroy relayd command to consumer. * @@ -44,7 +124,7 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock, assert(consumer); assert(sock); - DBG2("Sending destroy relayd command to consumer..."); + DBG2("Sending destroy relayd command to consumer sock %d", sock->fd); /* Bail out if consumer is disabled */ if (!consumer->enabled) { @@ -58,14 +138,19 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock, pthread_mutex_lock(sock->lock); ret = lttcomm_send_unix_sock(sock->fd, &msg, sizeof(msg)); - pthread_mutex_unlock(sock->lock); if (ret < 0) { - PERROR("send consumer destroy relayd command"); - goto error; + /* Indicate that the consumer is probably closing at this point. */ + DBG("send consumer destroy relayd command"); + goto error_send; } + /* Don't check the return value. The caller will do it. */ + ret = consumer_recv_status_reply(sock); + DBG2("Consumer send destroy relayd command done"); +error_send: + pthread_mutex_unlock(sock->lock); error: return ret; } @@ -76,7 +161,6 @@ error: */ void consumer_output_send_destroy_relayd(struct consumer_output *consumer) { - int ret; struct lttng_ht_iter iter; struct consumer_socket *socket; @@ -87,10 +171,12 @@ void consumer_output_send_destroy_relayd(struct consumer_output *consumer) rcu_read_lock(); cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket, node.node) { + int ret; + /* Send destroy relayd command */ ret = consumer_send_destroy_relayd(socket, consumer); if (ret < 0) { - ERR("Unable to send destroy relayd command to consumer"); + DBG("Unable to send destroy relayd command to consumer"); /* Continue since we MUST delete everything at this point. */ } } @@ -274,7 +360,7 @@ struct consumer_output *consumer_create_output(enum consumer_dst_type type) /* By default, consumer output is enabled */ output->enabled = 1; output->type = type; - output->net_seq_index = -1; + output->net_seq_index = (uint64_t) -1ULL; output->socks = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); @@ -314,6 +400,7 @@ void consumer_destroy_output(struct consumer_output *obj) */ struct consumer_output *consumer_copy_output(struct consumer_output *obj) { + struct lttng_ht *tmp_ht_ptr; struct lttng_ht_iter iter; struct consumer_socket *socket, *copy_sock; struct consumer_output *output; @@ -324,22 +411,28 @@ struct consumer_output *consumer_copy_output(struct consumer_output *obj) if (output == NULL) { goto error; } + /* Avoid losing the HT reference after the memcpy() */ + tmp_ht_ptr = output->socks; memcpy(output, obj, sizeof(struct consumer_output)); - /* Copy sockets */ - output->socks = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + /* Putting back the HT pointer and start copying socket(s). */ + output->socks = tmp_ht_ptr; + rcu_read_lock(); cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) { /* Create new socket object. */ copy_sock = consumer_allocate_socket(socket->fd); if (copy_sock == NULL) { + rcu_read_unlock(); goto malloc_error; } + copy_sock->registered = socket->registered; copy_sock->lock = socket->lock; consumer_add_socket(copy_sock, output); } + rcu_read_unlock(); error: return output; @@ -440,19 +533,49 @@ error: /* * Send file descriptor to consumer via sock. */ -int consumer_send_fds(int sock, int *fds, size_t nb_fd) +int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd) { int ret; assert(fds); + assert(sock); assert(nb_fd > 0); - ret = lttcomm_send_fds_unix_sock(sock, fds, nb_fd); + ret = lttcomm_send_fds_unix_sock(sock->fd, fds, nb_fd); if (ret < 0) { - PERROR("send consumer fds"); + /* The above call will print a PERROR on error. */ + DBG("Error when sending consumer fds on sock %d", sock->fd); goto error; } + ret = consumer_recv_status_reply(sock); + +error: + return ret; +} + +/* + * Consumer send communication message structure to consumer. + */ +int consumer_send_msg(struct consumer_socket *sock, + struct lttcomm_consumer_msg *msg) +{ + int ret; + + assert(msg); + assert(sock); + assert(sock->fd >= 0); + + 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 channel on sock %d", sock->fd); + goto error; + } + + ret = consumer_recv_status_reply(sock); + error: return ret; } @@ -460,48 +583,117 @@ error: /* * Consumer send channel communication message structure to consumer. */ -int consumer_send_channel(int sock, struct lttcomm_consumer_msg *msg) +int consumer_send_channel(struct consumer_socket *sock, + struct lttcomm_consumer_msg *msg) { int ret; assert(msg); - assert(sock >= 0); + assert(sock); + assert(sock->fd >= 0); - ret = lttcomm_send_unix_sock(sock, msg, + ret = lttcomm_send_unix_sock(sock->fd, msg, sizeof(struct lttcomm_consumer_msg)); if (ret < 0) { - PERROR("send consumer channel"); + /* 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; } +/* + * Populate the given consumer msg structure with the ask_channel command + * information. + */ +void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, + uint64_t subbuf_size, + uint64_t num_subbuf, + int overwrite, + unsigned int switch_timer_interval, + unsigned int read_timer_interval, + int output, + int type, + uint64_t session_id, + const char *pathname, + const char *name, + uid_t uid, + gid_t gid, + uint64_t relayd_id, + uint64_t key, + unsigned char *uuid) +{ + assert(msg); + + /* Zeroed structure */ + memset(msg, 0, sizeof(struct lttcomm_consumer_msg)); + + msg->cmd_type = LTTNG_CONSUMER_ASK_CHANNEL_CREATION; + msg->u.ask_channel.subbuf_size = subbuf_size; + msg->u.ask_channel.num_subbuf = num_subbuf ; + 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.output = output; + msg->u.ask_channel.type = type; + msg->u.ask_channel.session_id = session_id; + msg->u.ask_channel.uid = uid; + msg->u.ask_channel.gid = gid; + msg->u.ask_channel.relayd_id = relayd_id; + msg->u.ask_channel.key = key; + + memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid)); + + strncpy(msg->u.ask_channel.pathname, pathname, + sizeof(msg->u.ask_channel.pathname)); + msg->u.ask_channel.pathname[sizeof(msg->u.ask_channel.pathname)-1] = '\0'; + + strncpy(msg->u.ask_channel.name, name, sizeof(msg->u.ask_channel.name)); + msg->u.ask_channel.name[sizeof(msg->u.ask_channel.name) - 1] = '\0'; +} + /* * Init channel communication message structure. */ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, enum lttng_consumer_command cmd, - int channel_key, - uint64_t max_sb_size, - uint64_t mmap_len, + uint64_t channel_key, + uint64_t session_id, + const char *pathname, + uid_t uid, + gid_t gid, + uint64_t relayd_id, const char *name, - unsigned int nb_init_streams) + unsigned int nb_init_streams, + enum lttng_event_output output, + int type) { assert(msg); - /* TODO: Args validation */ - /* Zeroed structure */ memset(msg, 0, sizeof(struct lttcomm_consumer_msg)); /* Send channel */ msg->cmd_type = cmd; msg->u.channel.channel_key = channel_key; - msg->u.channel.max_sb_size = max_sb_size; - msg->u.channel.mmap_len = mmap_len; + msg->u.channel.session_id = session_id; + msg->u.channel.uid = uid; + msg->u.channel.gid = gid; + msg->u.channel.relayd_id = relayd_id; msg->u.channel.nb_init_streams = nb_init_streams; + msg->u.channel.output = output; + msg->u.channel.type = type; + + strncpy(msg->u.channel.pathname, pathname, + sizeof(msg->u.channel.pathname)); + msg->u.channel.pathname[sizeof(msg->u.channel.pathname) - 1] = '\0'; + + strncpy(msg->u.channel.name, name, sizeof(msg->u.channel.name)); + msg->u.channel.name[sizeof(msg->u.channel.name) - 1] = '\0'; } /* @@ -509,82 +701,45 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, */ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg, enum lttng_consumer_command cmd, - int channel_key, - int stream_key, - uint32_t state, - enum lttng_event_output output, - uint64_t mmap_len, - uid_t uid, - gid_t gid, - int net_index, - unsigned int metadata_flag, - const char *name, - const char *pathname, - unsigned int session_id) + uint64_t channel_key, + uint64_t stream_key, + int cpu) { assert(msg); memset(msg, 0, sizeof(struct lttcomm_consumer_msg)); - /* TODO: Args validation */ - msg->cmd_type = cmd; msg->u.stream.channel_key = channel_key; msg->u.stream.stream_key = stream_key; - msg->u.stream.state = state; - msg->u.stream.output = output; - msg->u.stream.mmap_len = mmap_len; - msg->u.stream.uid = uid; - msg->u.stream.gid = gid; - msg->u.stream.net_index = net_index; - msg->u.stream.metadata_flag = metadata_flag; - msg->u.stream.session_id = (uint64_t) session_id; - strncpy(msg->u.stream.name, name, sizeof(msg->u.stream.name)); - msg->u.stream.name[sizeof(msg->u.stream.name) - 1] = '\0'; - strncpy(msg->u.stream.path_name, pathname, - sizeof(msg->u.stream.path_name)); - msg->u.stream.path_name[sizeof(msg->u.stream.path_name) - 1] = '\0'; + msg->u.stream.cpu = cpu; } /* * Send stream communication structure to the consumer. */ -int consumer_send_stream(int sock, struct consumer_output *dst, - struct lttcomm_consumer_msg *msg, int *fds, size_t nb_fd) +int consumer_send_stream(struct consumer_socket *sock, + struct consumer_output *dst, struct lttcomm_consumer_msg *msg, + int *fds, size_t nb_fd) { int ret; assert(msg); assert(dst); + assert(sock); + assert(fds); - switch (dst->type) { - case CONSUMER_DST_NET: - /* Consumer should send the stream on the network. */ - msg->u.stream.net_index = dst->net_seq_index; - break; - case CONSUMER_DST_LOCAL: - /* Add stream file name to stream path */ - strncat(msg->u.stream.path_name, "/", - sizeof(msg->u.stream.path_name) - - strlen(msg->u.stream.path_name) - 1); - strncat(msg->u.stream.path_name, msg->u.stream.name, - sizeof(msg->u.stream.path_name) - - strlen(msg->u.stream.path_name) - 1); - msg->u.stream.path_name[sizeof(msg->u.stream.path_name) - 1] = '\0'; - /* Indicate that the stream is NOT network */ - msg->u.stream.net_index = -1; - break; - default: - ERR("Consumer unknown output type (%d)", dst->type); - ret = -1; + /* 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; } - /* Send on socket */ - ret = lttcomm_send_unix_sock(sock, msg, - sizeof(struct lttcomm_consumer_msg)); + ret = consumer_recv_status_reply(sock); if (ret < 0) { - PERROR("send consumer stream"); goto error; } @@ -602,9 +757,9 @@ error: * * On success return positive value. On error, negative value. */ -int consumer_send_relayd_socket(int consumer_sock, +int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, struct lttcomm_sock *sock, struct consumer_output *consumer, - enum lttng_stream_type type) + enum lttng_stream_type type, uint64_t session_id) { int ret; struct lttcomm_consumer_msg msg; @@ -612,6 +767,7 @@ int consumer_send_relayd_socket(int consumer_sock, /* Code flow error. Safety net. */ assert(sock); assert(consumer); + assert(consumer_sock); /* Bail out if consumer is disabled */ if (!consumer->enabled) { @@ -627,12 +783,19 @@ int consumer_send_relayd_socket(int consumer_sock, */ msg.u.relayd_sock.net_index = consumer->net_seq_index; msg.u.relayd_sock.type = type; + msg.u.relayd_sock.session_id = session_id; memcpy(&msg.u.relayd_sock.sock, sock, sizeof(msg.u.relayd_sock.sock)); - DBG3("Sending relayd sock info to consumer on %d", consumer_sock); - ret = lttcomm_send_unix_sock(consumer_sock, &msg, sizeof(msg)); + 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", sock->fd); + goto error; + } + + ret = consumer_recv_status_reply(consumer_sock); if (ret < 0) { - PERROR("send consumer relayd socket info"); goto error; } @@ -697,29 +860,31 @@ error: } /* - * Ask the consumer if the data is ready to bread (available) for the specific + * Ask the consumer if the data is ready to read (NOT pending) for the specific * session id. * * This function has a different behavior with the consumer i.e. that it waits - * for a reply from the consumer if yes or no the data is available. + * for a reply from the consumer if yes or no the data is pending. */ -int consumer_is_data_available(unsigned int id, +int consumer_is_data_pending(uint64_t session_id, struct consumer_output *consumer) { int ret; - int32_t ret_code; + int32_t ret_code = 0; /* Default is that the data is NOT pending */ struct consumer_socket *socket; struct lttng_ht_iter iter; struct lttcomm_consumer_msg msg; assert(consumer); - msg.cmd_type = LTTNG_CONSUMER_DATA_AVAILABLE; + msg.cmd_type = LTTNG_CONSUMER_DATA_PENDING; - msg.u.data_available.session_id = (uint64_t) id; + msg.u.data_pending.session_id = session_id; - DBG3("Consumer data available for id %u", id); + DBG3("Consumer data pending for id %" PRIu64, session_id); + /* Send command for each consumer */ + rcu_read_lock(); cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket, node.node) { /* Code flow error */ @@ -729,32 +894,42 @@ int consumer_is_data_available(unsigned int id, ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg)); if (ret < 0) { - PERROR("send consumer data available command"); + /* 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; + goto error_unlock; } /* - * Waiting for the reply code where 0 the data is not available and 1 - * it is for trace reading. + * No need for a recv reply status because the answer to the command is + * the reply status message. */ + ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code)); - if (ret < 0) { - PERROR("recv consumer data available status"); + 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); pthread_mutex_unlock(socket->lock); - goto error; + goto error_unlock; } pthread_mutex_unlock(socket->lock); - if (ret_code == 0) { + if (ret_code == 1) { break; } } + rcu_read_unlock(); - DBG("Consumer data available ret %d", ret_code); + DBG("Consumer data is %s pending for session id %" PRIu64, + ret_code == 1 ? "" : "NOT", session_id); return ret_code; -error: +error_unlock: + rcu_read_unlock(); return -1; }