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/flow.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/flow.c')
| -rw-r--r-- | src/irmd/reg/flow.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/irmd/reg/flow.c b/src/irmd/reg/flow.c index 30b9c504..898f2604 100644 --- a/src/irmd/reg/flow.c +++ b/src/irmd/reg/flow.c @@ -197,15 +197,8 @@ int reg_flow_wait_state(struct reg_flow * f, while (!(f->state == state || f->state == FLOW_DESTROY || f->state == FLOW_DEALLOC_PENDING) && - ret != -ETIMEDOUT) { - if (dl != NULL) - ret = -pthread_cond_timedwait(&f->cond, - &f->mtx, - dl); - else - ret = -pthread_cond_wait(&f->cond, - &f->mtx); - } + ret != -ETIMEDOUT) + ret = -__timedwait(&f->cond, &f->mtx, dl); if (f->state == FLOW_DESTROY || f->state == FLOW_DEALLOC_PENDING || |