diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-05-20 20:19:08 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
| commit | 907a2395f423e3b97335d554557c2cef7195db84 (patch) | |
| tree | 18ea691bc5589fa570c739a9f221429633778ea9 /ldpd/ldpd.c | |
| parent | *: Rename `struct thread` to `struct event` (diff) | |
| download | frr-907a2395f423e3b97335d554557c2cef7195db84.tar.xz frr-907a2395f423e3b97335d554557c2cef7195db84.zip | |
*: Convert thread_add_XXX functions to event_add_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ldpd/ldpd.c')
| -rw-r--r-- | ldpd/ldpd.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index f549b34ee..c87bf1ea1 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -383,7 +383,7 @@ main(int argc, char *argv[]) frr_config_fork(); /* apply configuration */ - thread_add_event(master, ldp_config_fork_apply, NULL, 0, NULL); + event_add_event(master, ldp_config_fork_apply, NULL, 0, NULL); /* setup pipes to children */ if ((iev_ldpe = calloc(1, sizeof(struct imsgev))) == NULL || @@ -394,26 +394,26 @@ main(int argc, char *argv[]) imsg_init(&iev_ldpe->ibuf, pipe_parent2ldpe[0]); iev_ldpe->handler_read = main_dispatch_ldpe; - thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd, - &iev_ldpe->ev_read); + event_add_read(master, iev_ldpe->handler_read, iev_ldpe, + iev_ldpe->ibuf.fd, &iev_ldpe->ev_read); iev_ldpe->handler_write = ldp_write_handler; imsg_init(&iev_ldpe_sync->ibuf, pipe_parent2ldpe_sync[0]); iev_ldpe_sync->handler_read = main_dispatch_ldpe; - thread_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, iev_ldpe_sync->ibuf.fd, - &iev_ldpe_sync->ev_read); + event_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, + iev_ldpe_sync->ibuf.fd, &iev_ldpe_sync->ev_read); iev_ldpe_sync->handler_write = ldp_write_handler; imsg_init(&iev_lde->ibuf, pipe_parent2lde[0]); iev_lde->handler_read = main_dispatch_lde; - thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, - &iev_lde->ev_read); + event_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, + &iev_lde->ev_read); iev_lde->handler_write = ldp_write_handler; imsg_init(&iev_lde_sync->ibuf, pipe_parent2lde_sync[0]); iev_lde_sync->handler_read = main_dispatch_lde; - thread_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, iev_lde_sync->ibuf.fd, - &iev_lde_sync->ev_read); + event_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, + iev_lde_sync->ibuf.fd, &iev_lde_sync->ev_read); iev_lde_sync->handler_write = ldp_write_handler; if (main_imsg_send_ipc_sockets(&iev_ldpe->ibuf, &iev_lde->ibuf)) @@ -787,12 +787,12 @@ void imsg_event_add(struct imsgev *iev) { if (iev->handler_read) - thread_add_read(master, iev->handler_read, iev, iev->ibuf.fd, - &iev->ev_read); + event_add_read(master, iev->handler_read, iev, iev->ibuf.fd, + &iev->ev_read); if (iev->handler_write && iev->ibuf.w.queued) - thread_add_write(master, iev->handler_write, iev, - iev->ibuf.fd, &iev->ev_write); + event_add_write(master, iev->handler_write, iev, iev->ibuf.fd, + &iev->ev_write); } int @@ -819,8 +819,8 @@ void evbuf_event_add(struct evbuf *eb) { if (eb->wbuf.queued) - thread_add_write(master, eb->handler, eb->arg, eb->wbuf.fd, - &eb->ev); + event_add_write(master, eb->handler, eb->arg, eb->wbuf.fd, + &eb->ev); } void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct event *), |