X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_api.h;h=56dbef2aa4326c8a4067ecc96ada66b887358afd;hb=refs%2Fheads%2Fstable-2.5;hp=b5406b0ef9d3678d44f706b23d66117b5659fd9e;hpb=019fbcb65ec7eec2c86019ad1afce8fa47dc1269;p=lttng-ust.git

diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h
index b5406b0e..56dbef2a 100644
--- a/libringbuffer/frontend_api.h
+++ b/libringbuffer/frontend_api.h
@@ -126,6 +126,14 @@ int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
 	 * boundary. It's safe to write.
 	 */
 	*o_end = *o_begin + ctx->slot_size;
+
+	if (caa_unlikely((subbuf_offset(*o_end, chan)) == 0))
+		/*
+		 * The offset_end will fall at the very beginning of the next
+		 * subbuffer.
+		 */
+		return 1;
+
 	return 0;
 }
 
@@ -280,14 +288,13 @@ void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
 	commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, endidx)->cc);
 
 	lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
-				      commit_count, endidx, handle);
+				      commit_count, endidx, handle, ctx->tsc);
 	/*
 	 * Update used size at each commit. It's needed only for extracting
 	 * ring_buffer buffers from vmcore, after crash.
 	 */
 	lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
-					     ctx->buf_offset, commit_count,
-					     ctx->slot_size, handle);
+			offset_end, commit_count, handle);
 }
 
 /**