diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-07-17 17:09:51 -0400 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2020-10-23 12:16:52 -0400 |
| commit | 5047884528ec263215504cb5df12ebd2422cc392 (patch) | |
| tree | 952121f1a904ef9c86c1f7336a3aae757eeb3434 /ldpd/control.c | |
| parent | b3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9 (diff) | |
*: unify thread/event cancel macros
Replace all lib/thread cancel macros, use thread_cancel()
everywhere. Only the THREAD_OFF macro and thread_cancel() api are
supported. Also adjust thread_cancel_async() to NULL caller's pointer (if
present).
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'ldpd/control.c')
| -rw-r--r-- | ldpd/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldpd/control.c b/ldpd/control.c index 6554f0a6f1..3b77765952 100644 --- a/ldpd/control.c +++ b/ldpd/control.c @@ -183,8 +183,8 @@ control_close(int fd) msgbuf_clear(&c->iev.ibuf.w); TAILQ_REMOVE(&ctl_conns, c, entry); - THREAD_READ_OFF(c->iev.ev_read); - THREAD_WRITE_OFF(c->iev.ev_write); + thread_cancel(&c->iev.ev_read); + thread_cancel(&c->iev.ev_write); close(c->iev.ibuf.fd); accept_unpause(); free(c); |