diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-30 14:04:03 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-30 14:04:03 +0000 |
| commit | 94044e99af295e9440d306719a5cf341645d1803 (patch) | |
| tree | 49e677cf3626a58737fd3d2d7ac8b0dd7a74517f /src/lib/shm_flow_set.c | |
| parent | 72eb9eed1284643db20c45ef82365fa54fd0ef1c (diff) | |
| parent | 05fa4879dd8c70156fd98eabed4634098b0feecb (diff) | |
| download | ouroboros-94044e99af295e9440d306719a5cf341645d1803.tar.gz ouroboros-94044e99af295e9440d306719a5cf341645d1803.zip | |
Merged in dstaesse/ouroboros/be-dealloc (pull request #293)
operf tool, bugfixing and small improvements
Diffstat (limited to 'src/lib/shm_flow_set.c')
| -rw-r--r-- | src/lib/shm_flow_set.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/shm_flow_set.c b/src/lib/shm_flow_set.c index 3b1af83f..6cc94573 100644 --- a/src/lib/shm_flow_set.c +++ b/src/lib/shm_flow_set.c @@ -376,22 +376,20 @@ ssize_t shm_flow_set_wait(const struct shm_flow_set * shm_set, while (shm_set->heads[idx] == 0 && ret != -ETIMEDOUT) { if (timeout != NULL) - ret = pthread_cond_timedwait(shm_set->conds + idx, - shm_set->lock, - &abstime); + ret = -pthread_cond_timedwait(shm_set->conds + idx, + shm_set->lock, + &abstime); else - ret = pthread_cond_wait(shm_set->conds + idx, - shm_set->lock); + ret = -pthread_cond_wait(shm_set->conds + idx, + shm_set->lock); #ifndef __APPLE__ - if (ret == EOWNERDEAD) { + if (ret == -EOWNERDEAD) { LOG_DBG("Recovering dead mutex."); pthread_mutex_consistent(shm_set->lock); } #endif - if (ret == ETIMEDOUT) { - ret = -ETIMEDOUT; + if (ret == -ETIMEDOUT) break; - } } if (ret != -ETIMEDOUT) { @@ -404,5 +402,7 @@ ssize_t shm_flow_set_wait(const struct shm_flow_set * shm_set, pthread_cleanup_pop(true); + assert(ret); + return ret; } |