X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=eb4e48629ca3d26a08b3c015b069a0e3c29f7d68;hb=31cf5ca34ea522f407f2fcab780c4a644f2bd15e;hp=e99ba8a5942a77084b740f75ef80fc0781b89ed3;hpb=0bade047c6b695d7ab0df693d54e9d46d81bc8ee;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index e99ba8a5..eb4e4862 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -1333,11 +1333,10 @@ void lib_ring_buffer_switch_old_start(struct lttng_ust_lib_ring_buffer *buf,
 	commit_count = v_read(config, &shmp_index(handle, 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, handle);
+				      commit_count, oldidx, handle, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, oldidx,
-					     offsets->old, commit_count,
-					     config->cb.subbuffer_header_size(),
-					     handle);
+			offsets->old + config->cb.subbuffer_header_size(),
+			commit_count, handle);
 }
 
 /*
@@ -1372,10 +1371,9 @@ void lib_ring_buffer_switch_old_end(struct lttng_ust_lib_ring_buffer *buf,
 	v_add(config, padding_size, &shmp_index(handle, buf->commit_hot, oldidx)->cc);
 	commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, oldidx)->cc);
 	lib_ring_buffer_check_deliver(config, buf, chan, offsets->old - 1,
-				      commit_count, oldidx, handle);
+				      commit_count, oldidx, handle, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, oldidx,
-					     offsets->old, commit_count,
-					     padding_size, handle);
+			offsets->old + padding_size, commit_count, handle);
 }
 
 /*
@@ -1408,11 +1406,10 @@ void lib_ring_buffer_switch_new_start(struct lttng_ust_lib_ring_buffer *buf,
 	commit_count = v_read(config, &shmp_index(handle, 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, handle);
+				      commit_count, beginidx, handle, tsc);
 	lib_ring_buffer_write_commit_counter(config, buf, chan, beginidx,
-					     offsets->begin, commit_count,
-					     config->cb.subbuffer_header_size(),
-					     handle);
+			offsets->begin + config->cb.subbuffer_header_size(),
+			commit_count, handle);
 }
 
 /*