diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-10-22 16:12:29 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-10-22 16:12:29 +0200 |
| commit | 2bc5cafc514ab92c389ce0d7dd376f89dfa7bb8e (patch) | |
| tree | bf2aadef902a6bbddcccc82e5059dc3c44f11b30 /src/lib/shm_flow_set.c | |
| parent | dc41c0ebfae020368ccf832f0fe0528ceb137f2c (diff) | |
| download | ouroboros-2bc5cafc514ab92c389ce0d7dd376f89dfa7bb8e.tar.gz ouroboros-2bc5cafc514ab92c389ce0d7dd376f89dfa7bb8e.zip | |
lib: Revert bad fqueue modification
An untested (and wrong) modification to the fqueue was mistakenly
added to a previous commit. This corrects the bad code.
Diffstat (limited to 'src/lib/shm_flow_set.c')
| -rw-r--r-- | src/lib/shm_flow_set.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/shm_flow_set.c b/src/lib/shm_flow_set.c index f68773aa..3b1af83f 100644 --- a/src/lib/shm_flow_set.c +++ b/src/lib/shm_flow_set.c @@ -356,6 +356,7 @@ ssize_t shm_flow_set_wait(const struct shm_flow_set * shm_set, assert(shm_set); assert(idx < AP_MAX_FQUEUES); + assert(fqueue); #ifdef __APPLE__ pthread_mutex_lock(shm_set->lock); @@ -397,10 +398,11 @@ ssize_t shm_flow_set_wait(const struct shm_flow_set * shm_set, memcpy(fqueue, fqueue_ptr(shm_set, idx), shm_set->heads[idx] * sizeof(int)); + ret = shm_set->heads[idx]; shm_set->heads[idx] = 0; } pthread_cleanup_pop(true); - return 0; + return ret; } |