X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=364705fcb31d7f91e5d095d0740b38488c0bd712;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=993e7b95cf21da8ff2f151f4412b3079f3746b40;hpb=b178f53e90c376dd44b020535c32649edef8f80e;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c index 993e7b95c..364705fcb 100644 --- a/src/bin/lttng-sessiond/kernel-consumer.c +++ b/src/bin/lttng-sessiond/kernel-consumer.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2012 - David Goulet + * Copyright (C) 2012 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 @@ -34,49 +24,30 @@ #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]; char *pathname = NULL; - assert(consumer); + LTTNG_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->domain_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->domain_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. */ + /* Network output, relayd < 2.11. */ ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s", consumer->dst.net.base_dir, consumer->domain_subdir); @@ -95,6 +66,7 @@ static char *create_channel_path(struct consumer_output *consumer, PERROR("lttng_strndup"); goto error; } + *consumer_path_offset = 0; DBG3("Kernel network consumer subdir path: %s", pathname); } @@ -115,17 +87,19 @@ int kernel_consumer_add_channel(struct consumer_socket *sock, 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); - assert(ksession); - assert(ksession->consumer); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(ksession); + LTTNG_ASSERT(ksession->consumer); consumer = ksession->consumer; channel_attr_extended = (struct lttng_channel_extended *) @@ -133,24 +107,44 @@ int kernel_consumer_add_channel(struct consumer_socket *sock, 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, @@ -162,7 +156,9 @@ int kernel_consumer_add_channel(struct consumer_socket *sock, 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(); @@ -174,16 +170,16 @@ int kernel_consumer_add_channel(struct consumer_socket *sock, health_code_update(); rcu_read_lock(); session = session_find_by_id(ksession->id); - assert(session); - assert(pthread_mutex_trylock(&session->lock)); - assert(session_trylock_list()); + LTTNG_ASSERT(session); + LTTNG_ASSERT(pthread_mutex_trylock(&session->lock)); + LTTNG_ASSERT(session_trylock_list()); status = notification_thread_command_add_channel( - notification_thread_handle, session->name, - ksession->uid, ksession->gid, - channel->channel->name, channel->key, - LTTNG_DOMAIN_KERNEL, - channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf); + the_notification_thread_handle, session->name, + ksession->uid, ksession->gid, channel->channel->name, + channel->key, LTTNG_DOMAIN_KERNEL, + channel->channel->attr.subbuf_size * + channel->channel->attr.num_subbuf); rcu_read_unlock(); if (status != LTTNG_OK) { ret = -1; @@ -209,17 +205,15 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock, 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(); /* Safety net */ - assert(ksession); - assert(ksession->consumer); - assert(sock); + LTTNG_ASSERT(ksession); + LTTNG_ASSERT(ksession->consumer); + LTTNG_ASSERT(sock); DBG("Sending metadata %d to kernel consumer", ksession->metadata_stream_fd); @@ -227,37 +221,25 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock, /* 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, + ksession->metadata->conf->name, 1, - DEFAULT_KERNEL_CHANNEL_OUTPUT, + ksession->metadata->conf->attr.output, CONSUMER_CHANNEL_TYPE_METADATA, - 0, 0, - monitor, 0, 0); + ksession->metadata->conf->attr.tracefile_size, + ksession->metadata->conf->attr.tracefile_count, + monitor, + ksession->metadata->conf->attr.live_timer_interval, + ksession->is_live_session, + 0, + ksession->current_trace_chunk); health_code_update(); @@ -272,8 +254,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock, 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(); @@ -288,10 +269,6 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock, error: rcu_read_unlock(); - free(pathname); - if (session) { - session_put(session); - } return ret; } @@ -302,18 +279,17 @@ static 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; struct consumer_output *consumer; - assert(channel); - assert(stream); - assert(session); - assert(session->consumer); - assert(sock); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(stream); + LTTNG_ASSERT(session); + LTTNG_ASSERT(session->consumer); + LTTNG_ASSERT(sock); DBG("Sending stream %d of channel %s to kernel consumer", stream->fd, channel->channel->name); @@ -325,8 +301,7 @@ int kernel_consumer_add_stream(struct consumer_socket *sock, consumer_init_add_stream_comm_msg(&lkm, channel->key, stream->fd, - stream->cpu, - trace_archive_id); + stream->cpu); health_code_update(); @@ -352,8 +327,8 @@ int kernel_consumer_streams_sent(struct consumer_socket *sock, struct lttcomm_consumer_msg lkm; struct consumer_output *consumer; - assert(sock); - assert(session); + LTTNG_ASSERT(sock); + LTTNG_ASSERT(session); DBG("Sending streams_sent"); /* Get consumer output pointer */ @@ -387,21 +362,15 @@ int kernel_consumer_send_channel_streams(struct consumer_socket *sock, { int ret = LTTNG_OK; struct ltt_kernel_stream *stream; - struct ltt_session *session = NULL; /* Safety net */ - assert(channel); - assert(ksession); - assert(ksession->consumer); - assert(sock); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(ksession); + LTTNG_ASSERT(ksession->consumer); + LTTNG_ASSERT(sock); 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; @@ -427,7 +396,7 @@ int kernel_consumer_send_channel_streams(struct consumer_socket *sock, /* 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; } @@ -436,9 +405,6 @@ int kernel_consumer_send_channel_streams(struct consumer_socket *sock, error: rcu_read_unlock(); - if (session) { - session_put(session); - } return ret; } @@ -454,9 +420,9 @@ int kernel_consumer_send_session(struct consumer_socket *sock, struct ltt_kernel_channel *chan; /* Safety net */ - assert(session); - assert(session->consumer); - assert(sock); + LTTNG_ASSERT(session); + LTTNG_ASSERT(session->consumer); + LTTNG_ASSERT(sock); /* Bail out if consumer is disabled */ if (!session->consumer->enabled) { @@ -512,8 +478,8 @@ int kernel_consumer_destroy_channel(struct consumer_socket *socket, int ret; struct lttcomm_consumer_msg msg; - assert(channel); - assert(socket); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(socket); DBG("Sending kernel consumer destroy channel key %" PRIu64, channel->key); @@ -541,8 +507,8 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket, int ret; struct lttcomm_consumer_msg msg; - assert(metadata); - assert(socket); + LTTNG_ASSERT(metadata); + LTTNG_ASSERT(socket); DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);