diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2023-10-07 14:26:23 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2023-10-25 09:53:27 +0200 |
| commit | 5706bf3efa8d8262982bbed15fb041e536f56cf2 (patch) | |
| tree | 3cd9db132bb5756bdaa64982b63ad9b9dbe4aaad /src/irmd/reg/name.c | |
| parent | 180e92c5f13b99ed171e8efe11058eb943bc6506 (diff) | |
| download | ouroboros-5706bf3efa8d8262982bbed15fb041e536f56cf2.tar.gz ouroboros-5706bf3efa8d8262982bbed15fb041e536f56cf2.zip | |
lib: Wrap pthread_cond_timedwait for NULL abstime
We often have the pattern where we NULL-check abstime for
pthread_cond_timedwait to call pthread_cond_wait if it is.
Added a __timedwait function to wrap this.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/irmd/reg/name.c')
| -rw-r--r-- | src/irmd/reg/name.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/irmd/reg/name.c b/src/irmd/reg/name.c index 7e13e888..4d26c762 100644 --- a/src/irmd/reg/name.c +++ b/src/irmd/reg/name.c @@ -415,15 +415,17 @@ int reg_name_leave_state(struct reg_name * name, enum name_state state, struct timespec * timeout) { - struct timespec abstime; - int ret = 0; + struct timespec ts; + struct timespec * abstime = NULL; + int ret; assert(name); assert(state != NAME_DESTROY); if (timeout != NULL) { - clock_gettime(PTHREAD_COND_CLOCK, &abstime); - ts_add(&abstime, timeout, &abstime); + clock_gettime(PTHREAD_COND_CLOCK, &ts); + ts_add(&ts, timeout, &ts); + abstime = &ts; } pthread_mutex_lock(&name->mtx); @@ -431,13 +433,7 @@ int reg_name_leave_state(struct reg_name * name, pthread_cleanup_push(__cleanup_mutex_unlock, &name->mtx); while (name->state == state && ret != -ETIMEDOUT) - if (timeout) - ret = -pthread_cond_timedwait(&name->cond, - &name->mtx, - &abstime); - else - ret = -pthread_cond_wait(&name->cond, - &name->mtx); + ret = -__timedwait(&name->cond,&name->mtx, abstime); if (name->state == NAME_DESTROY) { ret = -1; |