#include "utils.h"
#include "trace-ust.h"
#include "timer.h"
+#include "cmd.h"
struct ltt_session_destroy_notifier_element {
ltt_session_destroy_notifier notifier;
goto end;
}
- ret = asprintf(&chunk_path, "%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
- session_get_base_path(session),
- session->last_archived_chunk_name);
- if (ret == -1) {
- goto end;
- }
-
switch (session_get_consumer_destination_type(session)) {
case CONSUMER_DST_LOCAL:
+ ret = asprintf(&chunk_path,
+ "%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
+ session_get_base_path(session),
+ session->last_archived_chunk_name);
+ if (ret == -1) {
+ goto end;
+ }
location = lttng_trace_archive_location_local_create(
chunk_path);
break;
location = lttng_trace_archive_location_relay_create(
hostname,
LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP,
- control_port, data_port, chunk_path);
+ control_port, data_port, session->last_chunk_path);
break;
}
default:
ret_error_code = ust_app_create_channel_subdirectories(
session->ust_session);
if (ret_error_code != LTTNG_OK) {
- ret = -ret_error_code;
goto error;
}
}
ret_error_code = kernel_create_channel_subdirectories(
session->kernel_session);
if (ret_error_code != LTTNG_OK) {
- ret = -ret_error_code;
goto error;
}
}
goto end_no_move;
}
-static
-bool output_supports_trace_chunks(const struct consumer_output *output)
-{
- if (output->type == CONSUMER_DST_LOCAL) {
- return true;
- } else {
- if (output->relay_major_version > 2) {
- return true;
- } else if (output->relay_major_version == 2 &&
- output->relay_minor_version >= 11) {
- return true;
- }
- }
- return false;
-}
-
struct lttng_trace_chunk *session_create_new_trace_chunk(
const struct ltt_session *session,
const struct consumer_output *consumer_output_override,
goto error;
}
- if (!output_supports_trace_chunks(output)) {
- goto end;
- }
next_chunk_id = session->most_recent_chunk_id.is_set ?
session->most_recent_chunk_id.value + 1 : 0;
int session_close_trace_chunk(const struct ltt_session *session,
struct lttng_trace_chunk *trace_chunk,
- const enum lttng_trace_chunk_command_type *close_command)
+ const enum lttng_trace_chunk_command_type *close_command,
+ char *closed_trace_chunk_path)
{
int ret = 0;
bool error_occurred = false;
}
if (session->ust_session) {
+ const uint64_t relayd_id =
+ session->ust_session->consumer->net_seq_index;
+
cds_lfht_for_each_entry(
session->ust_session->consumer->socks->ht,
&iter, socket, node.node) {
pthread_mutex_lock(socket->lock);
ret = consumer_close_trace_chunk(socket,
- session->consumer->net_seq_index,
+ relayd_id,
session->id,
- trace_chunk);
+ trace_chunk, closed_trace_chunk_path);
pthread_mutex_unlock(socket->lock);
if (ret) {
ERR("Failed to close trace chunk on user space consumer");
}
}
if (session->kernel_session) {
+ const uint64_t relayd_id =
+ session->kernel_session->consumer->net_seq_index;
+
cds_lfht_for_each_entry(
session->kernel_session->consumer->socks->ht,
&iter, socket, node.node) {
pthread_mutex_lock(socket->lock);
ret = consumer_close_trace_chunk(socket,
- session->consumer->net_seq_index,
+ relayd_id,
session->id,
- trace_chunk);
+ trace_chunk, closed_trace_chunk_path);
pthread_mutex_unlock(socket->lock);
if (ret) {
ERR("Failed to close trace chunk on kernel consumer");
struct ltt_ust_session *usess;
struct ltt_kernel_session *ksess;
struct ltt_session *session = container_of(ref, typeof(*session), ref);
+ const bool session_published = session->published;
assert(!session->chunk_being_archived);
usess = session->ust_session;
ksess = session->kernel_session;
- session_notify_destruction(session);
- lttng_dynamic_array_reset(&session->destroy_notifiers);
- if (session->current_trace_chunk) {
- ret = session_close_trace_chunk(session, session->current_trace_chunk, NULL);
- if (ret) {
- ERR("Failed to close the current trace chunk of session \"%s\" during its release",
- session->name);
- }
- ret = _session_set_trace_chunk_no_lock_check(session, NULL, NULL);
- if (ret) {
- ERR("Failed to release the current trace chunk of session \"%s\" during its release",
- session->name);
- }
- }
-
- /* Clean kernel session teardown */
+ /* Clean kernel session teardown, keeping data for destroy notifier. */
kernel_destroy_session(ksess);
- session->kernel_session = NULL;
- /* UST session teardown */
+ /* UST session teardown, keeping data for destroy notifier. */
if (usess) {
/* Close any relayd session */
consumer_output_send_destroy_relayd(usess->consumer);
ERR("Error in ust_app_destroy_trace_all");
}
- /* Clean up the rest. */
+ /* Clean up the rest, keeping destroy notifier data. */
trace_ust_destroy_session(usess);
- session->ust_session = NULL;
}
/*
pthread_mutex_destroy(&session->lock);
- if (session->published) {
+ if (session_published) {
ASSERT_LOCKED(ltt_session_list.lock);
del_session_list(session);
del_session_ht(session);
- pthread_cond_broadcast(<t_session_list.removal_cond);
}
+ session_notify_destruction(session);
+
+ kernel_free_session(ksess);
+ session->kernel_session = NULL;
+ if (usess) {
+ trace_ust_free_session(usess);
+ session->ust_session = NULL;
+ }
+ lttng_dynamic_array_reset(&session->destroy_notifiers);
free(session->last_archived_chunk_name);
+ free(session->base_path);
free(session);
+ if (session_published) {
+ /*
+ * Broadcast after free-ing to ensure the memory is
+ * reclaimed before the main thread exits.
+ */
+ pthread_cond_broadcast(<t_session_list.removal_cond);
+ }
}
/*
* Session list lock must be held by the caller.
*/
enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
- struct ltt_session **out_session)
+ const char *base_path, struct ltt_session **out_session)
{
int ret;
enum lttng_error_code ret_code;
DEFAULT_SESSION_NAME, i,
datetime);
}
+ new_session->name_contains_creation_time = true;
if (ret == -1 || ret >= sizeof(new_session->name)) {
/*
* Null-terminate in case the name is used
}
}
+ if (base_path) {
+ new_session->base_path = strdup(base_path);
+ if (!new_session->base_path) {
+ ERR("Failed to allocate base path of session \"%s\"",
+ name);
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto error;
+ }
+ }
+
new_session->uid = uid;
new_session->gid = gid;