X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_frontend.c;h=8257dcc63867410291d2dd7bf07ab176449edc3b;hb=c11ab967decd550b28111b2767eda20e7e6be3fd;hp=e454ac97c168ac6ea6671c01b80ffda03c13c17c;hpb=cc845d7556081ea01b8a5cab74151038cf7bb31a;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index e454ac97..8257dcc6 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -1075,15 +1075,6 @@ int lib_ring_buffer_snapshot(struct lib_ring_buffer *buf,
 	unsigned long consumed_cur, write_offset;
 	int finalized;
 
-	/*
-	 * First, ensure we perform a "final" flush onto the stream.  This will
-	 * ensure we create a packet of padding if we encounter an empty
-	 * packet. This ensures the time-stamps right before the snapshot is
-	 * used as end of packet timestamp.
-	 */
-	if (!buf->quiescent)
-		_lib_ring_buffer_switch_remote(buf, SWITCH_FLUSH);
-
 retry:
 	finalized = ACCESS_ONCE(buf->finalized);
 	/*
@@ -1504,8 +1495,7 @@ void lib_ring_buffer_print_errors(struct channel *chan,
 /*
  * lib_ring_buffer_switch_old_start: Populate old subbuffer header.
  *
- * Only executed by SWITCH_FLUSH, which can be issued while tracing is active
- * or at buffer finalization (destroy).
+ * Only executed when the buffer is finalized, in SWITCH_FLUSH.
  */
 static
 void lib_ring_buffer_switch_old_start(struct lib_ring_buffer *buf,
@@ -1701,14 +1691,12 @@ int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
 		unsigned long sb_index, commit_count;
 
 		/*
-		 * We are performing a SWITCH_FLUSH. There may be concurrent
-		 * writes into the buffer if e.g. invoked while performing a
-		 * snapshot on an active trace.
+		 * We are performing a SWITCH_FLUSH. At this stage, there are no
+		 * concurrent writes into the buffer.
 		 *
-		 * If the client does not save any header information (sub-buffer
-		 * header size == 0), don't switch empty subbuffer on finalize,
-		 * because it is invalid to deliver a completely empty
-		 * subbuffer.
+		 * The client does not save any header information.  Don't
+		 * switch empty subbuffer on finalize, because it is invalid to
+		 * deliver a completely empty subbuffer.
 		 */
 		if (!config->cb.subbuffer_header_size())
 			return -1;