From 19a3277dbff7fc79c12be8a200ab6c8dfe6b50b9 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Tue, 21 Mar 2017 16:14:18 +0100 Subject: irmd: Fix timeouts in reg_entry This fixes bad timedwaits for the state of the reg_entry. Also slightly revised timedwaits throughout the prototype. --- src/irmd/api_table.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/irmd/api_table.c') diff --git a/src/irmd/api_table.c b/src/irmd/api_table.c index df300cea..83153aac 100644 --- a/src/irmd/api_table.c +++ b/src/irmd/api_table.c @@ -34,6 +34,7 @@ struct api_entry * api_entry_create(pid_t api, char * apn) { struct api_entry * e; + pthread_condattr_t cattr; if (apn == NULL) return NULL; @@ -53,8 +54,26 @@ struct api_entry * api_entry_create(pid_t api, char * apn) e->state = API_INIT; - pthread_mutex_init(&e->state_lock, NULL); - pthread_cond_init(&e->state_cond, NULL); + if (pthread_condattr_init(&cattr)) { + free(e); + return NULL; + } + +#ifndef __APPLE__ + pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK); +#endif + + if (pthread_mutex_init(&e->state_lock, NULL)) { + free(e); + return NULL; + } + + + if (pthread_cond_init(&e->state_cond, &cattr)) { + pthread_mutex_destroy(&e->state_lock); + free(e); + return NULL; + } return e; } -- cgit v1.2.3