upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 04:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make the netmgr send callback to be asynchronous only when needed

Browse source 
Previously, the send callback would be synchronous only on success.  Add
an option (similar to what other callbacks have) to decide whether we
need the asynchronous send callback on a higher level.

On a general level, we need the asynchronous callbacks to happen only
when we are invoking the callback from the public API.  If the path to
the callback went through the libuv callback or netmgr callback, we are
already on asynchronous path, and there's no need to make the call to
the callback asynchronous again.

For the send callback, this means we need the asynchronous path for
failure paths inside the isc_nm_send() (which calls isc__nm_udp_send(),
isc__nm_tcp_send(), etc...) - all other invocations of the send callback
could be synchronous, because those are called from the respective libuv
send callbacks.
This commit is contained in:
Ondřej Surý 2022-11-24 17:11:22 +01:00
parent 5ca49942a3
commit f3004da3a5
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/isc/netmgr/netmgr-int.h
View file

@ -1946,7 +1946,7 @@ isc__nm_alloc_dnsbuf(isc_nmsocket_t *sock, size_t len);
void
isc__nm_failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
isc_result_t eresult);
isc_result_t eresult, bool async);
void
isc__nm_failed_accept_cb(isc_nmsocket_t *sock, isc_result_t eresult);
void

4
lib/isc/netmgr/netmgr.c
View file

@ -1324,12 +1324,12 @@ isc__nm_alloc_dnsbuf(isc_nmsocket_t *sock, size_t len) {
void
isc__nm_failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
isc_result_t eresult) {
isc_result_t eresult, bool async) {
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(VALID_UVREQ(req));
if (req->cb.send != NULL) {
isc__nm_sendcb(sock, req, eresult, true);
isc__nm_sendcb(sock, req, eresult, async);
} else {
isc__nm_uvreq_put(&req, sock);
}

5
lib/isc/netmgr/tcp.c
View file

@ -1029,7 +1029,7 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, const isc_region_t *region,
result = tcp_send_direct(sock, uvreq);
if (result != ISC_R_SUCCESS) {
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, result);
isc__nm_failed_send_cb(sock, uvreq, result, true);
}
return;
@ -1050,7 +1050,8 @@ tcp_send_cb(uv_write_t *req, int status) {
if (status < 0) {
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, isc_uverr2result(status));
isc__nm_failed_send_cb(sock, uvreq, isc_uverr2result(status),
false);
return;
}

5
lib/isc/netmgr/tcpdns.c
View file

@ -1147,7 +1147,8 @@ tcpdns_send_cb(uv_write_t *req, int status) {
if (status < 0) {
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, isc_uverr2result(status));
isc__nm_failed_send_cb(sock, uvreq, isc_uverr2result(status),
false);
return;
}
@ -1233,7 +1234,7 @@ isc__nm_async_tcpdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
return;
fail:
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, result);
isc__nm_failed_send_cb(sock, uvreq, result, true);
}
static void

2
lib/isc/netmgr/tlsdns.c
View file

@ -1794,7 +1794,7 @@ isc__nm_async_tlsdnssend(isc__networker_t *worker, isc__netievent_t *ev0) {
result = tlsdns_send_direct(sock, uvreq);
if (result != ISC_R_SUCCESS) {
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, result);
isc__nm_failed_send_cb(sock, uvreq, result, false);
}
}

6
lib/isc/netmgr/udp.c
View file

@ -663,8 +663,10 @@ udp_send_cb(uv_udp_send_t *req, int status) {
REQUIRE(sock->tid == isc_tid());
if (status < 0) {
result = isc_uverr2result(status);
isc__nm_incstats(sock, STATID_SENDFAIL);
isc__nm_failed_send_cb(sock, uvreq, isc_uverr2result(status),
false);
return;
}
isc__nm_sendcb(sock, uvreq, result, false);
@ -744,7 +746,7 @@ isc__nm_udp_send(isc_nmhandle_t *handle, const isc_region_t *region,
}
return;
fail:
isc__nm_failed_send_cb(sock, uvreq, result);
isc__nm_failed_send_cb(sock, uvreq, result, true);
}
static isc_result_t