diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-22 08:26:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 08:26:08 +0300 |
| commit | eed5b70f94b51c05bdbcebf39ade792213fd124b (patch) | |
| tree | 82932e6c0215ec11400b2b9e7efd911d7880d285 /ldpd/ldpd.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'ldpd/ldpd.c')
| -rw-r--r-- | ldpd/ldpd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 796cf11798..87d78afa25 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -616,8 +616,8 @@ static void main_dispatch_ldpe(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - thread_cancel(&iev->ev_read); - thread_cancel(&iev->ev_write); + THREAD_OFF(iev->ev_read); + THREAD_OFF(iev->ev_write); ldpe_pid = 0; if (lde_pid == 0) ldpd_shutdown(); @@ -721,8 +721,8 @@ static void main_dispatch_lde(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - thread_cancel(&iev->ev_read); - thread_cancel(&iev->ev_write); + THREAD_OFF(iev->ev_read); + THREAD_OFF(iev->ev_write); lde_pid = 0; if (ldpe_pid == 0) ldpd_shutdown(); @@ -744,8 +744,8 @@ void ldp_write_handler(struct thread *thread) fatal("msgbuf_write"); if (n == 0) { /* this pipe is dead, so remove the event handlers */ - thread_cancel(&iev->ev_read); - thread_cancel(&iev->ev_write); + THREAD_OFF(iev->ev_read); + THREAD_OFF(iev->ev_write); return; } @@ -829,7 +829,7 @@ void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct thread *), void evbuf_clear(struct evbuf *eb) { - thread_cancel(&eb->ev); + THREAD_OFF(eb->ev); msgbuf_clear(&eb->wbuf); eb->wbuf.fd = -1; } |