X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=09a5c09b8038602c5b899d4e9e62f43614e0f4ad;hb=57349053b60a11a6ba741fd88f70354e9f5d7cb1;hp=8eafc51ff7a6b42c57afac6417ff2ac94ea40fd8;hpb=15500a1bb134d6bbd409da5568308c2a41291928;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 8eafc51f..09a5c09b 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -119,7 +119,7 @@ int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_conf
 		bufb->buf_rsb.id = subbuffer_id(config, 0, 1, 0);
 
 	/* Allocate subbuffer packet counter table */
-	align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_subbuffer));
+	align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_counts));
 	set_shmp(bufb->buf_cnt, zalloc_shm(shmobj,
 				sizeof(struct lttng_ust_lib_ring_buffer_backend_counts)
 				* num_subbuf));
@@ -322,6 +322,10 @@ int channel_backend_init(struct channel_backend *chanb,
 	/* Per-cpu buffer size: control (prior to backend) */
 	shmsize = offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer));
 	shmsize += sizeof(struct lttng_ust_lib_ring_buffer);
+	shmsize += offset_align(shmsize, __alignof__(struct commit_counters_hot));
+	shmsize += sizeof(struct commit_counters_hot) * num_subbuf;
+	shmsize += offset_align(shmsize, __alignof__(struct commit_counters_cold));
+	shmsize += sizeof(struct commit_counters_cold) * num_subbuf;
 
 	/* Per-cpu buffer size: backend */
 	/* num_subbuf + 1 is the worse case */
@@ -334,11 +338,8 @@ int channel_backend_init(struct channel_backend *chanb,
 	shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_pages) * num_subbuf_alloc;
 	shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_backend_subbuffer));
 	shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_subbuffer) * num_subbuf;
-	/* Per-cpu buffer size: control (after backend) */
-	shmsize += offset_align(shmsize, __alignof__(struct commit_counters_hot));
-	shmsize += sizeof(struct commit_counters_hot) * num_subbuf;
-	shmsize += offset_align(shmsize, __alignof__(struct commit_counters_cold));
-	shmsize += sizeof(struct commit_counters_cold) * num_subbuf;
+	shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_backend_counts));
+	shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_counts) * num_subbuf;
 
 	if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
 		struct lttng_ust_lib_ring_buffer *buf;