X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=ee56d6dea67b61406fd1d5ba946c03a23e6612a3;hp=b0264e4bab3f81eccfe31971178e933a73de92b8;hb=8782cc7477fae212607b9fd6395a4b2e2d3357ed;hpb=45893984238b2e2c12fc0d84b90336c98a6d98c9 diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index b0264e4ba..ee56d6dea 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -28,7 +28,10 @@ #include #include "consumer.h" +#include "health-sessiond.h" #include "ust-consumer.h" +#include "buffer-registry.h" +#include "session.h" /* * Return allocated full pathname of the session using the consumer trace path @@ -58,7 +61,7 @@ static char *setup_trace_path(struct consumer_output *consumer, /* Get correct path name destination */ if (consumer->type == CONSUMER_DST_LOCAL) { /* Set application path to the destination path */ - ret = snprintf(pathname, PATH_MAX, "%s/%s/%s", + ret = snprintf(pathname, PATH_MAX, "%s%s%s", consumer->dst.trace_path, consumer->subdir, ua_sess->path); if (ret < 0) { PERROR("snprintf channel path"); @@ -66,8 +69,8 @@ static char *setup_trace_path(struct consumer_output *consumer, } /* Create directory. Ignore if exist. */ - ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, ua_sess->uid, - ua_sess->gid); + ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, + ua_sess->euid, ua_sess->egid); if (ret < 0) { if (ret != -EEXIST) { ERR("Trace directory creation error"); @@ -75,7 +78,7 @@ static char *setup_trace_path(struct consumer_output *consumer, } } } else { - ret = snprintf(pathname, PATH_MAX, "%s/%s", consumer->subdir, + ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir, ua_sess->path); if (ret < 0) { PERROR("snprintf channel path"); @@ -93,29 +96,49 @@ error: /* * Send a single channel to the consumer using command ADD_CHANNEL. * - * Consumer socket MUST be acquired before calling this. + * Consumer socket lock MUST be acquired before calling this. */ static int ask_channel_creation(struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket) + struct consumer_socket *socket, struct ust_registry_session *registry) { int ret; - uint64_t key; + uint32_t chan_id; + uint64_t key, chan_reg_key; char *pathname = NULL; struct lttcomm_consumer_msg msg; + struct ust_registry_channel *chan_reg; assert(ua_sess); assert(ua_chan); assert(socket); assert(consumer); + assert(registry); DBG2("Asking UST consumer for channel"); /* Get and create full trace path of session. */ - pathname = setup_trace_path(consumer, ua_sess); - if (!pathname) { - ret = -1; - goto error; + if (ua_sess->output_traces) { + pathname = setup_trace_path(consumer, ua_sess); + if (!pathname) { + ret = -1; + goto error; + } + } + + /* Depending on the buffer type, a different channel key is used. */ + if (ua_sess->buffer_type == LTTNG_BUFFER_PER_UID) { + chan_reg_key = ua_chan->tracing_channel_id; + } else { + chan_reg_key = ua_chan->key; + } + + if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) { + chan_id = -1U; + } else { + chan_reg = ust_registry_channel_find(registry, chan_reg_key); + assert(chan_reg); + chan_id = chan_reg->chan_id; } consumer_init_ask_channel_comm_msg(&msg, @@ -124,20 +147,27 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_chan->attr.overwrite, ua_chan->attr.switch_timer_interval, ua_chan->attr.read_timer_interval, + ua_sess->live_timer_interval, (int) ua_chan->attr.output, (int) ua_chan->attr.type, - ua_sess->id, + ua_sess->tracing_id, pathname, ua_chan->name, - ua_sess->uid, - ua_sess->gid, + ua_sess->euid, + ua_sess->egid, consumer->net_seq_index, ua_chan->key, - ua_sess->registry->uuid); + registry->uuid, + chan_id, + ua_chan->tracefile_size, + ua_chan->tracefile_count, + ua_sess->id, + ua_sess->output_traces, + ua_sess->uid); health_code_update(); - ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg)); + ret = consumer_socket_send(socket, &msg, sizeof(msg)); if (ret < 0) { goto error; } @@ -150,7 +180,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, /* Communication protocol error. */ assert(key == ua_chan->key); /* We need at least one where 1 stream for 1 cpu. */ - assert(ua_chan->expected_stream_count > 0); + if (ua_sess->output_traces) { + assert(ua_chan->expected_stream_count > 0); + } DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key, ua_chan->expected_stream_count); @@ -168,7 +200,7 @@ error: */ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket) + struct consumer_socket *socket, struct ust_registry_session *registry) { int ret; @@ -176,11 +208,17 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, assert(ua_chan); assert(consumer); assert(socket); - assert(socket->fd >= 0); + assert(registry); + + if (!consumer->enabled) { + ret = -LTTNG_ERR_NO_CONSUMER; + DBG3("Consumer is disabled"); + goto error; + } pthread_mutex_lock(socket->lock); - ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket); + ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry); if (ret < 0) { goto error; } @@ -204,7 +242,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket, assert(ua_chan); assert(socket); - assert(socket->fd >= 0); msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL; msg.u.get_channel.key = ua_chan->key; @@ -219,11 +256,11 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } /* First, get the channel from consumer. */ - ret = ustctl_recv_channel_from_consumer(socket->fd, &ua_chan->obj); + ret = ustctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj); if (ret < 0) { if (ret != -EPIPE) { ERR("Error recv channel from consumer %d with ret %d", - socket->fd, ret); + *socket->fd_ptr, ret); } else { DBG3("UST app recv channel from consumer. Consumer is dead."); } @@ -242,7 +279,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } /* Stream object is populated by this call if successful. */ - ret = ustctl_recv_stream_from_consumer(socket->fd, &stream->obj); + ret = ustctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj); if (ret < 0) { free(stream); if (ret == -LTTNG_UST_ERR_NOENT) { @@ -252,7 +289,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } if (ret != -EPIPE) { ERR("Recv stream from consumer %d with ret %d", - socket->fd, ret); + *socket->fd_ptr, ret); } else { DBG3("UST app recv stream from consumer. Consumer is dead."); } @@ -299,7 +336,6 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket, assert(ua_chan); assert(socket); - assert(socket->fd >= 0); msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL; msg.u.destroy_channel.key = ua_chan->key; @@ -366,8 +402,8 @@ int ust_consumer_send_channel_to_ust(struct ust_app *app, assert(channel); assert(channel->obj); - DBG2("UST app send channel to app sock %d pid %d (name: %s, key: %lu)", - app->sock, app->pid, channel->name, channel->key); + DBG2("UST app send channel to sock %d pid %d (name: %s, key: %" PRIu64 ")", + app->sock, app->pid, channel->name, channel->tracing_channel_id); /* Send stream to application. */ ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj); @@ -386,129 +422,72 @@ error: } /* - * Send metadata string to consumer. + * Handle the metadata requests from the UST consumer * * Return 0 on success else a negative value. */ -int ust_consumer_push_metadata(struct consumer_socket *socket, - struct ust_app_session *ua_sess, char *metadata_str, - size_t len, size_t target_offset) +int ust_consumer_metadata_request(struct consumer_socket *socket) { int ret; + ssize_t ret_push; + struct lttcomm_metadata_request_msg request; + struct buffer_reg_uid *reg_uid; + struct ust_registry_session *ust_reg; struct lttcomm_consumer_msg msg; assert(socket); - assert(socket->fd >= 0); - assert(ua_sess); - assert(ua_sess->metadata); - - DBG2("UST consumer push metadata to consumer socket %d", socket->fd); - - msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA; - msg.u.push_metadata.key = ua_sess->metadata->key; - msg.u.push_metadata.target_offset = target_offset; - msg.u.push_metadata.len = len; - /* - * TODO: reenable these locks when the consumerd gets the ability to - * reorder the metadata it receives. This fits with locking in - * src/bin/lttng-sessiond/ust-app.c:push_metadata() - * - * pthread_mutex_lock(socket->lock); - */ + rcu_read_lock(); + pthread_mutex_lock(socket->lock); health_code_update(); - ret = consumer_send_msg(socket, &msg); - if (ret < 0) { - goto error; - } - DBG3("UST consumer push metadata on sock %d of len %lu", socket->fd, len); - - ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len); + /* Wait for a metadata request */ + ret = consumer_socket_recv(socket, &request, sizeof(request)); if (ret < 0) { - fprintf(stderr, "send error: %d\n", ret); - goto error; - } - - health_code_update(); - ret = consumer_recv_status_reply(socket); - if (ret < 0) { - goto error; + goto end; } -error: - health_code_update(); - /* - * pthread_mutex_unlock(socket->lock); - */ - return ret; -} - -/* - * Send a close metdata command to consumer using the given channel key. - * - * Return 0 on success else a negative value. - */ -int ust_consumer_close_metadata(struct consumer_socket *socket, - struct ust_app_channel *ua_chan) -{ - int ret; - struct lttcomm_consumer_msg msg; - - assert(ua_chan); - assert(socket); - assert(socket->fd >= 0); - - DBG2("UST consumer close metadata channel key %lu", ua_chan->key); + DBG("Metadata request received for session %" PRIu64 ", key %" PRIu64, + request.session_id, request.key); - msg.cmd_type = LTTNG_CONSUMER_CLOSE_METADATA; - msg.u.close_metadata.key = ua_chan->key; - - pthread_mutex_lock(socket->lock); - health_code_update(); - - ret = consumer_send_msg(socket, &msg); - if (ret < 0) { - goto error; + reg_uid = buffer_reg_uid_find(request.session_id, + request.bits_per_long, request.uid); + if (reg_uid) { + ust_reg = reg_uid->registry->reg.ust; + } else { + struct buffer_reg_pid *reg_pid = + buffer_reg_pid_find(request.session_id_per_pid); + if (!reg_pid) { + DBG("PID registry not found for session id %" PRIu64, + request.session_id_per_pid); + + msg.cmd_type = LTTNG_ERR_UND; + (void) consumer_send_msg(socket, &msg); + /* + * This is possible since the session might have been destroyed + * during a consumer metadata request. So here, return gracefully + * because the destroy session will push the remaining metadata to + * the consumer. + */ + ret = 0; + goto end; + } + ust_reg = reg_pid->registry->reg.ust; } + assert(ust_reg); -error: - health_code_update(); - pthread_mutex_unlock(socket->lock); - return ret; -} - -/* - * Send a setup metdata command to consumer using the given channel key. - * - * Return 0 on success else a negative value. - */ -int ust_consumer_setup_metadata(struct consumer_socket *socket, - struct ust_app_channel *ua_chan) -{ - int ret; - struct lttcomm_consumer_msg msg; - - assert(ua_chan); - assert(socket); - assert(socket->fd >= 0); - - DBG2("UST consumer setup metadata channel key %lu", ua_chan->key); - - msg.cmd_type = LTTNG_CONSUMER_SETUP_METADATA; - msg.u.setup_metadata.key = ua_chan->key; - - pthread_mutex_lock(socket->lock); - health_code_update(); - - ret = consumer_send_msg(socket, &msg); - if (ret < 0) { - goto error; + ret_push = ust_app_push_metadata(ust_reg, socket, 1); + if (ret_push < 0) { + ERR("Pushing metadata"); + ret = -1; + goto end; } + DBG("UST Consumer metadata pushed successfully"); + ret = 0; -error: - health_code_update(); +end: pthread_mutex_unlock(socket->lock); + rcu_read_unlock(); return ret; }