From 8d1ce881d50b104274cd66de590f6ed48216c0f8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 19 May 2016 21:31:07 -0400 Subject: [PATCH] Fix: only flush non-metadata channels Issue introduced by commit "Fix: do not generate packet at destroy after stop". Signed-off-by: Mathieu Desnoyers --- lttng-events.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lttng-events.c b/lttng-events.c index 1aff9ec7..992ba58f 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -240,8 +240,10 @@ int lttng_session_enable(struct lttng_session *session) lttng_session_sync_enablers(session); /* Clear each stream's quiescent state. */ - list_for_each_entry(chan, &session->chan, list) - lib_ring_buffer_clear_quiescent_channel(chan->chan); + list_for_each_entry(chan, &session->chan, list) { + if (chan->channel_type != METADATA_CHANNEL) + lib_ring_buffer_clear_quiescent_channel(chan->chan); + } ACCESS_ONCE(session->active) = 1; ACCESS_ONCE(session->been_active) = 1; @@ -275,8 +277,10 @@ int lttng_session_disable(struct lttng_session *session) lttng_session_sync_enablers(session); /* Set each stream's quiescent state. */ - list_for_each_entry(chan, &session->chan, list) - lib_ring_buffer_set_quiescent_channel(chan->chan); + list_for_each_entry(chan, &session->chan, list) { + if (chan->channel_type != METADATA_CHANNEL) + lib_ring_buffer_set_quiescent_channel(chan->chan); + } end: mutex_unlock(&sessions_mutex); return ret; -- 2.34.1