summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-04-01 21:19:04 +0200
committerdimitri staessens <dimitri.staessens@ugent.be>2017-04-01 22:34:20 +0200
commitab588700c2d55e427f776c03ae9b7ae5e008f2c1 (patch)
tree9f0d97662d735a898cd6c2f689b19e82b939f61c
parent357fd25a4b7b3dde056de295a0e72eec6e878003 (diff)
downloadouroboros-ab588700c2d55e427f776c03ae9b7ae5e008f2c1.tar.gz
ouroboros-ab588700c2d55e427f776c03ae9b7ae5e008f2c1.zip
lib: Fix some issues in lockless rbuff
-rw-r--r--include/ouroboros/config.h.in2
-rw-r--r--src/lib/shm_rbuff.c26
-rw-r--r--src/lib/shm_rbuff_ll.c19
3 files changed, 38 insertions, 9 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 46f784d4..30bab68f 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -44,7 +44,7 @@
#define SHM_BUFFER_SIZE 1 << 14
#define DU_BUFF_HEADSPACE 128
#define DU_BUFF_TAILSPACE 0
-#define SHM_RBUFF_LOCKLESS
+#define SHM_RBUFF_LOCKLESS 0
#define SHM_RBUFF_PREFIX "/ouroboros.rbuff."
#define SHM_FLOW_SET_PREFIX "/ouroboros.sets."
#define IRMD_MAX_FLOWS 4096
diff --git a/src/lib/shm_rbuff.c b/src/lib/shm_rbuff.c
index dc1d9f0a..dc3f83b3 100644
--- a/src/lib/shm_rbuff.c
+++ b/src/lib/shm_rbuff.c
@@ -1,4 +1,28 @@
-#if (defined (SHM_RBUFF_LOCKLESS) && \
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * Ring buffer implementations for incoming SDUs
+ *
+ * Dimitri Staessens <dimitri.staessens@ugent.be>
+ * Sander Vrijders <sander.vrijders@ugent.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <ouroboros/config.h>
+
+#if ((SHM_RBUFF_LOCKLESS > 0) && \
(defined(__GNUC__) || defined (__clang__)))
#include "shm_rbuff_ll.c"
#else
diff --git a/src/lib/shm_rbuff_ll.c b/src/lib/shm_rbuff_ll.c
index b5b8bed2..d777de8b 100644
--- a/src/lib/shm_rbuff_ll.c
+++ b/src/lib/shm_rbuff_ll.c
@@ -228,6 +228,8 @@ int shm_rbuff_write(struct shm_rbuff * rb,
size_t ohead;
size_t nhead;
+ bool was_empty = false;
+
assert(rb);
assert(idx < SHM_BUFFER_SIZE);
@@ -238,11 +240,9 @@ int shm_rbuff_write(struct shm_rbuff * rb,
return -EAGAIN;
if (shm_rbuff_empty(rb))
- pthread_cond_broadcast(rb->add);
+ was_empty = true;
- ohead = RB_HEAD;
-
- *head_el_ptr(rb) = (ssize_t) idx;
+ nhead = RB_HEAD;
do {
ohead = nhead;
@@ -250,6 +250,11 @@ int shm_rbuff_write(struct shm_rbuff * rb,
nhead = __sync_val_compare_and_swap(rb->head, ohead, nhead);
} while (nhead != ohead);
+ *(rb->shm_base + nhead) = (ssize_t) idx;
+
+ if (was_empty)
+ pthread_cond_broadcast(rb->add);
+
return 0;
}
@@ -263,7 +268,7 @@ ssize_t shm_rbuff_read(struct shm_rbuff * rb)
if (shm_rbuff_empty(rb))
return -EAGAIN;
- otail = RB_TAIL;
+ ntail = RB_TAIL;
do {
otail = ntail;
@@ -273,7 +278,7 @@ ssize_t shm_rbuff_read(struct shm_rbuff * rb)
pthread_cond_broadcast(rb->del);
- return *tail_el_ptr(rb);
+ return *(rb->shm_base + ntail);
}
ssize_t shm_rbuff_read_b(struct shm_rbuff * rb,
@@ -348,7 +353,7 @@ void shm_rbuff_fini(struct shm_rbuff * rb)
assert(__sync_fetch_and_add(rb->acl, 0) == RB_CLOSED);
- if (shm_rbuff_empty)
+ if (shm_rbuff_empty(rb))
return;
#ifdef __APPLE__