mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Refactor the isc__nm_uvreq_t to have idle callback

Browse Source 
Change the isc__nm_uvreq_t to have the idle callback as a separate
member as we always need to use it to properly close the uvreq.

Slightly refactor uvreq_put and uvreq_get to remove the unneeded
arguments - in uvreq_get(), we always use sock->worker, and in
uvreq_put, we always use req->sock, so there's not reason to pass those
extra arguments.
This commit is contained in:
Ondřej Surý
2023-03-24 12:11:44 +01:00
parent 476198f26c
commit 639d5065a3
7 changed files with 81 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/isc/netmgr/http.c
View File

@@ -1156,8 +1156,7 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle,
INSIST(VALID_NMHANDLE(httphandle)); INSIST(VALID_NMHANDLE(httphandle));
newcb = isc__nm_uvreq_get(httphandle->sock->worker, newcb = isc__nm_uvreq_get(httphandle->sock);
httphandle->sock);
newcb->cb.send = cb; newcb->cb.send = cb;
newcb->cbarg = cbarg; newcb->cbarg = cbarg;
isc_nmhandle_attach(httphandle, &newcb->handle); isc_nmhandle_attach(httphandle, &newcb->handle);
@@ -1483,7 +1482,7 @@ isc_nm_httpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
atomic_init(&sock->client, true); atomic_init(&sock->client, true);
if (isc__nm_closing(worker)) { if (isc__nm_closing(worker)) {
isc__nm_uvreq_t *req = isc__nm_uvreq_get(worker, sock); isc__nm_uvreq_t *req = isc__nm_uvreq_get(sock);
req->cb.connect = cb; req->cb.connect = cb;
req->cbarg = cbarg; req->cbarg = cbarg;
@@ -2178,7 +2177,7 @@ isc__nm_http_send(isc_nmhandle_t *handle, const isc_region_t *region,
REQUIRE(VALID_NMSOCK(sock)); REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->tid == isc_tid()); REQUIRE(sock->tid == isc_tid());
uvreq = isc__nm_uvreq_get(sock->worker, sock); uvreq = isc__nm_uvreq_get(sock);
isc_nmhandle_attach(handle, &uvreq->handle); isc_nmhandle_attach(handle, &uvreq->handle);
uvreq->cb.send = cb; uvreq->cb.send = cb;
uvreq->cbarg = cbarg; uvreq->cbarg = cbarg;
@@ -2198,7 +2197,7 @@ failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
if (req->cb.send != NULL) { if (req->cb.send != NULL) {
isc__nm_sendcb(sock, req, eresult, true); isc__nm_sendcb(sock, req, eresult, true);
} else { } else {
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
} }
} }
@@ -2218,7 +2217,7 @@ client_httpsend(isc_nmhandle_t *handle, isc_nmsocket_t *sock,
} }
http_do_bio(sock->h2.session, handle, cb, cbarg); http_do_bio(sock->h2.session, handle, cb, cbarg);
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
} }
static void static void
@@ -2273,7 +2272,7 @@ server_httpsend(isc_nmhandle_t *handle, isc_nmsocket_t *sock,
} else { } else {
cb(handle, result, cbarg); cb(handle, result, cbarg);
} }
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
} }
static void static void

30
lib/isc/netmgr/netmgr-int.h
View File

@@ -142,10 +142,10 @@ STATIC_ASSERT(ISC_NETMGR_TCP_RECVBUF_SIZE <= ISC_NETMGR_RECVBUF_SIZE,
ievent->file = file; \ ievent->file = file; \
ievent->line = line; \ ievent->line = line; \
ievent->func = func; ievent->func = func;
#define isc__nm_uvreq_get(req, sock) \ #define isc__nm_uvreq_get(sock) \
isc___nm_uvreq_get(req, sock, __FILE__, __LINE__, __func__) isc___nm_uvreq_get(sock, __FILE__, __LINE__, __func__)
#define isc__nm_uvreq_put(req, sock) \ #define isc__nm_uvreq_put(req) \
isc___nm_uvreq_put(req, sock, __FILE__, __LINE__, __func__) isc___nm_uvreq_put(req, __FILE__, __LINE__, __func__)
#define isc__nmsocket_init(sock, mgr, type, iface, parent) \ #define isc__nmsocket_init(sock, mgr, type, iface, parent) \
isc___nmsocket_init(sock, mgr, type, iface, parent, __FILE__, \ isc___nmsocket_init(sock, mgr, type, iface, parent, __FILE__, \
__LINE__, __func__) __LINE__, __func__)
@@ -168,8 +168,8 @@ STATIC_ASSERT(ISC_NETMGR_TCP_RECVBUF_SIZE <= ISC_NETMGR_RECVBUF_SIZE,
#define FLARG_PASS #define FLARG_PASS
#define FLARG_IEVENT(ievent) #define FLARG_IEVENT(ievent)
#define FLARG_IEVENT_PASS(ievent) #define FLARG_IEVENT_PASS(ievent)
#define isc__nm_uvreq_get(req, sock) isc___nm_uvreq_get(req, sock) #define isc__nm_uvreq_get(sock) isc___nm_uvreq_get(sock)
#define isc__nm_uvreq_put(req, sock) isc___nm_uvreq_put(req, sock) #define isc__nm_uvreq_put(req) isc___nm_uvreq_put(req)
#define isc__nmsocket_init(sock, mgr, type, iface, parent) \ #define isc__nmsocket_init(sock, mgr, type, iface, parent) \
isc___nmsocket_init(sock, mgr, type, iface, parent) isc___nmsocket_init(sock, mgr, type, iface, parent)
#define isc__nmsocket_put(sockp) isc___nmsocket_put(sockp) #define isc__nmsocket_put(sockp) isc___nmsocket_put(sockp)
@@ -278,6 +278,7 @@ struct isc__nm_uvreq {
isc_nm_timer_t *timer; /* TCP write timer */ isc_nm_timer_t *timer; /* TCP write timer */
int connect_tries; /* connect retries */ int connect_tries; /* connect retries */
isc_result_t result; isc_result_t result;
uv_idle_t idle;
union { union {
uv_handle_t handle; uv_handle_t handle;
@@ -289,10 +290,9 @@ struct isc__nm_uvreq {
uv_connect_t connect; uv_connect_t connect;
uv_udp_send_t udp_send; uv_udp_send_t udp_send;
uv_fs_t fs; uv_fs_t fs;
uv_idle_t idle;
} uv_req; } uv_req;
ISC_LINK(isc__nm_uvreq_t) link; ISC_LINK(isc__nm_uvreq_t) link;
ISC_LINK(isc__nm_uvreq_t) inactive_link; ISC_LINK(isc__nm_uvreq_t) active_link;
}; };
/* /*
@@ -628,11 +628,16 @@ struct isc_nmsocket {
atomic_bool keepalive; atomic_bool keepalive;
/*% /*%
* 'spare' handles for that can be reused to avoid allocations, * 'spare' handles for that can be reused to avoid allocations, for UDP.
* for UDP.
*/ */
ISC_LIST(isc_nmhandle_t) inactive_handles; ISC_LIST(isc_nmhandle_t) inactive_handles;
/*%
* 'active' handles and uvreqs, mostly for debugging purposes.
*/
ISC_LIST(isc_nmhandle_t) active_handles;
ISC_LIST(isc__nm_uvreq_t) active_uvreqs;
/*% /*%
* Used to pass a result back from listen or connect events. * Used to pass a result back from listen or connect events.
*/ */
@@ -665,7 +670,6 @@ struct isc_nmsocket {
int backtrace_size; int backtrace_size;
#endif #endif
LINK(isc_nmsocket_t) active_link; LINK(isc_nmsocket_t) active_link;
ISC_LIST(isc_nmhandle_t) active_handles;
}; };
void void
@@ -696,14 +700,14 @@ isc___nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t const *peer,
*/ */
isc__nm_uvreq_t * isc__nm_uvreq_t *
isc___nm_uvreq_get(isc__networker_t *worker, isc_nmsocket_t *sock FLARG); isc___nm_uvreq_get(isc_nmsocket_t *sock FLARG);
/*%< /*%<
* Get a UV request structure for the socket 'sock', allocating a * Get a UV request structure for the socket 'sock', allocating a
* new one if there isn't one available in 'sock->inactivereqs'. * new one if there isn't one available in 'sock->inactivereqs'.
*/ */
void void
isc___nm_uvreq_put(isc__nm_uvreq_t **req, isc_nmsocket_t *sock FLARG); isc___nm_uvreq_put(isc__nm_uvreq_t **req FLARG);
/*%< /*%<
* Completes the use of a UV request structure, setting '*req' to NULL. * Completes the use of a UV request structure, setting '*req' to NULL.
* *

110
lib/isc/netmgr/netmgr.c
View File

@@ -48,13 +48,6 @@
#include "openssl_shim.h" #include "openssl_shim.h"
#include "trampoline_p.h" #include "trampoline_p.h"
/*%
* How many isc_nmhandles and isc_nm_uvreqs will we be
* caching for reuse in a socket.
*/
#define ISC_NM_HANDLES_STACK_SIZE 600
#define ISC_NM_REQS_STACK_SIZE 600
/*% /*%
* Shortcut index arrays to get access to statistics counters. * Shortcut index arrays to get access to statistics counters.
*/ */
@@ -127,6 +120,9 @@ nmsocket_maybe_destroy(isc_nmsocket_t *sock FLARG);
static void static void
nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle); nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle);
static void
uvreq_free(uv_handle_t *handle);
/*%< /*%<
* Issue a 'handle closed' callback on the socket. * Issue a 'handle closed' callback on the socket.
*/ */
@@ -249,8 +245,6 @@ isc_netmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_nm_t **netmgrp) {
isc_mempool_create(worker->mctx, sizeof(isc__nm_uvreq_t), isc_mempool_create(worker->mctx, sizeof(isc__nm_uvreq_t),
&worker->uvreq_pool); &worker->uvreq_pool);
isc_mempool_setfreemax(worker->uvreq_pool,
ISC_NM_REQS_STACK_SIZE);
isc_loop_attach(loop, &worker->loop); isc_loop_attach(loop, &worker->loop);
isc_loop_teardown(loop, networker_teardown, worker); isc_loop_teardown(loop, networker_teardown, worker);
@@ -872,7 +866,7 @@ dequeue_handle(isc_nmsocket_t *sock) {
return (handle); return (handle);
} }
#else #else
UNUSED(sock); INSIST(ISC_LIST_EMPTY(sock->inactive_handles));
#endif /* !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ */ #endif /* !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ */
return (NULL); return (NULL);
} }
@@ -1081,7 +1075,7 @@ isc__nm_failed_send_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
if (req->cb.send != NULL) { if (req->cb.send != NULL) {
isc__nm_sendcb(sock, req, eresult, async); isc__nm_sendcb(sock, req, eresult, async);
} else { } else {
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
} }
} }
@@ -1348,7 +1342,7 @@ isc__nm_uvreq_t *
isc__nm_get_read_req(isc_nmsocket_t *sock, isc_sockaddr_t *sockaddr) { isc__nm_get_read_req(isc_nmsocket_t *sock, isc_sockaddr_t *sockaddr) {
isc__nm_uvreq_t *req = NULL; isc__nm_uvreq_t *req = NULL;
req = isc__nm_uvreq_get(sock->worker, sock); req = isc__nm_uvreq_get(sock);
req->cb.recv = sock->recv_cb; req->cb.recv = sock->recv_cb;
req->cbarg = sock->recv_cbarg; req->cbarg = sock->recv_cbarg;
@@ -1595,57 +1589,62 @@ isc_nmhandle_netmgr(isc_nmhandle_t *handle) {
} }
isc__nm_uvreq_t * isc__nm_uvreq_t *
isc___nm_uvreq_get(isc__networker_t *worker, isc_nmsocket_t *sock FLARG) { isc___nm_uvreq_get(isc_nmsocket_t *sock FLARG) {
isc__nm_uvreq_t *req = NULL;
REQUIRE(worker != NULL);
REQUIRE(VALID_NMSOCK(sock)); REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->tid == isc_tid()); REQUIRE(sock->tid == isc_tid());
req = isc_mempool_get(worker->uvreq_pool); isc__networker_t *worker = sock->worker;
isc__nm_uvreq_t *req = isc_mempool_get(worker->uvreq_pool);
*req = (isc__nm_uvreq_t){ *req = (isc__nm_uvreq_t){
.connect_tries = 3, .connect_tries = 3,
.link = ISC_LINK_INITIALIZER, .link = ISC_LINK_INITIALIZER,
.inactive_link = ISC_LINK_INITIALIZER, .active_link = ISC_LINK_INITIALIZER,
.uv_req.req.data = req,
.magic = UVREQ_MAGIC, .magic = UVREQ_MAGIC,
}; };
uv_handle_set_data(&req->uv_req.handle, req);
int r = uv_idle_init(&worker->loop->loop, &req->idle);
UV_RUNTIME_CHECK(uv_idle_init, r);
uv_handle_set_data(&req->idle, req);
isc___nmsocket_attach(sock, &req->sock FLARG_PASS); isc___nmsocket_attach(sock, &req->sock FLARG_PASS);
ISC_LIST_APPEND(sock->active_uvreqs, req, active_link);
return (req); return (req);
} }
static void
uvreq_free(uv_handle_t *handle) {
isc__nm_uvreq_t *req = uv_handle_get_data(handle);
isc_nmsocket_t *sock = req->sock;
isc_mempool_put(sock->worker->uvreq_pool, req);
isc___nmsocket_detach(&sock FLARG_PASS);
}
void void
isc___nm_uvreq_put(isc__nm_uvreq_t **req0, isc_nmsocket_t *sock FLARG) { isc___nm_uvreq_put(isc__nm_uvreq_t **reqp FLARG) {
REQUIRE(req0 != NULL); REQUIRE(reqp != NULL && VALID_UVREQ(*reqp));
REQUIRE(VALID_UVREQ(*req0));
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->tid == isc_tid());
isc__nm_uvreq_t *req = NULL; isc__nm_uvreq_t *req = *reqp;
isc_nmhandle_t *handle = NULL; isc_nmhandle_t *handle = req->handle;
isc__networker_t *worker = sock->worker; isc_nmsocket_t *sock = req->sock;
req = *req0; *reqp = NULL;
*req0 = NULL; req->handle = NULL;
INSIST(sock == req->sock); REQUIRE(VALID_UVREQ(req));
req->magic = 0; ISC_LIST_UNLINK(sock->active_uvreqs, req, active_link);
/*
* We need to save this first to make sure that handle,
* sock, and the netmgr won't all disappear.
*/
ISC_SWAP(handle, req->handle);
isc_mempool_put(worker->uvreq_pool, req);
if (handle != NULL) { if (handle != NULL) {
isc__nmhandle_detach(&handle FLARG_PASS); isc__nmhandle_detach(&handle FLARG_PASS);
} }
isc___nmsocket_detach(&sock FLARG_PASS); uv_close(&req->idle, uvreq_free);
} }
void void
@@ -1838,13 +1837,6 @@ isc__nmsocket_barrier_init(isc_nmsocket_t *listener) {
listener->barriers_initialised = true; listener->barriers_initialised = true;
} }
static void
isc__nm_uvreq_free(uv_handle_t *handle) {
isc__nm_uvreq_t *uvreq = uv_handle_get_data(handle);
isc__nm_uvreq_put(&uvreq, uvreq->handle->sock);
}
static void static void
isc___nm_connectcb(uv_idle_t *handle) { isc___nm_connectcb(uv_idle_t *handle) {
isc__nm_uvreq_t *uvreq = uv_handle_get_data(handle); isc__nm_uvreq_t *uvreq = uv_handle_get_data(handle);
@@ -1852,7 +1844,7 @@ isc___nm_connectcb(uv_idle_t *handle) {
uvreq->cb.connect(uvreq->handle, uvreq->result, uvreq->cbarg); uvreq->cb.connect(uvreq->handle, uvreq->result, uvreq->cbarg);
uv_idle_stop(handle); uv_idle_stop(handle);
uv_close(handle, isc__nm_uvreq_free); isc__nm_uvreq_put(&uvreq);
} }
void void
@@ -1865,15 +1857,13 @@ isc__nm_connectcb(isc_nmsocket_t *sock, isc__nm_uvreq_t *uvreq,
if (!async) { if (!async) {
uvreq->cb.connect(uvreq->handle, eresult, uvreq->cbarg); uvreq->cb.connect(uvreq->handle, eresult, uvreq->cbarg);
isc__nm_uvreq_put(&uvreq, uvreq->handle->sock); isc__nm_uvreq_put(&uvreq);
return; return;
} }
uvreq->result = eresult; uvreq->result = eresult;
uv_idle_init(&sock->worker->loop->loop, &uvreq->uv_req.idle); uv_idle_start(&uvreq->idle, isc___nm_connectcb);
uv_idle_start(&uvreq->uv_req.idle, isc___nm_connectcb);
uv_handle_set_data(&uvreq->uv_req.idle, uvreq);
} }
static void static void
@@ -1887,7 +1877,7 @@ isc___nm_readcb(uv_idle_t *handle) {
uvreq->cb.recv(uvreq->handle, uvreq->result, &region, uvreq->cbarg); uvreq->cb.recv(uvreq->handle, uvreq->result, &region, uvreq->cbarg);
uv_idle_stop(handle); uv_idle_stop(handle);
uv_close(handle, isc__nm_uvreq_free); isc__nm_uvreq_put(&uvreq);
} }
void void
@@ -1904,15 +1894,13 @@ isc__nm_readcb(isc_nmsocket_t *sock, isc__nm_uvreq_t *uvreq,
region.length = uvreq->uvbuf.len; region.length = uvreq->uvbuf.len;
uvreq->cb.recv(uvreq->handle, eresult, &region, uvreq->cbarg); uvreq->cb.recv(uvreq->handle, eresult, &region, uvreq->cbarg);
isc__nm_uvreq_put(&uvreq, uvreq->handle->sock); isc__nm_uvreq_put(&uvreq);
return; return;
} }
uvreq->result = eresult; uvreq->result = eresult;
uv_idle_init(&sock->worker->loop->loop, &uvreq->uv_req.idle); uv_idle_start(&uvreq->idle, isc___nm_readcb);
uv_idle_start(&uvreq->uv_req.idle, isc___nm_readcb);
uv_handle_set_data(&uvreq->uv_req.idle, uvreq);
} }
static void static void
@@ -1922,7 +1910,7 @@ isc___nm_sendcb(uv_idle_t *handle) {
uvreq->cb.send(uvreq->handle, uvreq->result, uvreq->cbarg); uvreq->cb.send(uvreq->handle, uvreq->result, uvreq->cbarg);
uv_idle_stop(handle); uv_idle_stop(handle);
uv_close(handle, isc__nm_uvreq_free); isc__nm_uvreq_put(&uvreq);
} }
void void
@@ -1935,13 +1923,11 @@ isc__nm_sendcb(isc_nmsocket_t *sock, isc__nm_uvreq_t *uvreq,
if (!async) { if (!async) {
uvreq->cb.send(uvreq->handle, uvreq->result, uvreq->cbarg); uvreq->cb.send(uvreq->handle, uvreq->result, uvreq->cbarg);
isc__nm_uvreq_put(&uvreq, uvreq->handle->sock); isc__nm_uvreq_put(&uvreq);
return; return;
} }
uv_idle_init(&sock->worker->loop->loop, &uvreq->uv_req.idle); uv_idle_start(&uvreq->idle, isc___nm_sendcb);
uv_idle_start(&uvreq->uv_req.idle, isc___nm_sendcb);
uv_handle_set_data(&uvreq->uv_req.idle, uvreq);
} }
static void static void

4
lib/isc/netmgr/streamdns.c
View File

@@ -893,7 +893,7 @@ isc__nm_streamdns_send(isc_nmhandle_t *handle, const isc_region_t *region,
REQUIRE(sock->type == isc_nm_streamdnssocket); REQUIRE(sock->type == isc_nm_streamdnssocket);
REQUIRE(sock->tid == isc_tid()); REQUIRE(sock->tid == isc_tid());
uvreq = isc__nm_uvreq_get(sock->worker, sock); uvreq = isc__nm_uvreq_get(sock);
isc_nmhandle_attach(handle, &uvreq->handle); isc_nmhandle_attach(handle, &uvreq->handle);
uvreq->cb.send = cb; uvreq->cb.send = cb;
uvreq->cbarg = cbarg; uvreq->cbarg = cbarg;
@@ -917,7 +917,7 @@ isc__nm_streamdns_send(isc_nmhandle_t *handle, const isc_region_t *region,
isc__nm_senddns(sock->outerhandle, &data, streamdns_writecb, isc__nm_senddns(sock->outerhandle, &data, streamdns_writecb,
(void *)send_req); (void *)send_req);
isc__nm_uvreq_put(&uvreq, sock); isc__nm_uvreq_put(&uvreq);
} }
static void static void

6
lib/isc/netmgr/tcp.c
View File

@@ -197,7 +197,7 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) {
* The connect was cancelled from timeout; just clean up * The connect was cancelled from timeout; just clean up
* the req. * the req.
*/ */
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
return; return;
} else if (isc__nm_closing(worker)) { } else if (isc__nm_closing(worker)) {
/* Network manager shutting down */ /* Network manager shutting down */
@@ -291,7 +291,7 @@ isc_nm_tcpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
sock->fd = fd; sock->fd = fd;
atomic_init(&sock->client, true); atomic_init(&sock->client, true);
req = isc__nm_uvreq_get(worker, sock); req = isc__nm_uvreq_get(sock);
req->cb.connect = cb; req->cb.connect = cb;
req->cbarg = cbarg; req->cbarg = cbarg;
req->peer = *peer; req->peer = *peer;
@@ -1009,7 +1009,7 @@ tcp_send(isc_nmhandle_t *handle, const isc_region_t *region, isc_nm_cb_t cb,
REQUIRE(sock->type == isc_nm_tcpsocket); REQUIRE(sock->type == isc_nm_tcpsocket);
REQUIRE(sock->tid == isc_tid()); REQUIRE(sock->tid == isc_tid());
uvreq = isc__nm_uvreq_get(sock->worker, sock); uvreq = isc__nm_uvreq_get(sock);
if (dnsmsg) { if (dnsmsg) {
*(uint16_t *)uvreq->tcplen = htons(region->length); *(uint16_t *)uvreq->tcplen = htons(region->length);
} }

4
lib/isc/netmgr/tlsstream.c
View File

@@ -981,7 +981,7 @@ tls_send_direct(void *arg) {
tls_do_bio(sock, NULL, req, false); tls_do_bio(sock, NULL, req, false);
done: done:
isc__nm_uvreq_put(&req, sock); isc__nm_uvreq_put(&req);
return; return;
} }
@@ -998,7 +998,7 @@ tls_send(isc_nmhandle_t *handle, const isc_region_t *region, isc_nm_cb_t cb,
REQUIRE(sock->type == isc_nm_tlssocket); REQUIRE(sock->type == isc_nm_tlssocket);
uvreq = isc__nm_uvreq_get(sock->worker, sock); uvreq = isc__nm_uvreq_get(sock);
isc_nmhandle_attach(handle, &uvreq->handle); isc_nmhandle_attach(handle, &uvreq->handle);
uvreq->cb.send = cb; uvreq->cb.send = cb;
uvreq->cbarg = cbarg; uvreq->cbarg = cbarg;

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

@@ -388,7 +388,7 @@ isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg) {
sock->route_sock = true; sock->route_sock = true;
sock->fd = fd; sock->fd = fd;
req = isc__nm_uvreq_get(worker, sock); req = isc__nm_uvreq_get(sock);
req->cb.connect = cb; req->cb.connect = cb;
req->cbarg = cbarg; req->cbarg = cbarg;
req->handle = isc__nmhandle_get(sock, NULL, NULL); req->handle = isc__nmhandle_get(sock, NULL, NULL);
@@ -681,7 +681,7 @@ isc__nm_udp_send(isc_nmhandle_t *handle, const isc_region_t *region,
return; return;
} }
uvreq = isc__nm_uvreq_get(sock->worker, sock); uvreq = isc__nm_uvreq_get(sock);
uvreq->uvbuf.base = (char *)region->base; uvreq->uvbuf.base = (char *)region->base;
uvreq->uvbuf.len = region->length; uvreq->uvbuf.len = region->length;
@@ -827,7 +827,7 @@ isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
(void)isc__nm_socket_min_mtu(sock->fd, sa_family); (void)isc__nm_socket_min_mtu(sock->fd, sa_family);
/* Initialize the request */ /* Initialize the request */
req = isc__nm_uvreq_get(worker, sock); req = isc__nm_uvreq_get(sock);
req->cb.connect = cb; req->cb.connect = cb;
req->cbarg = cbarg; req->cbarg = cbarg;
req->peer = *peer; req->peer = *peer;