/*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- * David Goulet <dgoulet@efficios.com>
- * 2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@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 <common/common.h>
-#include <common/uuid.h>
+#include <common/compat/path.h>
+#include <common/fd-tracker/utils.h>
#include <common/time.h>
#include <common/utils.h>
#include <common/uuid.h>
-#include <common/compat/path.h>
#include <urcu/rculist.h>
#include <sys/stat.h>
return ret;
}
+static struct lttng_directory_handle *session_create_output_directory_handle(
+ struct relay_session *session)
+{
+ int ret;
+ /*
+ * relayd_output_path/session_directory
+ * e.g. /home/user/lttng-traces/hostname/session_name
+ */
+ char *full_session_path = NULL;
+ struct lttng_directory_handle *handle = NULL;
+
+ pthread_mutex_lock(&session->lock);
+ full_session_path = create_output_path(session->output_path);
+ if (!full_session_path) {
+ goto end;
+ }
+
+ ret = utils_mkdir_recursive(
+ full_session_path, S_IRWXU | S_IRWXG, -1, -1);
+ if (ret) {
+ ERR("Failed to create session output path \"%s\"",
+ full_session_path);
+ goto end;
+ }
+
+ handle = fd_tracker_create_directory_handle(the_fd_tracker, full_session_path);
+end:
+ pthread_mutex_unlock(&session->lock);
+ free(full_session_path);
+ return handle;
+}
+
static int session_set_anonymous_chunk(struct relay_session *session)
{
int ret = 0;
goto end;
}
+ lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
status = lttng_trace_chunk_set_credentials_current_user(chunk);
if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
ret = -1;
ret = -1;
goto end;
}
- output_directory = NULL;
+
session->current_trace_chunk = chunk;
chunk = NULL;
end:
PERROR("Failed to allocate session");
goto error;
}
+
+ pthread_mutex_lock(&last_relay_session_id_lock);
+ session->id = ++last_relay_session_id;
+ pthread_mutex_unlock(&last_relay_session_id_lock);
+
+ lttng_ht_node_init_u64(&session->session_n, session->id);
+ urcu_ref_init(&session->ref);
+ CDS_INIT_LIST_HEAD(&session->recv_list);
+ pthread_mutex_init(&session->lock, NULL);
+ pthread_mutex_init(&session->recv_list_lock, NULL);
+
if (lttng_strncpy(session->session_name, session_name,
sizeof(session->session_name))) {
WARN("Session name exceeds maximal allowed length");
goto error;
}
- pthread_mutex_lock(&last_relay_session_id_lock);
- session->id = ++last_relay_session_id;
- pthread_mutex_unlock(&last_relay_session_id_lock);
-
session->major = major;
session->minor = minor;
- lttng_ht_node_init_u64(&session->session_n, session->id);
- urcu_ref_init(&session->ref);
- CDS_INIT_LIST_HEAD(&session->recv_list);
- pthread_mutex_init(&session->lock, NULL);
- pthread_mutex_init(&session->recv_list_lock, NULL);
session->live_timer = live_timer;
session->snapshot = snapshot;
}
if (id_sessiond && current_chunk_id) {
+ enum lttng_trace_chunk_status chunk_status;
+ struct lttng_directory_handle *session_output_directory;
+
session->current_trace_chunk =
sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
*current_chunk_id);
goto error;
}
+
+ chunk_status = lttng_trace_chunk_get_session_output_directory_handle(
+ session->current_trace_chunk,
+ &session_output_directory);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ goto error;
+ }
+
+ assert(session_output_directory);
+ session->output_directory = session_output_directory;
} else if (!id_sessiond) {
/*
* Pre-2.11 peers will not announce trace chunks. An
if (ret) {
goto error;
}
+ } else {
+ session->output_directory =
+ session_create_output_directory_handle(session);
+ if (!session->output_directory) {
+ goto error;
+ }
}
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
ret = sessiond_trace_chunk_registry_session_destroyed(
sessiond_trace_chunk_registry, session->sessiond_uuid);
assert(!ret);
+ lttng_directory_handle_put(session->output_directory);
+ session->output_directory = NULL;
call_rcu(&session->rcu_node, rcu_destroy_session);
}
}
rcu_read_unlock();
}
-
-struct lttng_directory_handle *session_create_output_directory_handle(
- struct relay_session *session)
-{
- int ret;
- /*
- * relayd_output_path/session_directory
- * e.g. /home/user/lttng-traces/hostname/session_name
- */
- char *full_session_path = NULL;
- struct lttng_directory_handle *handle = NULL;
-
- pthread_mutex_lock(&session->lock);
- full_session_path = create_output_path(session->output_path);
- if (!full_session_path) {
- goto end;
- }
-
- ret = utils_mkdir_recursive(
- full_session_path, S_IRWXU | S_IRWXG, -1, -1);
- if (ret) {
- ERR("Failed to create session output path \"%s\"",
- full_session_path);
- goto end;
- }
-
- handle = lttng_directory_handle_create(full_session_path);
-end:
- pthread_mutex_unlock(&session->lock);
- free(full_session_path);
- return handle;
-}
projects / lttng-tools.git / blobdiff