/*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
*
- * 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 "lttng-sessiond.h"
static char *create_channel_path(struct consumer_output *consumer,
- uid_t uid, gid_t gid)
+ size_t *consumer_path_offset)
{
int ret;
char tmp_path[PATH_MAX];
assert(consumer);
/* Get the right path name destination */
- if (consumer->type == CONSUMER_DST_LOCAL) {
- /* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
- consumer->dst.session_root_path,
- consumer->chunk_path,
- consumer->subdir);
- if (ret < 0) {
- PERROR("snprintf kernel channel path");
- goto error;
- } else if (ret >= sizeof(tmp_path)) {
- ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s%s\"",
- sizeof(tmp_path), ret,
- consumer->dst.session_root_path,
- consumer->chunk_path,
- consumer->subdir);
- goto error;
- }
- pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+ if (consumer->type == CONSUMER_DST_LOCAL ||
+ (consumer->type == CONSUMER_DST_NET &&
+ consumer->relay_major_version == 2 &&
+ consumer->relay_minor_version >= 11)) {
+ pathname = strdup(consumer->domain_subdir);
if (!pathname) {
- PERROR("lttng_strndup");
+ PERROR("Failed to copy domain subdirectory string %s",
+ consumer->domain_subdir);
goto error;
}
-
- /* Create directory */
- ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
- if (ret < 0) {
- if (errno != EEXIST) {
- ERR("Trace directory creation error");
- goto error;
- }
- }
- DBG3("Kernel local consumer tracefile path: %s", pathname);
+ *consumer_path_offset = strlen(consumer->domain_subdir);
+ DBG3("Kernel local consumer trace path relative to current trace chunk: \"%s\"",
+ pathname);
} else {
+ /* Network output, relayd < 2.11. */
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.net.base_dir,
- consumer->subdir);
+ consumer->domain_subdir);
if (ret < 0) {
PERROR("snprintf kernel metadata path");
goto error;
ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
sizeof(tmp_path), ret,
consumer->dst.net.base_dir,
- consumer->subdir);
+ consumer->domain_subdir);
goto error;
}
pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
PERROR("lttng_strndup");
goto error;
}
+ *consumer_path_offset = 0;
DBG3("Kernel network consumer subdir path: %s", pathname);
}
unsigned int monitor)
{
int ret;
- char *pathname;
+ char *pathname = NULL;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
enum lttng_error_code status;
struct ltt_session *session = NULL;
struct lttng_channel_extended *channel_attr_extended;
+ bool is_local_trace;
+ size_t consumer_path_offset = 0;
/* Safety net */
assert(channel);
DBG("Kernel consumer adding channel %s to kernel consumer",
channel->channel->name);
+ is_local_trace = consumer->net_seq_index == -1ULL;
- if (monitor) {
- pathname = create_channel_path(consumer, ksession->uid,
- ksession->gid);
- } else {
- /* Empty path. */
- pathname = strdup("");
- }
+ pathname = create_channel_path(consumer, &consumer_path_offset);
if (!pathname) {
ret = -1;
goto error;
}
+ if (is_local_trace && ksession->current_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(
+ ksession->current_trace_chunk, pathname_index);
+ free(pathname_index);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ret = -1;
+ goto error;
+ }
+ }
+
/* Prep channel message structure */
consumer_init_add_channel_comm_msg(&lkm,
channel->key,
ksession->id,
- pathname,
+ &pathname[consumer_path_offset],
ksession->uid,
ksession->gid,
consumer->net_seq_index,
channel->channel->attr.tracefile_count,
monitor,
channel->channel->attr.live_timer_interval,
- channel_attr_extended->monitor_timer_interval);
+ ksession->is_live_session,
+ channel_attr_extended->monitor_timer_interval,
+ ksession->current_trace_chunk);
health_code_update();
struct ltt_kernel_session *ksession, unsigned int monitor)
{
int ret;
- char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
- struct ltt_session *session = NULL;
rcu_read_lock();
/* Get consumer output pointer */
consumer = ksession->consumer;
- if (monitor) {
- pathname = create_channel_path(consumer,
- ksession->uid, ksession->gid);
- } else {
- /* Empty path. */
- pathname = strdup("");
- }
- if (!pathname) {
- ret = -1;
- goto error;
- }
-
- session = session_find_by_id(ksession->id);
- assert(session);
- assert(pthread_mutex_trylock(&session->lock));
- assert(session_trylock_list());
-
/* Prep channel message structure */
- consumer_init_add_channel_comm_msg(&lkm,
- ksession->metadata->key,
- ksession->id,
- pathname,
- ksession->uid,
- ksession->gid,
- consumer->net_seq_index,
- DEFAULT_METADATA_NAME,
- 1,
+ consumer_init_add_channel_comm_msg(&lkm, ksession->metadata->key,
+ ksession->id, "", ksession->uid, ksession->gid,
+ consumer->net_seq_index, DEFAULT_METADATA_NAME, 1,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
- CONSUMER_CHANNEL_TYPE_METADATA,
- 0, 0,
- monitor, 0, 0);
+ CONSUMER_CHANNEL_TYPE_METADATA, 0, 0, monitor, 0,
+ ksession->is_live_session, 0,
+ ksession->current_trace_chunk);
health_code_update();
consumer_init_add_stream_comm_msg(&lkm,
ksession->metadata->key,
ksession->metadata_stream_fd,
- 0 /* CPU: 0 for metadata. */,
- session->current_archive_id);
+ 0 /* CPU: 0 for metadata. */);
health_code_update();
error:
rcu_read_unlock();
- free(pathname);
- if (session) {
- session_put(session);
- }
return ret;
}
int kernel_consumer_add_stream(struct consumer_socket *sock,
struct ltt_kernel_channel *channel,
struct ltt_kernel_stream *stream,
- struct ltt_kernel_session *session, unsigned int monitor,
- uint64_t trace_archive_id)
+ struct ltt_kernel_session *session, unsigned int monitor)
{
int ret;
struct lttcomm_consumer_msg lkm;
consumer_init_add_stream_comm_msg(&lkm,
channel->key,
stream->fd,
- stream->cpu,
- trace_archive_id);
+ stream->cpu);
health_code_update();
{
int ret = LTTNG_OK;
struct ltt_kernel_stream *stream;
- struct ltt_session *session = NULL;
/* Safety net */
assert(channel);
rcu_read_lock();
- session = session_find_by_id(ksession->id);
- assert(session);
- assert(pthread_mutex_trylock(&session->lock));
- assert(session_trylock_list());
-
/* Bail out if consumer is disabled */
if (!ksession->consumer->enabled) {
ret = LTTNG_OK;
/* Add stream on the kernel consumer side. */
ret = kernel_consumer_add_stream(sock, channel, stream,
- ksession, monitor, session->current_archive_id);
+ ksession, monitor);
if (ret < 0) {
goto error;
}
error:
rcu_read_unlock();
- if (session) {
- session_put(session);
- }
return ret;
}
projects / lttng-tools.git / blobdiff