[libqb] [PATCH 2/2] RB: fix test failure on ppc
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/ringbuffer.c | 13 ++++++++++---
tests/check_rb.c | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/ringbuffer.c b/lib/ringbuffer.c
index ec83cb0..f46d735 100644
--- a/lib/ringbuffer.c
+++ b/lib/ringbuffer.c
@@ -40,6 +40,14 @@ do { \
*/
#define QB_RB_CHUNK_HEADER_WORDS 2
#define QB_RB_CHUNK_HEADER_SIZE (sizeof(uint32_t) * QB_RB_CHUNK_HEADER_WORDS)
+/*
+ * margin is the gap we leave when checking to see if we have enough
+ * space for a new chunk.
+ * So:
+ * qb_rb_space_free() >= QB_RB_CHUNK_MARGIN + new data chunk
+ * The extra word size is to allow for non word sized data chunks.
+ */
+#define QB_RB_CHUNK_MARGIN (sizeof(uint32_t) * (QB_RB_CHUNK_HEADER_WORDS + 1))
#define QB_RB_CHUNK_MAGIC 0xAAAAAAAA
#define QB_RB_CHUNK_SIZE_GET(rb, pointer) \
rb->shared_data[pointer]
@@ -367,12 +375,11 @@ qb_rb_chunk_alloc(struct qb_ringbuffer_s * rb, size_t len)
* Reclaim data if we are over writing and we need space
*/
if (rb->flags & QB_RB_FLAG_OVERWRITE) {
- while (qb_rb_space_free(rb) <
- (len + QB_RB_CHUNK_HEADER_SIZE + 4)) {
+ while (qb_rb_space_free(rb) < (len + QB_RB_CHUNK_MARGIN)) {
qb_rb_chunk_reclaim(rb);
}
} else {
- if (qb_rb_space_free(rb) < (len + QB_RB_CHUNK_HEADER_SIZE + 4)) {
+ if (qb_rb_space_free(rb) < (len + QB_RB_CHUNK_MARGIN)) {
errno = EAGAIN;
return NULL;
}
diff --git a/tests/check_rb.c b/tests/check_rb.c
index 002521e..97b6dd4 100644
--- a/tests/check_rb.c
+++ b/tests/check_rb.c
@@ -59,7 +59,7 @@ START_TEST(test_ring_buffer1)
hdr.size += sizeof(struct qb_ipc_request_header);
avail = qb_rb_space_free(rb);
actual = qb_rb_chunk_write(rb, &hdr, hdr.size);
- if (avail < (hdr.size + (2 * sizeof(uint32_t)))) {
+ if (avail < (hdr.size + (3 * sizeof(uint32_t)))) {
ck_assert_int_eq(actual, -EAGAIN);
} else {
ck_assert_int_eq(actual, hdr.size);
--
1.7.9.1