Merged in dstaesse/ouroboros/be-refactor-rdrbuff (pull request #229)

lib: Refactor shm_du_map to shm_rdrbuff

1 files changed, 26 insertions, 2 deletions

diff --git a/src/lib/shm_ap_rbuff.c b/src/lib/shm_ap_rbuff.c
index 4ca29636..f21b1e86 100644
--- a/src/lib/shm_ap_rbuff.c
+++ b/src/lib/shm_ap_rbuff.c
@@ -285,8 +285,32 @@ 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,
-                      const struct timespec * timeout)
+int shm_ap_rbuff_peek_idx(struct shm_ap_rbuff * rb)
+{
+        int ret = 0;
+
+        if (rb == NULL)
+                return -EINVAL;
+
+        if (pthread_mutex_lock(rb->lock) == EOWNERDEAD) {
+                LOG_DBG("Recovering dead mutex.");
+                pthread_mutex_consistent(rb->lock);
+        }
+
+        if (shm_rbuff_empty(rb)) {
+                pthread_mutex_unlock(rb->lock);
+                return -1;
+        }
+
+        ret = (rb->shm_base + *rb->ptr_tail)->index;
+
+        pthread_mutex_unlock(rb->lock);
+
+        return ret;
+}
+
+int shm_ap_rbuff_peek_b(struct shm_ap_rbuff * rb,
+                        const struct timespec * timeout)
 {
         struct timespec abstime;
         int ret = 0;