X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_frontend.c;h=310752506550bda15e03d6d57eff5d5f7a43398c;hb=cc62f29ec5d5149ae6dba1a9acb538e06da07a94;hp=8257dcc63867410291d2dd7bf07ab176449edc3b;hpb=6140ad92d59761d260a5826abe528ba3f6e4be8d;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 8257dcc6..31075250 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -1861,12 +1861,20 @@ static void _lib_ring_buffer_switch_remote(struct lib_ring_buffer *buf,
 	put_online_cpus();
 }
 
+/* Switch sub-buffer if current sub-buffer is non-empty. */
 void lib_ring_buffer_switch_remote(struct lib_ring_buffer *buf)
 {
 	_lib_ring_buffer_switch_remote(buf, SWITCH_ACTIVE);
 }
 EXPORT_SYMBOL_GPL(lib_ring_buffer_switch_remote);
 
+/* Switch sub-buffer even if current sub-buffer is empty. */
+void lib_ring_buffer_switch_remote_empty(struct lib_ring_buffer *buf)
+{
+	_lib_ring_buffer_switch_remote(buf, SWITCH_FLUSH);
+}
+EXPORT_SYMBOL_GPL(lib_ring_buffer_switch_remote_empty);
+
 /*
  * Returns :
  * 0 if ok
@@ -1878,7 +1886,8 @@ static
 int lib_ring_buffer_try_reserve_slow(struct lib_ring_buffer *buf,
 				     struct channel *chan,
 				     struct switch_offsets *offsets,
-				     struct lib_ring_buffer_ctx *ctx)
+				     struct lib_ring_buffer_ctx *ctx,
+				     void *client_ctx)
 {
 	const struct lib_ring_buffer_config *config = &chan->backend.config;
 	unsigned long reserve_commit_diff, offset_cmp;
@@ -1904,7 +1913,7 @@ retry:
 		offsets->size = config->cb.record_header_size(config, chan,
 						offsets->begin,
 						&offsets->pre_header_padding,
-						ctx);
+						ctx, client_ctx);
 		offsets->size +=
 			lib_ring_buffer_align(offsets->begin + offsets->size,
 					      ctx->largest_align)
@@ -1988,7 +1997,7 @@ retry:
 			config->cb.record_header_size(config, chan,
 						offsets->begin,
 						&offsets->pre_header_padding,
-						ctx);
+						ctx, client_ctx);
 		offsets->size +=
 			lib_ring_buffer_align(offsets->begin + offsets->size,
 					      ctx->largest_align)
@@ -2052,7 +2061,8 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_lost_event_too_big);
  * -EIO for other errors, else returns 0.
  * It will take care of sub-buffer switching.
  */
-int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx)
+int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx,
+		void *client_ctx)
 {
 	struct channel *chan = ctx->chan;
 	const struct lib_ring_buffer_config *config = &chan->backend.config;
@@ -2065,7 +2075,7 @@ int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx)
 
 	do {
 		ret = lib_ring_buffer_try_reserve_slow(buf, chan, &offsets,
-						       ctx);
+						       ctx, client_ctx);
 		if (unlikely(ret))
 			return ret;
 	} while (unlikely(v_cmpxchg(config, &buf->offset, offsets.old,