diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-03-21 16:21:25 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-03-21 16:21:25 +0100 |
| commit | 4b257b249ea91d1ee7e2341c563bac561911e8a6 (patch) | |
| tree | f45378a6118390d279062577188741ab3d256127 /src/irmd | |
| parent | 8907220599bec8067c1701c3d8bd19f9bcb19275 (diff) | |
| parent | b04b4933fc7f03aef940b4de5fd43815834951ca (diff) | |
| download | ouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.tar.gz ouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/irmd')
| -rw-r--r-- | src/irmd/api_table.c | 23 | ||||
| -rw-r--r-- | src/irmd/main.c | 2 | ||||
| -rw-r--r-- | src/irmd/registry.c | 6 |
3 files changed, 25 insertions, 6 deletions
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; } diff --git a/src/irmd/main.c b/src/irmd/main.c index 9aceb27a..ad55256a 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1360,7 +1360,7 @@ static struct irm_flow * flow_req_arr(pid_t api, pid_t h_api = -1; int port_id = -1; - struct timespec wt = {IRMD_REQ_ARR_TIMEOUT % 1000, + struct timespec wt = {IRMD_REQ_ARR_TIMEOUT / 1000, (IRMD_REQ_ARR_TIMEOUT % 1000) * MILLION}; log_dbg("Flow req arrived from IPCP %d for %s on AE %s.", 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); |