#include <urcu.h>
#include <dirent.h>
#include <sys/types.h>
+#include <pthread.h>
#include <common/common.h>
+#include <common/utils.h>
+#include <common/trace-chunk.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <lttng/location-internal.h>
#include "lttng-sessiond.h"
#include "trace-ust.h"
#include "timer.h"
+struct ltt_session_destroy_notifier_element {
+ ltt_session_destroy_notifier notifier;
+ void *user_data;
+};
+
/*
* NOTES:
*
static struct ltt_session_list ltt_session_list = {
.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
.lock = PTHREAD_MUTEX_INITIALIZER,
+ .removal_cond = PTHREAD_COND_INITIALIZER,
.next_uuid = 0,
};
return <t_session_list;
}
+/*
+ * Returns once the session list is empty.
+ */
+void session_list_wait_empty(void)
+{
+ pthread_mutex_lock(<t_session_list.lock);
+ while (!cds_list_empty(<t_session_list.head)) {
+ pthread_cond_wait(<t_session_list.removal_cond,
+ <t_session_list.lock);
+ }
+ pthread_mutex_unlock(<t_session_list.lock);
+}
+
/*
* Acquire session list lock
*/
* The caller must hold the session lock.
*/
struct lttng_trace_archive_location *session_get_trace_archive_location(
- struct ltt_session *session)
+ const struct ltt_session *session)
{
+ int ret;
struct lttng_trace_archive_location *location = NULL;
+ char *chunk_path = NULL;
+
+ if (session->rotation_state != LTTNG_ROTATION_STATE_COMPLETED ||
+ !session->last_archived_chunk_name) {
+ goto end;
+ }
- if (session->rotation_state != LTTNG_ROTATION_STATE_COMPLETED) {
+ 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:
location = lttng_trace_archive_location_local_create(
- session->rotation_chunk.current_rotate_path);
+ chunk_path);
break;
case CONSUMER_DST_NET:
{
location = lttng_trace_archive_location_relay_create(
hostname,
LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP,
- control_port, data_port,
- session->rotation_chunk.current_rotate_path);
+ control_port, data_port, chunk_path);
break;
}
default:
abort();
}
end:
+ free(chunk_path);
return location;
}
pthread_mutex_unlock(&session->lock);
}
+static
+int _session_set_trace_chunk_no_lock_check(struct ltt_session *session,
+ struct lttng_trace_chunk *new_trace_chunk,
+ struct lttng_trace_chunk **_current_trace_chunk)
+{
+ int ret;
+ unsigned int i, refs_to_acquire = 0, refs_acquired = 0, refs_to_release = 0;
+ struct cds_lfht_iter iter;
+ struct consumer_socket *socket;
+ struct lttng_trace_chunk *current_trace_chunk;
+ uint64_t chunk_id;
+ enum lttng_trace_chunk_status chunk_status;
+
+ rcu_read_lock();
+ /*
+ * Ownership of current trace chunk is transferred to
+ * `current_trace_chunk`.
+ */
+ current_trace_chunk = session->current_trace_chunk;
+ session->current_trace_chunk = NULL;
+ if (session->ust_session) {
+ lttng_trace_chunk_put(
+ session->ust_session->current_trace_chunk);
+ session->ust_session->current_trace_chunk = NULL;
+ }
+ if (session->kernel_session) {
+ lttng_trace_chunk_put(
+ session->kernel_session->current_trace_chunk);
+ session->kernel_session->current_trace_chunk = NULL;
+ }
+ if (!new_trace_chunk) {
+ ret = 0;
+ goto end;
+ }
+ chunk_status = lttng_trace_chunk_get_id(new_trace_chunk, &chunk_id);
+ assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
+ refs_to_acquire = 1;
+ refs_to_acquire += !!session->ust_session;
+ refs_to_acquire += !!session->kernel_session;
+
+ for (refs_acquired = 0; refs_acquired < refs_to_acquire;
+ refs_acquired++) {
+ if (!lttng_trace_chunk_get(new_trace_chunk)) {
+ ERR("Failed to acquire reference to new trace chunk of session \"%s\"",
+ session->name);
+ goto error;
+ }
+ }
+
+ if (session->ust_session) {
+ const uint64_t relayd_id =
+ session->ust_session->consumer->net_seq_index;
+ const bool is_local_trace =
+ session->ust_session->consumer->type ==
+ CONSUMER_DST_LOCAL;
+
+ session->ust_session->current_trace_chunk = new_trace_chunk;
+ if (is_local_trace) {
+ enum lttng_error_code ret_error_code;
+
+ ret_error_code = ust_app_create_channel_subdirectories(
+ session->ust_session);
+ if (ret_error_code != LTTNG_OK) {
+ ret = -ret_error_code;
+ goto error;
+ }
+ }
+ cds_lfht_for_each_entry(
+ session->ust_session->consumer->socks->ht,
+ &iter, socket, node.node) {
+ pthread_mutex_lock(socket->lock);
+ ret = consumer_create_trace_chunk(socket,
+ relayd_id,
+ session->id, new_trace_chunk);
+ pthread_mutex_unlock(socket->lock);
+ if (ret) {
+ goto error;
+ }
+ }
+ }
+ if (session->kernel_session) {
+ const uint64_t relayd_id =
+ session->kernel_session->consumer->net_seq_index;
+ const bool is_local_trace =
+ session->kernel_session->consumer->type ==
+ CONSUMER_DST_LOCAL;
+
+ session->kernel_session->current_trace_chunk = new_trace_chunk;
+ if (is_local_trace) {
+ enum lttng_error_code ret_error_code;
+
+ ret_error_code = kernel_create_channel_subdirectories(
+ session->kernel_session);
+ if (ret_error_code != LTTNG_OK) {
+ ret = -ret_error_code;
+ goto error;
+ }
+ }
+ cds_lfht_for_each_entry(
+ session->kernel_session->consumer->socks->ht,
+ &iter, socket, node.node) {
+ pthread_mutex_lock(socket->lock);
+ ret = consumer_create_trace_chunk(socket,
+ relayd_id,
+ session->id, new_trace_chunk);
+ pthread_mutex_unlock(socket->lock);
+ if (ret) {
+ goto error;
+ }
+ }
+ }
+
+ /*
+ * Update local current trace chunk state last, only if all remote
+ * creations succeeded.
+ */
+ session->current_trace_chunk = new_trace_chunk;
+ LTTNG_OPTIONAL_SET(&session->most_recent_chunk_id, chunk_id);
+end:
+ if (_current_trace_chunk) {
+ *_current_trace_chunk = current_trace_chunk;
+ current_trace_chunk = NULL;
+ }
+end_no_move:
+ rcu_read_unlock();
+ lttng_trace_chunk_put(current_trace_chunk);
+ return ret;
+error:
+ if (session->ust_session) {
+ session->ust_session->current_trace_chunk = NULL;
+ }
+ if (session->kernel_session) {
+ session->kernel_session->current_trace_chunk = NULL;
+ }
+ /*
+ * Release references taken in the case where all references could not
+ * be acquired.
+ */
+ refs_to_release = refs_to_acquire - refs_acquired;
+ for (i = 0; i < refs_to_release; i++) {
+ lttng_trace_chunk_put(new_trace_chunk);
+ }
+ ret = -1;
+ goto end_no_move;
+}
+
+bool session_output_supports_trace_chunks(const struct ltt_session *session)
+{
+ const struct consumer_output *output = session->kernel_session ?
+ session->kernel_session->consumer :
+ session->ust_session->consumer;
+
+ 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,
+ const char *session_base_path_override,
+ const char *chunk_name_override)
+{
+ int ret;
+ struct lttng_trace_chunk *trace_chunk = NULL;
+ enum lttng_trace_chunk_status chunk_status;
+ const time_t chunk_creation_ts = time(NULL);
+ bool is_local_trace;
+ const char *base_path;
+ struct lttng_directory_handle session_output_directory;
+ const struct lttng_credentials session_credentials = {
+ .uid = session->uid,
+ .gid = session->gid,
+ };
+ uint64_t next_chunk_id;
+ const struct consumer_output *output;
+
+ if (consumer_output_override) {
+ output = consumer_output_override;
+ } else {
+ assert(session->ust_session || session->kernel_session);
+ output = session->ust_session ?
+ session->ust_session->consumer :
+ session->kernel_session->consumer;
+ }
+
+ is_local_trace = output->type == CONSUMER_DST_LOCAL;
+ base_path = session_base_path_override ? :
+ consumer_output_get_base_path(output);
+
+ if (chunk_creation_ts == (time_t) -1) {
+ PERROR("Failed to sample time while creation session \"%s\" trace chunk",
+ session->name);
+ goto error;
+ }
+
+ next_chunk_id = session->most_recent_chunk_id.is_set ?
+ session->most_recent_chunk_id.value + 1 : 0;
+
+ trace_chunk = lttng_trace_chunk_create(next_chunk_id,
+ chunk_creation_ts);
+ if (!trace_chunk) {
+ goto error;
+ }
+
+ if (chunk_name_override) {
+ chunk_status = lttng_trace_chunk_override_name(trace_chunk,
+ chunk_name_override);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ goto error;
+ }
+ }
+
+ if (!is_local_trace) {
+ /*
+ * No need to set crendentials and output directory
+ * for remote trace chunks.
+ */
+ goto end;
+ }
+
+ chunk_status = lttng_trace_chunk_set_credentials(trace_chunk,
+ &session_credentials);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ goto error;
+ }
+
+ DBG("Creating base output directory of session \"%s\" at %s",
+ session->name, base_path);
+ ret = utils_mkdir_recursive(base_path, S_IRWXU | S_IRWXG,
+ session->uid, session->gid);
+ if (ret) {
+ goto error;
+ }
+ ret = lttng_directory_handle_init(&session_output_directory,
+ base_path);
+ if (ret) {
+ goto error;
+ }
+ chunk_status = lttng_trace_chunk_set_as_owner(trace_chunk,
+ &session_output_directory);
+ lttng_directory_handle_fini(&session_output_directory);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ goto error;
+ }
+end:
+ return trace_chunk;
+error:
+ lttng_trace_chunk_put(trace_chunk);
+ trace_chunk = NULL;
+ goto end;
+}
+
+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)
+{
+ int ret = 0;
+ bool error_occurred = false;
+ struct cds_lfht_iter iter;
+ struct consumer_socket *socket;
+ enum lttng_trace_chunk_status chunk_status;
+ const time_t chunk_close_timestamp = time(NULL);
+
+ if (close_command) {
+ chunk_status = lttng_trace_chunk_set_close_command(
+ trace_chunk, *close_command);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ret = -1;
+ goto end;
+ }
+ }
+
+ if (chunk_close_timestamp == (time_t) -1) {
+ ERR("Failed to sample the close timestamp of the current trace chunk of session \"%s\"",
+ session->name);
+ ret = -1;
+ goto end;
+ }
+ chunk_status = lttng_trace_chunk_set_close_timestamp(trace_chunk,
+ chunk_close_timestamp);
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ERR("Failed to set the close timestamp of the current trace chunk of session \"%s\"",
+ session->name);
+ ret = -1;
+ goto end;
+ }
+
+ 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,
+ relayd_id,
+ session->id,
+ trace_chunk);
+ pthread_mutex_unlock(socket->lock);
+ if (ret) {
+ ERR("Failed to close trace chunk on user space consumer");
+ error_occurred = true;
+ }
+ }
+ }
+ 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,
+ relayd_id,
+ session->id,
+ trace_chunk);
+ pthread_mutex_unlock(socket->lock);
+ if (ret) {
+ ERR("Failed to close trace chunk on kernel consumer");
+ error_occurred = true;
+ }
+ }
+ }
+ ret = error_occurred ? -1 : 0;
+end:
+ return ret;
+}
+
+/*
+ * Set a session's current trace chunk.
+ *
+ * Must be called with the session lock held.
+ */
+int session_set_trace_chunk(struct ltt_session *session,
+ struct lttng_trace_chunk *new_trace_chunk,
+ struct lttng_trace_chunk **current_trace_chunk)
+{
+ ASSERT_LOCKED(session->lock);
+ return _session_set_trace_chunk_no_lock_check(session, new_trace_chunk,
+ current_trace_chunk);
+}
+
+static
+void session_notify_destruction(const struct ltt_session *session)
+{
+ size_t i;
+ const size_t count = lttng_dynamic_array_get_count(
+ &session->destroy_notifiers);
+
+ for (i = 0; i < count; i++) {
+ const struct ltt_session_destroy_notifier_element *element =
+ lttng_dynamic_array_get_element(
+ &session->destroy_notifiers, i);
+
+ element->notifier(session, element->user_data);
+ }
+}
+
static
void session_release(struct urcu_ref *ref)
{
struct ltt_kernel_session *ksess;
struct ltt_session *session = container_of(ref, typeof(*session), ref);
+ assert(!session->chunk_being_archived);
+
usess = session->ust_session;
ksess = session->kernel_session;
- /* Clean kernel session teardown */
+ 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 */
kernel_destroy_session(ksess);
+ session->kernel_session = NULL;
/* UST session teardown */
if (usess) {
/* Clean up the rest. */
trace_ust_destroy_session(usess);
+ session->ust_session = NULL;
}
/*
}
DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
- pthread_mutex_destroy(&session->lock);
consumer_output_put(session->consumer);
snapshot_destroy(&session->snapshot);
- del_session_list(session);
- del_session_ht(session);
+
+ pthread_mutex_destroy(&session->lock);
+
+ 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);
+ }
+ free(session->last_archived_chunk_name);
free(session);
}
*/
void session_put(struct ltt_session *session)
{
+ if (!session) {
+ return;
+ }
/*
* The session list lock must be held as any session_put()
* may cause the removal of the session from the session_list.
session_put(session);
}
+int session_add_destroy_notifier(struct ltt_session *session,
+ ltt_session_destroy_notifier notifier, void *user_data)
+{
+ const struct ltt_session_destroy_notifier_element element = {
+ .notifier = notifier,
+ .user_data = user_data
+ };
+
+ return lttng_dynamic_array_add_element(&session->destroy_notifiers,
+ &element);
+}
+
/*
* Return a ltt_session structure ptr that matches name. If no session found,
* NULL is returned. This must be called with the session list lock held using
}
/*
- * Create a brand new session and add it to the session list.
+ * Create a new session and add it to the session list.
+ * Session list lock must be held by the caller.
*/
-int session_create(char *name, uid_t uid, gid_t gid)
+enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
+ struct ltt_session **out_session)
{
int ret;
- struct ltt_session *new_session;
+ enum lttng_error_code ret_code;
+ struct ltt_session *new_session = NULL;
+
+ ASSERT_LOCKED(ltt_session_list.lock);
+ if (name) {
+ struct ltt_session *clashing_session;
- /* Allocate session data structure */
+ clashing_session = session_find_by_name(name);
+ if (clashing_session) {
+ session_put(clashing_session);
+ ret_code = LTTNG_ERR_EXIST_SESS;
+ goto error;
+ }
+ }
new_session = zmalloc(sizeof(struct ltt_session));
- if (new_session == NULL) {
- PERROR("zmalloc");
- ret = LTTNG_ERR_FATAL;
- goto error_malloc;
+ if (!new_session) {
+ PERROR("Failed to allocate an ltt_session structure");
+ ret_code = LTTNG_ERR_NOMEM;
+ goto error;
}
+ lttng_dynamic_array_init(&new_session->destroy_notifiers,
+ sizeof(struct ltt_session_destroy_notifier_element),
+ NULL);
urcu_ref_init(&new_session->ref);
+ pthread_mutex_init(&new_session->lock, NULL);
- /* Define session name */
- if (name != NULL) {
- if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) {
- ret = LTTNG_ERR_FATAL;
- goto error_asprintf;
- }
- } else {
- ERR("No session name given");
- ret = LTTNG_ERR_FATAL;
+ new_session->creation_time = time(NULL);
+ if (new_session->creation_time == (time_t) -1) {
+ PERROR("Failed to sample session creation time");
+ ret_code = LTTNG_ERR_SESSION_FAIL;
goto error;
}
- ret = validate_name(name);
- if (ret < 0) {
- ret = LTTNG_ERR_SESSION_INVALID_CHAR;
+ /* Create default consumer output. */
+ new_session->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+ if (new_session->consumer == NULL) {
+ ret_code = LTTNG_ERR_NOMEM;
goto error;
}
+ if (name) {
+ ret = lttng_strncpy(new_session->name, name, sizeof(new_session->name));
+ if (ret) {
+ ret_code = LTTNG_ERR_SESSION_INVALID_CHAR;
+ goto error;
+ }
+ ret = validate_name(name);
+ if (ret < 0) {
+ ret_code = LTTNG_ERR_SESSION_INVALID_CHAR;
+ goto error;
+ }
+ } else {
+ int i = 0;
+ bool found_name = false;
+ char datetime[16];
+ struct tm *timeinfo;
+
+ timeinfo = localtime(&new_session->creation_time);
+ if (!timeinfo) {
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto error;
+ }
+ strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S", timeinfo);
+ for (i = 0; i < INT_MAX; i++) {
+ struct ltt_session *clashing_session;
+
+ if (i == 0) {
+ ret = snprintf(new_session->name,
+ sizeof(new_session->name),
+ "%s-%s",
+ DEFAULT_SESSION_NAME,
+ datetime);
+ } else {
+ ret = snprintf(new_session->name,
+ sizeof(new_session->name),
+ "%s%d-%s",
+ DEFAULT_SESSION_NAME, i,
+ datetime);
+ }
+ if (ret == -1 || ret >= sizeof(new_session->name)) {
+ /*
+ * Null-terminate in case the name is used
+ * in logging statements.
+ */
+ new_session->name[sizeof(new_session->name) - 1] = '\0';
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto error;
+ }
+
+ clashing_session =
+ session_find_by_name(new_session->name);
+ session_put(clashing_session);
+ if (!clashing_session) {
+ found_name = true;
+ break;
+ }
+ }
+ if (found_name) {
+ DBG("Generated session name \"%s\"", new_session->name);
+ new_session->has_auto_generated_name = true;
+ } else {
+ ERR("Failed to auto-generate a session name");
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto error;
+ }
+ }
+
ret = gethostname(new_session->hostname, sizeof(new_session->hostname));
if (ret < 0) {
if (errno == ENAMETOOLONG) {
new_session->hostname[sizeof(new_session->hostname) - 1] = '\0';
+ ERR("Hostname exceeds the maximal permitted length and has been truncated to %s",
+ new_session->hostname);
} else {
- ret = LTTNG_ERR_FATAL;
+ ret_code = LTTNG_ERR_SESSION_FAIL;
goto error;
}
}
- /* Init kernel session */
- new_session->kernel_session = NULL;
- new_session->ust_session = NULL;
-
- /* Init lock */
- pthread_mutex_init(&new_session->lock, NULL);
-
new_session->uid = uid;
new_session->gid = gid;
ret = snapshot_init(&new_session->snapshot);
if (ret < 0) {
- ret = LTTNG_ERR_NOMEM;
+ ret_code = LTTNG_ERR_NOMEM;
goto error;
}
- new_session->rotation_pending_local = false;
- new_session->rotation_pending_relay = false;
new_session->rotation_state = LTTNG_ROTATION_STATE_NO_ROTATION;
- new_session->rotation_pending_check_timer_enabled = false;
- new_session->rotation_schedule_timer_enabled = false;
-
- /* Add new session to the session list */
- session_lock_list();
+ /* Add new session to the session list. */
new_session->id = add_session_list(new_session);
+
/*
* Add the new session to the ltt_sessions_ht_by_id.
* No ownership is taken by the hash table; it is merely
* by session id.
*/
add_session_ht(new_session);
- session_unlock_list();
+ new_session->published = true;
/*
- * Consumer is let to NULL since the create_session_uri command will set it
- * up and, if valid, assign it to the session.
+ * Consumer is left to NULL since the create_session_uri command will
+ * set it up and, if valid, assign it to the session.
*/
- DBG("Tracing session %s created with ID %" PRIu64 " by UID %d GID %d",
- name, new_session->id, new_session->uid, new_session->gid);
-
- return LTTNG_OK;
-
+ DBG("Tracing session %s created with ID %" PRIu64 " by uid = %d, gid = %d",
+ new_session->name, new_session->id, new_session->uid,
+ new_session->gid);
+ ret_code = LTTNG_OK;
+end:
+ if (new_session) {
+ (void) session_get(new_session);
+ *out_session = new_session;
+ }
+ return ret_code;
error:
-error_asprintf:
- free(new_session);
-
-error_malloc:
- return ret;
+ session_put(new_session);
+ new_session = NULL;
+ goto end;
}
/*
ASSERT_LOCKED(ltt_session_list.lock);
ASSERT_LOCKED(session->lock);
- session->rotation_pending_local = false;
- session->rotation_pending_relay = false;
- session->rotated_after_last_stop = false;
session->rotation_state = result;
if (session->rotation_pending_check_timer_enabled) {
ret = timer_session_rotation_pending_check_stop(session);
}
+ if (session->chunk_being_archived) {
+ uint64_t chunk_id;
+ enum lttng_trace_chunk_status chunk_status;
+
+ chunk_status = lttng_trace_chunk_get_id(
+ session->chunk_being_archived,
+ &chunk_id);
+ assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+ LTTNG_OPTIONAL_SET(&session->last_archived_chunk_id,
+ chunk_id);
+ lttng_trace_chunk_put(session->chunk_being_archived);
+ session->chunk_being_archived = NULL;
+ }
return ret;
}