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=6be57e447809cbf1a918490452c2ff893ee9a977;hb=a2814ea7573bf5edd5323d6f89c48ff14105db69;hpb=b178f53e90c376dd44b020535c32649edef8f80e diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 6be57e447..25dc7ed1c 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -1,18 +1,8 @@ /* - * 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 _LGPL_SOURCE @@ -30,78 +20,11 @@ #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 the string ourself to make sure we never exceed - * LTTNG_PATH_MAX. - */ - pathname = zmalloc(LTTNG_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, LTTNG_PATH_MAX, "%s/%s%s/%s", - consumer->dst.session_root_path, - consumer->chunk_path, - consumer->domain_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 (errno != EEXIST) { - ERR("Trace directory creation error"); - goto error; - } - } - } else { - ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s", - consumer->dst.net.base_dir, - consumer->chunk_path, - consumer->domain_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 ASK_CHANNEL_CREATION. * @@ -112,7 +35,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, struct consumer_output *consumer, struct consumer_socket *socket, struct ust_registry_session *registry, - uint64_t trace_archive_id) + struct lttng_trace_chunk *trace_chunk) { int ret, output; uint32_t chan_id; @@ -122,6 +45,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, 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); @@ -131,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; } @@ -186,14 +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, @@ -202,10 +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_archive_id); + trace_chunk, + &ua_sess->effective_credentials); health_code_update(); @@ -247,7 +197,7 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, struct consumer_output *consumer, struct consumer_socket *socket, struct ust_registry_session *registry, - uint64_t trace_archive_id) + struct lttng_trace_chunk * trace_chunk) { int ret; @@ -265,7 +215,7 @@ 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, - trace_archive_id); + trace_chunk); pthread_mutex_unlock(socket->lock); if (ret < 0) { ERR("ask_channel_creation consumer command failed");