Merged in dstaesse/ouroboros/be-fp (pull request #101)

lib: allow parallel connections

1 files changed, 20 insertions, 4 deletions

diff --git a/src/lib/shm_ap_rbuff.c b/src/lib/shm_ap_rbuff.c
index 71a7e733..18fedc88 100644
--- a/src/lib/shm_ap_rbuff.c
+++ b/src/lib/shm_ap_rbuff.c
@@ -219,8 +219,6 @@ void shm_ap_rbuff_destroy(struct shm_ap_rbuff * rb)
 
 int shm_ap_rbuff_write(struct shm_ap_rbuff * rb, struct rb_entry * e)
 {
-        struct rb_entry * pos;
-
         if (rb == NULL || e == NULL)
                 return -1;
 
@@ -231,8 +229,7 @@ int shm_ap_rbuff_write(struct shm_ap_rbuff * rb, struct rb_entry * e)
                 return -1;
         }
 
-        pos = rb->shm_base + *rb->ptr_head;
-        *pos = *e;
+        *(rb->shm_base + *rb->ptr_head) = *e;
         *rb->ptr_head = (*rb->ptr_head + 1) & (SHM_RBUFF_SIZE -1);
 
         pthread_mutex_unlock(rb->shm_mutex);
@@ -240,6 +237,25 @@ int shm_ap_rbuff_write(struct shm_ap_rbuff * rb, struct rb_entry * e)
         return 0;
 }
 
+
+int shm_ap_rbuff_peek(struct shm_ap_rbuff * rb)
+{
+        int port_id = -1;
+
+        pthread_mutex_lock(rb->shm_mutex);
+
+        if (shm_rbuff_used(rb) == 0) {
+                pthread_mutex_unlock(rb->shm_mutex);
+                return -7; /* -EAGAIN */
+        }
+
+        port_id = (rb->shm_base + *rb->ptr_tail)->port_id;
+
+        pthread_mutex_unlock(rb->shm_mutex);
+
+        return port_id;
+}
+
 struct rb_entry * shm_ap_rbuff_read(struct shm_ap_rbuff * rb)
 {
         struct rb_entry * e = NULL;