/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
*
- * 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
#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.
*
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;
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);
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;
}
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,
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();
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;
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");
projects / lttng-tools.git / blobdiff