X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_frontend.c;h=0029b70431e44d10ad625647ba92929e972d88c0;hb=2557ad30054ad7194dbe77f97b87bd13a8739424;hp=4d38978c13aafc154186d0b9bf909bba443ef136;hpb=1b26381c19dd2d9fa41f52d8dc13b15b8dd32c7c;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 4d38978c..0029b704 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -1015,7 +1015,7 @@ retry:
 	 */
 	if (((commit_count - chan->backend.subbuf_size)
 	     & chan->commit_count_mask)
-	    - (buf_trunc(consumed_cur, chan)
+	    - (buf_trunc(consumed, chan)
 	       >> chan->backend.num_subbuf_order)
 	    != 0)
 		goto nodata;
@@ -1024,7 +1024,7 @@ retry:
 	 * Check that we are not about to read the same subbuffer in
 	 * which the writer head is.
 	 */
-	if (subbuf_trunc(write_offset, chan) - subbuf_trunc(consumed_cur, chan)
+	if (subbuf_trunc(write_offset, chan) - subbuf_trunc(consumed, chan)
 	    == 0)
 		goto nodata;
 
@@ -1249,7 +1249,7 @@ void lib_ring_buffer_switch_old_start(struct lib_ring_buffer *buf,
 	commit_count = v_read(config, &buf->commit_hot[oldidx].cc);
 	/* Check if the written buffer has to be delivered */
 	lib_ring_buffer_check_deliver(config, buf, chan, offsets->old,
-				      commit_count, oldidx);
+				      commit_count, oldidx, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, oldidx,
 					     offsets->old, commit_count,
 					     config->cb.subbuffer_header_size());
@@ -1293,7 +1293,7 @@ void lib_ring_buffer_switch_old_end(struct lib_ring_buffer *buf,
 	v_add(config, padding_size, &buf->commit_hot[oldidx].cc);
 	commit_count = v_read(config, &buf->commit_hot[oldidx].cc);
 	lib_ring_buffer_check_deliver(config, buf, chan, offsets->old - 1,
-				      commit_count, oldidx);
+				      commit_count, oldidx, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, oldidx,
 					     offsets->old, commit_count,
 					     padding_size);
@@ -1336,7 +1336,7 @@ void lib_ring_buffer_switch_new_start(struct lib_ring_buffer *buf,
 	commit_count = v_read(config, &buf->commit_hot[beginidx].cc);
 	/* Check if the written buffer has to be delivered */
 	lib_ring_buffer_check_deliver(config, buf, chan, offsets->begin,
-				      commit_count, beginidx);
+				      commit_count, beginidx, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, beginidx,
 					     offsets->begin, commit_count,
 					     config->cb.subbuffer_header_size());
@@ -1378,7 +1378,7 @@ void lib_ring_buffer_switch_new_end(struct lib_ring_buffer *buf,
 	v_add(config, padding_size, &buf->commit_hot[endidx].cc);
 	commit_count = v_read(config, &buf->commit_hot[endidx].cc);
 	lib_ring_buffer_check_deliver(config, buf, chan, offsets->end - 1,
-				  commit_count, endidx);
+				  commit_count, endidx, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
 					     offsets->end, commit_count,
 					     padding_size);