summaryrefslogtreecommitdiff
path: root/src/irmd/registry.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-03-21 15:19:02 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-21 15:19:02 +0000
commitb04b4933fc7f03aef940b4de5fd43815834951ca (patch)
tree835d86fa8c9695e95ef213dc5644d1a7f1fdc395 /src/irmd/registry.c
parent15b492ffb0de010b94bfb4e80c721e04ef6f63c2 (diff)
parent19a3277dbff7fc79c12be8a200ab6c8dfe6b50b9 (diff)
downloadouroboros-b04b4933fc7f03aef940b4de5fd43815834951ca.tar.gz
ouroboros-b04b4933fc7f03aef940b4de5fd43815834951ca.zip
Merged in dstaesse/ouroboros/testing-waits (pull request #407)
irmd: Fix timeouts in reg_entry
Diffstat (limited to 'src/irmd/registry.c')
-rw-r--r--src/irmd/registry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/irmd/registry.c b/src/irmd/registry.c
index 985ecda0..9512d664 100644
--- a/src/irmd/registry.c
+++ b/src/irmd/registry.c
@@ -76,7 +76,7 @@ static struct reg_entry * reg_entry_init(struct reg_entry * e,
if (pthread_condattr_init(&cattr))
return NULL;
-#ifdef __APPLE__
+#ifndef __APPLE__
pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK);
#endif
if (pthread_cond_init(&e->state_cond, &cattr))
@@ -429,7 +429,7 @@ int reg_entry_leave_state(struct reg_entry * e,
if (timeout)
ret = -pthread_cond_timedwait(&e->state_cond,
&e->state_lock,
- timeout);
+ &abstime);
else
ret = -pthread_cond_wait(&e->state_cond,
&e->state_lock);
@@ -468,7 +468,7 @@ int reg_entry_wait_state(struct reg_entry * e,
if (timeout)
ret = -pthread_cond_timedwait(&e->state_cond,
&e->state_lock,
- timeout);
+ &abstime);
else
ret = -pthread_cond_wait(&e->state_cond,
&e->state_lock);