Fix: Expand the shmobj size for the sequence number
authorLiguang Li <liguang.li@windriver.com>
Thu, 22 Jun 2017 08:56:29 +0000 (16:56 +0800)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 22 Jun 2017 15:33:58 +0000 (11:33 -0400)
This patch fixes a bug which was introduced by:
1ff31389b ("Generate and export the sequence number")

Signed-off-by: Liguang Li <liguang.li@windriver.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
libringbuffer/ring_buffer_backend.c

index 8eafc51ff7a6b42c57afac6417ff2ac94ea40fd8..72c49102fc935e0995ac08982a1703118d87ac23 100644 (file)
@@ -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));
@@ -334,6 +334,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;
+       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;
        /* Per-cpu buffer size: control (after backend) */
        shmsize += offset_align(shmsize, __alignof__(struct commit_counters_hot));
        shmsize += sizeof(struct commit_counters_hot) * num_subbuf;
This page took 0.025799 seconds and 4 git commands to generate.