From c8ce57d668d73d92a071fa86f81e07ca403d8672 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 9 Dec 2024 13:33:11 -0800 Subject: aio: introduce nni_aio_defer This will replace nni_aio_schedule, and it includes finishing the task if needed. It does so without dropping the lock and so is more efficient and race free. This includes some conversion of some subsystems to it. --- src/supplemental/http/http_conn.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/supplemental') diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c index 33ed70bb..9ff2c997 100644 --- a/src/supplemental/http/http_conn.c +++ b/src/supplemental/http/http_conn.c @@ -363,8 +363,6 @@ http_rd_cancel(nni_aio *aio, void *arg, int rv) static void http_rd_submit(nni_http_conn *conn, nni_aio *aio, enum read_flavor flavor) { - int rv; - if (nni_aio_begin(aio) != 0) { return; } @@ -372,8 +370,7 @@ http_rd_submit(nni_http_conn *conn, nni_aio *aio, enum read_flavor flavor) nni_aio_finish_error(aio, NNG_ECLOSED); return; } - if ((rv = nni_aio_schedule(aio, http_rd_cancel, conn)) != 0) { - nni_aio_finish_error(aio, rv); + if (!nni_aio_defer(aio, http_rd_cancel, conn)) { return; } conn->rd_flavor = flavor; @@ -483,8 +480,6 @@ http_wr_cancel(nni_aio *aio, void *arg, int rv) static void http_wr_submit(nni_http_conn *conn, nni_aio *aio, enum write_flavor flavor) { - int rv; - if (nni_aio_begin(aio) != 0) { return; } @@ -492,8 +487,7 @@ http_wr_submit(nni_http_conn *conn, nni_aio *aio, enum write_flavor flavor) nni_aio_finish_error(aio, NNG_ECLOSED); return; } - if ((rv = nni_aio_schedule(aio, http_wr_cancel, conn)) != 0) { - nni_aio_finish_error(aio, rv); + if (!nni_aio_defer(aio, http_wr_cancel, conn)) { return; } conn->wr_flavor = flavor; -- cgit v1.2.3-70-g09d2