diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-05-20 14:19:08 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 08:32:17 -0400 |
| commit | 907a2395f423e3b97335d554557c2cef7195db84 (patch) | |
| tree | 18ea691bc5589fa570c739a9f221429633778ea9 /nhrpd/nhrp_event.c | |
| parent | e6685141aae8fc869d49cde1d459f73b87bbec89 (diff) | |
*: Convert thread_add_XXX functions to event_add_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'nhrpd/nhrp_event.c')
| -rw-r--r-- | nhrpd/nhrp_event.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index ad98da9baa..3bcd42691b 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -40,8 +40,8 @@ static void evmgr_connection_error(struct event_manager *evmgr) close(evmgr->fd); evmgr->fd = -1; if (nhrp_event_socket_path) - thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer_msec(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); } static void evmgr_recv_message(struct event_manager *evmgr, struct zbuf *zb) @@ -89,7 +89,7 @@ static void evmgr_read(struct event *t) while (zbuf_may_pull_until(ibuf, "\n\n", &msg)) evmgr_recv_message(evmgr, &msg); - thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); + event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); } static void evmgr_write(struct event *t) @@ -99,8 +99,8 @@ static void evmgr_write(struct event *t) r = zbufq_write(&evmgr->obuf, evmgr->fd); if (r > 0) { - thread_add_write(master, evmgr_write, evmgr, evmgr->fd, - &evmgr->t_write); + event_add_write(master, evmgr_write, evmgr, evmgr->fd, + &evmgr->t_write); } else if (r < 0) { evmgr_connection_error(evmgr); } @@ -175,8 +175,8 @@ static void evmgr_submit(struct event_manager *evmgr, struct zbuf *obuf) zbuf_put(obuf, "\n", 1); zbufq_queue(&evmgr->obuf, obuf); if (evmgr->fd >= 0) - thread_add_write(master, evmgr_write, evmgr, evmgr->fd, - &evmgr->t_write); + event_add_write(master, evmgr_write, evmgr, evmgr->fd, + &evmgr->t_write); } static void evmgr_reconnect(struct event *t) @@ -192,14 +192,14 @@ static void evmgr_reconnect(struct event *t) zlog_warn("%s: failure connecting nhrp-event socket: %s", __func__, strerror(errno)); zbufq_reset(&evmgr->obuf); - thread_add_timer(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); return; } zlog_info("Connected to Event Manager"); evmgr->fd = fd; - thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); + event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); } static struct event_manager evmgr_connection; @@ -211,8 +211,8 @@ void evmgr_init(void) evmgr->fd = -1; zbuf_init(&evmgr->ibuf, evmgr->ibuf_data, sizeof(evmgr->ibuf_data), 0); zbufq_init(&evmgr->obuf); - thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer_msec(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); } void evmgr_set_socket(const char *socket) |