/*
- * 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 _GNU_SOURCE
#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <inttypes.h>
#include <common/common.h>
#include <common/defaults.h>
+#include <common/compat/string.h>
#include "consumer.h"
#include "health-sessiond.h"
#include "kernel-consumer.h"
+#include "notification-thread-commands.h"
+#include "session.h"
+#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",
- consumer->dst.trace_path, consumer->subdir);
- if (ret < 0) {
- PERROR("snprintf kernel channel path");
- goto error;
- }
- pathname = 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("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 {
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+ /* Network output, relayd < 2.11. */
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+ consumer->dst.net.base_dir,
+ consumer->domain_subdir);
if (ret < 0) {
PERROR("snprintf kernel metadata 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\"",
+ sizeof(tmp_path), ret,
+ consumer->dst.net.base_dir,
+ consumer->domain_subdir);
+ goto error;
}
- pathname = strndup(tmp_path, sizeof(tmp_path));
+ pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
if (!pathname) {
- PERROR("strndup");
+ PERROR("lttng_strndup");
goto error;
}
+ *consumer_path_offset = 0;
DBG3("Kernel network consumer subdir path: %s", pathname);
}
/*
* Sending a single channel to the consumer with command ADD_CHANNEL.
*/
+static
int kernel_consumer_add_channel(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
+ struct ltt_kernel_channel *channel,
+ struct ltt_kernel_session *ksession,
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(session);
- assert(session->consumer);
+ assert(ksession);
+ assert(ksession->consumer);
- consumer = session->consumer;
+ consumer = ksession->consumer;
+ channel_attr_extended = (struct lttng_channel_extended *)
+ channel->channel->attr.extended.ptr;
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, session->uid, session->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_channel_comm_msg(&lkm,
- LTTNG_CONSUMER_ADD_CHANNEL,
- channel->fd,
- session->id,
- pathname,
- session->uid,
- session->gid,
+ consumer_init_add_channel_comm_msg(&lkm,
+ channel->key,
+ ksession->id,
+ &pathname[consumer_path_offset],
+ ksession->uid,
+ ksession->gid,
consumer->net_seq_index,
channel->channel->name,
channel->stream_count,
channel->channel->attr.tracefile_size,
channel->channel->attr.tracefile_count,
monitor,
- channel->channel->attr.live_timer_interval);
+ channel->channel->attr.live_timer_interval,
+ ksession->is_live_session,
+ channel_attr_extended->monitor_timer_interval,
+ ksession->current_trace_chunk);
health_code_update();
}
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());
+
+ 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);
+ rcu_read_unlock();
+ if (status != LTTNG_OK) {
+ ret = -1;
+ goto error;
+ }
+
+ channel->published_to_notification_thread = true;
error:
+ if (session) {
+ session_put(session);
+ }
free(pathname);
return ret;
}
/*
* Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
+ *
+ * The consumer socket lock must be held by the caller.
*/
int kernel_consumer_add_metadata(struct consumer_socket *sock,
- struct ltt_kernel_session *session, unsigned int monitor)
+ struct ltt_kernel_session *ksession, unsigned int monitor)
{
int ret;
- char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
+ rcu_read_lock();
+
/* Safety net */
- assert(session);
- assert(session->consumer);
+ assert(ksession);
+ assert(ksession->consumer);
assert(sock);
- DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
+ DBG("Sending metadata %d to kernel consumer",
+ ksession->metadata_stream_fd);
/* Get consumer output pointer */
- consumer = session->consumer;
-
- if (monitor) {
- pathname = create_channel_path(consumer, session->uid, session->gid);
- } else {
- /* Empty path. */
- pathname = strdup("");
- }
- if (!pathname) {
- ret = -1;
- goto error;
- }
+ consumer = ksession->consumer;
/* Prep channel message structure */
- consumer_init_channel_comm_msg(&lkm,
- LTTNG_CONSUMER_ADD_CHANNEL,
- session->metadata->fd,
- session->id,
- pathname,
- session->uid,
- session->gid,
+ consumer_init_add_channel_comm_msg(&lkm,
+ ksession->metadata->key,
+ ksession->id,
+ "",
+ 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);
+ 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();
health_code_update();
/* Prep stream message structure */
- consumer_init_stream_comm_msg(&lkm,
- LTTNG_CONSUMER_ADD_STREAM,
- session->metadata->fd,
- session->metadata_stream_fd,
- 0); /* CPU: 0 for metadata. */
+ consumer_init_add_stream_comm_msg(&lkm,
+ ksession->metadata->key,
+ ksession->metadata_stream_fd,
+ 0 /* CPU: 0 for metadata. */);
health_code_update();
/* Send stream and file descriptor */
ret = consumer_send_stream(sock, consumer, &lkm,
- &session->metadata_stream_fd, 1);
+ &ksession->metadata_stream_fd, 1);
if (ret < 0) {
goto error;
}
health_code_update();
error:
- free(pathname);
+ rcu_read_unlock();
return ret;
}
/*
* Sending a single stream to the consumer with command ADD_STREAM.
*/
+static
int kernel_consumer_add_stream(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
+ struct ltt_kernel_channel *channel,
+ struct ltt_kernel_stream *stream,
struct ltt_kernel_session *session, unsigned int monitor)
{
int ret;
consumer = session->consumer;
/* Prep stream consumer message */
- consumer_init_stream_comm_msg(&lkm,
- LTTNG_CONSUMER_ADD_STREAM,
- channel->fd,
+ consumer_init_add_stream_comm_msg(&lkm,
+ channel->key,
stream->fd,
stream->cpu);
/*
* Send all stream fds of kernel channel to the consumer.
+ *
+ * The consumer socket lock must be held by the caller.
*/
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
+ struct ltt_kernel_channel *channel, struct ltt_kernel_session *ksession,
unsigned int monitor)
{
- int ret;
+ int ret = LTTNG_OK;
struct ltt_kernel_stream *stream;
/* Safety net */
assert(channel);
- assert(session);
- assert(session->consumer);
+ assert(ksession);
+ assert(ksession->consumer);
assert(sock);
+ rcu_read_lock();
+
/* Bail out if consumer is disabled */
- if (!session->consumer->enabled) {
+ if (!ksession->consumer->enabled) {
ret = LTTNG_OK;
goto error;
}
DBG("Sending streams of channel %s to kernel consumer",
channel->channel->name);
- ret = kernel_consumer_add_channel(sock, channel, session, monitor);
- if (ret < 0) {
- goto error;
+ if (!channel->sent_to_consumer) {
+ ret = kernel_consumer_add_channel(sock, channel, ksession, monitor);
+ if (ret < 0) {
+ goto error;
+ }
+ channel->sent_to_consumer = true;
}
/* Send streams */
cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
- if (!stream->fd) {
+ if (!stream->fd || stream->sent_to_consumer) {
continue;
}
/* Add stream on the kernel consumer side. */
- ret = kernel_consumer_add_stream(sock, channel, stream, session,
- monitor);
+ ret = kernel_consumer_add_stream(sock, channel, stream,
+ ksession, monitor);
if (ret < 0) {
goto error;
}
+ stream->sent_to_consumer = true;
}
error:
+ rcu_read_unlock();
return ret;
}
/*
* Send all stream fds of the kernel session to the consumer.
+ *
+ * The consumer socket lock must be held by the caller.
*/
int kernel_consumer_send_session(struct consumer_socket *sock,
struct ltt_kernel_session *session)
/* Send channel and streams of it */
cds_list_for_each_entry(chan, &session->channel_list.head, list) {
- ret = kernel_consumer_send_channel_stream(sock, chan, session,
+ ret = kernel_consumer_send_channel_streams(sock, chan, session,
monitor);
if (ret < 0) {
goto error;
* Inform the relay that all the streams for the
* channel were sent.
*/
- ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+ ret = kernel_consumer_streams_sent(sock, session, chan->key);
if (ret < 0) {
goto error;
}
assert(channel);
assert(socket);
- DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+ DBG("Sending kernel consumer destroy channel key %" PRIu64, channel->key);
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
- msg.u.destroy_channel.key = channel->fd;
+ msg.u.destroy_channel.key = channel->key;
pthread_mutex_lock(socket->lock);
health_code_update();
assert(metadata);
assert(socket);
- DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+ DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
- msg.u.destroy_channel.key = metadata->fd;
+ msg.u.destroy_channel.key = metadata->key;
pthread_mutex_lock(socket->lock);
health_code_update();
projects / lttng-tools.git / blobdiff