Fix: destroy command: put consumer output after destroy notifier

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 2e39c43174ed21720090268e73882849555622d0..7fd4332ec12d3bb9f1c9643275c16d1769ecb0cc 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -423,7 +423,7 @@ 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;
+       int ret = 0;
        unsigned int i, refs_to_acquire = 0, refs_acquired = 0, refs_to_release = 0;
        struct cds_lfht_iter iter;
        struct consumer_socket *socket;
@@ -811,7 +811,6 @@ void session_release(struct urcu_ref *ref)
 
        DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
 
-       consumer_output_put(session->consumer);
        snapshot_destroy(&session->snapshot);
 
        pthread_mutex_destroy(&session->lock);
@@ -823,6 +822,7 @@ void session_release(struct urcu_ref *ref)
        }
        session_notify_destruction(session);
 
+       consumer_output_put(session->consumer);
        kernel_free_session(ksess);
        session->kernel_session = NULL;
        if (usess) {