diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-25 10:26:52 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 08:32:17 -0400 |
| commit | e16d030c65ca97b1ba68b93ada93b1d4edde59d3 (patch) | |
| tree | e3a57a2e2887a899cad71c0640047b2b2409b5fa /bfdd/dplane.c | |
| parent | 70d4d90c82f3fb4eb552438422afb79e29a4dca0 (diff) | |
*: Convert THREAD_XXX macros to EVENT_XXX macros
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bfdd/dplane.c')
| -rw-r--r-- | bfdd/dplane.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 7bdebfa1f4..92e9466a1f 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -307,14 +307,14 @@ static ssize_t bfd_dplane_flush(struct bfd_dplane_ctx *bdc) stream_pulldown(bdc->outbuf); /* Disable write ready events. */ - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->outbufev); return total; } static void bfd_dplane_write(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); /* Handle connection stage. */ if (bdc->connecting && bfd_dplane_client_connecting(bdc)) @@ -601,7 +601,7 @@ skip_read: static void bfd_dplane_read(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); int rv; rv = bfd_dplane_expect(bdc, 0, bfd_dplane_handle_message, NULL); @@ -672,7 +672,7 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc) /* Client mode has special treatment. */ if (bdc->client) { /* Disable connection event if any. */ - THREAD_OFF(bdc->connectev); + EVENT_OFF(bdc->connectev); /* Normal treatment on shutdown. */ if (bglobal.bg_shutdown) @@ -680,8 +680,8 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc) /* Attempt reconnection. */ socket_close(&bdc->sock); - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); event_add_timer(master, bfd_dplane_client_connect, bdc, 3, &bdc->connectev); return; @@ -699,8 +699,8 @@ free_resources: socket_close(&bdc->sock); stream_free(bdc->inbuf); stream_free(bdc->outbuf); - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); XFREE(MTYPE_BFDD_DPLANE_CTX, bdc); } @@ -821,7 +821,7 @@ static uint16_t bfd_dplane_request_counters(const struct bfd_session *bs) */ static void bfd_dplane_accept(struct event *t) { - struct bfd_global *bg = THREAD_ARG(t); + struct bfd_global *bg = EVENT_ARG(t); struct bfd_dplane_ctx *bdc; int sock; @@ -901,7 +901,7 @@ static bool bfd_dplane_client_connecting(struct bfd_dplane_ctx *bdc) static void bfd_dplane_client_connect(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); int rv, sock; socklen_t rvlen = sizeof(rv); @@ -949,8 +949,8 @@ static void bfd_dplane_client_connect(struct event *t) } reschedule_connect: - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); socket_close(&sock); event_add_timer(master, bfd_dplane_client_connect, bdc, 3, &bdc->connectev); @@ -997,7 +997,7 @@ static int bfd_dplane_finish_late(void) bfd_dplane_ctx_free(bdc); /* Cancel accept thread and close socket. */ - THREAD_OFF(bglobal.bg_dplane_sockev); + EVENT_OFF(bglobal.bg_dplane_sockev); close(bglobal.bg_dplane_sock); return 0; |