X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=25dc7ed1c6da96c5fa8cfba14e95d78dab0e9ac1;hp=611b54dcdb17d392f14bd42dc98320a0cb098b61;hb=a2814ea7573bf5edd5323d6f89c48ff14105db69;hpb=dc2bbdaea73908117fdccc5e8247b613bd3b8600 diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 611b54dcd..25dc7ed1c 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -1,21 +1,10 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -25,83 +14,28 @@ #include #include -#include +#include #include #include "consumer.h" #include "health-sessiond.h" #include "ust-consumer.h" +#include "lttng-ust-error.h" #include "buffer-registry.h" #include "session.h" +#include "lttng-sessiond.h" /* - * Return allocated full pathname of the session using the consumer trace path - * and subdir if available. On a successful allocation, the directory of the - * trace is created with the session credentials. - * - * The caller can safely free(3) the returned value. On error, NULL is - * returned. - */ -static char *setup_trace_path(struct consumer_output *consumer, - struct ust_app_session *ua_sess) -{ - int ret; - char *pathname; - - assert(consumer); - assert(ua_sess); - - health_code_update(); - - /* Allocate our self the string to make sure we never exceed PATH_MAX. */ - pathname = zmalloc(PATH_MAX); - if (!pathname) { - goto error; - } - - /* 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", - consumer->dst.trace_path, consumer->subdir, ua_sess->path); - if (ret < 0) { - PERROR("snprintf channel path"); - goto error; - } - - /* Create directory. Ignore if exist. */ - 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"); - goto error; - } - } - } else { - ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir, - ua_sess->path); - if (ret < 0) { - PERROR("snprintf channel path"); - goto error; - } - } - - return pathname; - -error: - free(pathname); - return NULL; -} - -/* - * Send a single channel to the consumer using command ADD_CHANNEL. + * Send a single channel to the consumer using command ASK_CHANNEL_CREATION. * * 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 ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + struct lttng_trace_chunk *trace_chunk) { int ret, output; uint32_t chan_id; @@ -109,6 +43,10 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, char *pathname = NULL; struct lttcomm_consumer_msg msg; struct ust_registry_channel *chan_reg; + char shm_path[PATH_MAX] = ""; + char root_shm_path[PATH_MAX] = ""; + bool is_local_trace; + size_t consumer_path_offset = 0; assert(ua_sess); assert(ua_chan); @@ -118,10 +56,35 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, DBG2("Asking UST consumer for channel"); - /* Get and create full trace path of session. */ - if (ua_sess->output_traces) { - pathname = setup_trace_path(consumer, ua_sess); - if (!pathname) { + is_local_trace = consumer->net_seq_index == -1ULL; + /* Format the channel's path (relative to the current trace chunk). */ + pathname = setup_channel_trace_path(consumer, ua_sess->path, + &consumer_path_offset); + if (!pathname) { + ret = -1; + goto error; + } + + if (is_local_trace && trace_chunk) { + enum lttng_trace_chunk_status chunk_status; + char *pathname_index; + + ret = asprintf(&pathname_index, "%s/" DEFAULT_INDEX_DIR, + pathname); + if (ret < 0) { + ERR("Failed to format channel index directory"); + ret = -1; + goto error; + } + + /* + * Create the index subdirectory which will take care + * of implicitly creating the channel's path. + */ + chunk_status = lttng_trace_chunk_create_subdirectory( + trace_chunk, pathname_index); + free(pathname_index); + if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) { ret = -1; goto error; } @@ -136,10 +99,27 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) { chan_id = -1U; + /* + * Metadata channels shm_path (buffers) are handled within + * session daemon. Consumer daemon should not try to create + * those buffer files. + */ } else { chan_reg = ust_registry_channel_find(registry, chan_reg_key); assert(chan_reg); chan_id = chan_reg->chan_id; + if (ua_sess->shm_path[0]) { + strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path)); + shm_path[sizeof(shm_path) - 1] = '\0'; + strncat(shm_path, "/", + sizeof(shm_path) - strlen(shm_path) - 1); + strncat(shm_path, ua_chan->name, + sizeof(shm_path) - strlen(shm_path) - 1); + strncat(shm_path, "_", + sizeof(shm_path) - strlen(shm_path) - 1); + } + strncpy(root_shm_path, ua_sess->root_shm_path, sizeof(root_shm_path)); + root_shm_path[sizeof(root_shm_path) - 1] = '\0'; } switch (ua_chan->attr.output) { @@ -156,13 +136,13 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_chan->attr.switch_timer_interval, ua_chan->attr.read_timer_interval, ua_sess->live_timer_interval, + ua_sess->live_timer_interval != 0, + ua_chan->monitor_timer_interval, output, (int) ua_chan->attr.type, ua_sess->tracing_id, - pathname, + &pathname[consumer_path_offset], ua_chan->name, - ua_sess->euid, - ua_sess->egid, consumer->net_seq_index, ua_chan->key, registry->uuid, @@ -171,7 +151,11 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_chan->tracefile_count, ua_sess->id, ua_sess->output_traces, - ua_sess->uid); + ua_sess->real_credentials.uid, + ua_chan->attr.blocking_timeout, + root_shm_path, shm_path, + trace_chunk, + &ua_sess->effective_credentials); health_code_update(); @@ -204,11 +188,16 @@ error: /* * Ask consumer to create a channel for a given session. * + * Session list and rcu read side locks must be held by the caller. + * * Returns 0 on success else a negative value. */ 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 ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + struct lttng_trace_chunk * trace_chunk) { int ret; @@ -225,14 +214,15 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, } pthread_mutex_lock(socket->lock); - - ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry); + ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry, + trace_chunk); + pthread_mutex_unlock(socket->lock); if (ret < 0) { + ERR("ask_channel_creation consumer command failed"); goto error; } error: - pthread_mutex_unlock(socket->lock); return ret; } @@ -293,7 +283,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket, free(stream); if (ret == -LTTNG_UST_ERR_NOENT) { DBG3("UST app consumer has no more stream available"); - ret = 0; break; } if (ret != -EPIPE) { @@ -381,7 +370,9 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app, DBG2("UST consumer send stream to app %d", app->sock); /* Relay stream to application. */ + pthread_mutex_lock(&app->sock_lock); ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj); + pthread_mutex_unlock(&app->sock_lock); if (ret < 0) { if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) { ERR("ustctl send stream handle %d to app pid: %d with ret %d", @@ -416,7 +407,9 @@ int ust_consumer_send_channel_to_ust(struct ust_app *app, app->sock, app->pid, channel->name, channel->tracing_channel_id); /* Send stream to application. */ + pthread_mutex_lock(&app->sock_lock); ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj); + pthread_mutex_unlock(&app->sock_lock); if (ret < 0) { if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) { ERR("Error ustctl send channel %s to app pid: %d with ret %d", @@ -474,7 +467,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket) memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_ERR_UND; + pthread_mutex_lock(socket->lock); (void) consumer_send_msg(socket, &msg); + pthread_mutex_unlock(socket->lock); /* * This is possible since the session might have been destroyed * during a consumer metadata request. So here, return gracefully @@ -491,12 +486,15 @@ int ust_consumer_metadata_request(struct consumer_socket *socket) pthread_mutex_lock(&ust_reg->lock); ret_push = ust_app_push_metadata(ust_reg, socket, 1); pthread_mutex_unlock(&ust_reg->lock); - if (ret_push < 0) { + if (ret_push == -EPIPE) { + DBG("Application or relay closed while pushing metadata"); + } else if (ret_push < 0) { ERR("Pushing metadata"); ret = -1; goto end; + } else { + DBG("UST Consumer metadata pushed successfully"); } - DBG("UST Consumer metadata pushed successfully"); ret = 0; end: