From 374f5bb557b5485fca6c08a2103800ec9fdf88be Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 15 Apr 2017 22:26:56 +0200 Subject: [PATCH] shm node: fixed bug introduced by previous refactoring --- lib/nodes/shmem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/nodes/shmem.c b/lib/nodes/shmem.c index 2d4a98161..bc5784ff5 100644 --- a/lib/nodes/shmem.c +++ b/lib/nodes/shmem.c @@ -142,20 +142,20 @@ int shmem_read(struct node *n, struct sample *smps[], unsigned cnt) { struct shmem *shm = n->_vd; - int ret; + int ret, recv; - ret = shm->polling ? queue_pull_many(&shm->shared->in.q, (void**) smps, cnt) + recv = shm->polling ? queue_pull_many(&shm->shared->in.q, (void**) smps, cnt) : queue_signalled_pull_many(&shm->shared->in.qs, (void**) smps, cnt); - if (ret <= 0) - return ret; + if (recv <= 0) + return recv; /* Check if remote process is still running */ ret = atomic_load_explicit(&shm->shared->ext_stopped, memory_order_relaxed); if (ret) - return -1; + return ret; - return ret; + return recv; } int shmem_write(struct node *n, struct sample *smps[], unsigned cnt)