X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=364705fcb31d7f91e5d095d0740b38488c0bd712;hp=a65e1493c384ea75401266b019b56ab605ce7e89;hb=HEAD;hpb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
deleted file mode 100644
index a65e1493c..000000000
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * 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.
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.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)
-{
-	int ret;
-	char tmp_path[PATH_MAX];
-	char *pathname = NULL;
-
-	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 = lttng_strndup(tmp_path, sizeof(tmp_path));
-		if (!pathname) {
-			PERROR("lttng_strndup");
-			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);
-	} else {
-		ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
-		if (ret < 0) {
-			PERROR("snprintf kernel metadata path");
-			goto error;
-		}
-		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
-		if (!pathname) {
-			PERROR("lttng_strndup");
-			goto error;
-		}
-		DBG3("Kernel network consumer subdir path: %s", pathname);
-	}
-
-	return pathname;
-
-error:
-	free(pathname);
-	return NULL;
-}
-
-/*
- * Sending a single channel to the consumer with command ADD_CHANNEL.
- */
-int kernel_consumer_add_channel(struct consumer_socket *sock,
-		struct ltt_kernel_channel *channel,
-		struct ltt_kernel_session *ksession,
-		unsigned int monitor)
-{
-	int ret;
-	char *pathname;
-	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *consumer;
-	enum lttng_error_code status;
-	struct ltt_session *session;
-	struct lttng_channel_extended *channel_attr_extended;
-
-	/* Safety net */
-	assert(channel);
-	assert(ksession);
-	assert(ksession->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);
-
-	if (monitor) {
-		pathname = create_channel_path(consumer, ksession->uid,
-				ksession->gid);
-	} else {
-		/* Empty path. */
-		pathname = strdup("");
-	}
-	if (!pathname) {
-		ret = -1;
-		goto error;
-	}
-
-	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
-			channel->fd,
-			ksession->id,
-			pathname,
-			ksession->uid,
-			ksession->gid,
-			consumer->net_seq_index,
-			channel->channel->name,
-			channel->stream_count,
-			channel->channel->attr.output,
-			CONSUMER_CHANNEL_TYPE_DATA,
-			channel->channel->attr.tracefile_size,
-			channel->channel->attr.tracefile_count,
-			monitor,
-			channel->channel->attr.live_timer_interval,
-			channel_attr_extended->monitor_timer_interval);
-
-	health_code_update();
-
-	ret = consumer_send_channel(sock, &lkm);
-	if (ret < 0) {
-		goto error;
-	}
-
-	health_code_update();
-	rcu_read_lock();
-	session = session_find_by_id(ksession->id);
-	assert(session);
-
-	status = notification_thread_command_add_channel(
-			notification_thread_handle, session->name,
-			ksession->uid, ksession->gid,
-			channel->channel->name, channel->fd,
-			LTTNG_DOMAIN_KERNEL,
-			channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
-	rcu_read_unlock();
-	if (status != LTTNG_OK) {
-		ret = -1;
-		goto error;
-	}
-error:
-	free(pathname);
-	return ret;
-}
-
-/*
- * Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
- */
-int kernel_consumer_add_metadata(struct consumer_socket *sock,
-		struct ltt_kernel_session *session, unsigned int monitor)
-{
-	int ret;
-	char *pathname;
-	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *consumer;
-
-	/* Safety net */
-	assert(session);
-	assert(session->consumer);
-	assert(sock);
-
-	DBG("Sending metadata %d to kernel consumer", session->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;
-	}
-
-	/* 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->net_seq_index,
-			DEFAULT_METADATA_NAME,
-			1,
-			DEFAULT_KERNEL_CHANNEL_OUTPUT,
-			CONSUMER_CHANNEL_TYPE_METADATA,
-			0, 0,
-			monitor, 0, 0);
-
-	health_code_update();
-
-	ret = consumer_send_channel(sock, &lkm);
-	if (ret < 0) {
-		goto error;
-	}
-
-	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. */
-
-	health_code_update();
-
-	/* Send stream and file descriptor */
-	ret = consumer_send_stream(sock, consumer, &lkm,
-			&session->metadata_stream_fd, 1);
-	if (ret < 0) {
-		goto error;
-	}
-
-	health_code_update();
-
-error:
-	free(pathname);
-	return ret;
-}
-
-/*
- * Sending a single stream to the consumer with command ADD_STREAM.
- */
-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)
-{
-	int ret;
-	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *consumer;
-
-	assert(channel);
-	assert(stream);
-	assert(session);
-	assert(session->consumer);
-	assert(sock);
-
-	DBG("Sending stream %d of channel %s to kernel consumer",
-			stream->fd, channel->channel->name);
-
-	/* Get consumer output pointer */
-	consumer = session->consumer;
-
-	/* Prep stream consumer message */
-	consumer_init_stream_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_STREAM,
-			channel->fd,
-			stream->fd,
-			stream->cpu);
-
-	health_code_update();
-
-	/* Send stream and file descriptor */
-	ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
-	if (ret < 0) {
-		goto error;
-	}
-
-	health_code_update();
-
-error:
-	return ret;
-}
-
-/*
- * Sending the notification that all streams were sent with STREAMS_SENT.
- */
-int kernel_consumer_streams_sent(struct consumer_socket *sock,
-		struct ltt_kernel_session *session, uint64_t channel_key)
-{
-	int ret;
-	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *consumer;
-
-	assert(sock);
-	assert(session);
-
-	DBG("Sending streams_sent");
-	/* Get consumer output pointer */
-	consumer = session->consumer;
-
-	/* Prep stream consumer message */
-	consumer_init_streams_sent_comm_msg(&lkm,
-			LTTNG_CONSUMER_STREAMS_SENT,
-			channel_key, consumer->net_seq_index);
-
-	health_code_update();
-
-	/* Send stream and file descriptor */
-	ret = consumer_send_msg(sock, &lkm);
-	if (ret < 0) {
-		goto error;
-	}
-
-error:
-	return ret;
-}
-
-/*
- * Send all stream fds of kernel channel to the consumer.
- */
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
-		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
-		unsigned int monitor)
-{
-	int ret;
-	struct ltt_kernel_stream *stream;
-
-	/* Safety net */
-	assert(channel);
-	assert(session);
-	assert(session->consumer);
-	assert(sock);
-
-	/* Bail out if consumer is disabled */
-	if (!session->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;
-	}
-
-	/* Send streams */
-	cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
-		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);
-		if (ret < 0) {
-			goto error;
-		}
-		stream->sent_to_consumer = true;
-	}
-
-error:
-	return ret;
-}
-
-/*
- * Send all stream fds of the kernel session to the consumer.
- */
-int kernel_consumer_send_session(struct consumer_socket *sock,
-		struct ltt_kernel_session *session)
-{
-	int ret, monitor = 0;
-	struct ltt_kernel_channel *chan;
-
-	/* Safety net */
-	assert(session);
-	assert(session->consumer);
-	assert(sock);
-
-	/* Bail out if consumer is disabled */
-	if (!session->consumer->enabled) {
-		ret = LTTNG_OK;
-		goto error;
-	}
-
-	/* Don't monitor the streams on the consumer if in flight recorder. */
-	if (session->output_traces) {
-		monitor = 1;
-	}
-
-	DBG("Sending session stream to kernel consumer");
-
-	if (session->metadata_stream_fd >= 0 && session->metadata) {
-		ret = kernel_consumer_add_metadata(sock, session, monitor);
-		if (ret < 0) {
-			goto error;
-		}
-	}
-
-	/* 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,
-				monitor);
-		if (ret < 0) {
-			goto error;
-		}
-		if (monitor) {
-			/*
-			 * Inform the relay that all the streams for the
-			 * channel were sent.
-			 */
-			ret = kernel_consumer_streams_sent(sock, session, chan->fd);
-			if (ret < 0) {
-				goto error;
-			}
-		}
-	}
-
-	DBG("Kernel consumer FDs of metadata and channel streams sent");
-
-	session->consumer_fds_sent = 1;
-	return 0;
-
-error:
-	return ret;
-}
-
-int kernel_consumer_destroy_channel(struct consumer_socket *socket,
-		struct ltt_kernel_channel *channel)
-{
-	int ret;
-	struct lttcomm_consumer_msg msg;
-
-	assert(channel);
-	assert(socket);
-
-	DBG("Sending kernel consumer destroy channel key %d", channel->fd);
-
-	memset(&msg, 0, sizeof(msg));
-	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-	msg.u.destroy_channel.key = channel->fd;
-
-	pthread_mutex_lock(socket->lock);
-	health_code_update();
-
-	ret = consumer_send_msg(socket, &msg);
-	if (ret < 0) {
-		goto error;
-	}
-
-error:
-	health_code_update();
-	pthread_mutex_unlock(socket->lock);
-	return ret;
-}
-
-int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
-		struct ltt_kernel_metadata *metadata)
-{
-	int ret;
-	struct lttcomm_consumer_msg msg;
-
-	assert(metadata);
-	assert(socket);
-
-	DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
-
-	memset(&msg, 0, sizeof(msg));
-	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-	msg.u.destroy_channel.key = metadata->fd;
-
-	pthread_mutex_lock(socket->lock);
-	health_code_update();
-
-	ret = consumer_send_msg(socket, &msg);
-	if (ret < 0) {
-		goto error;
-	}
-
-error:
-	health_code_update();
-	pthread_mutex_unlock(socket->lock);
-	return ret;
-}