gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix,win: support NULL loop for sync uv_getaddrinfo

Browse Source 
Brings symmetry with the uv_fs_xxx APIs.
This commit is contained in:
Saúl Ibarra Corretgé 2026-02-17 13:57:40 +01:00
parent 7e381d0da2
commit edfc95dbd7
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/unix/getaddrinfo.c
View File

@ -107,7 +107,9 @@ static void uv__getaddrinfo_done(struct uv__work* w, int status) {
uv_getaddrinfo_t* req; uv_getaddrinfo_t* req;
req = container_of(w, uv_getaddrinfo_t, work_req); req = container_of(w, uv_getaddrinfo_t, work_req);
uv__req_unregister(req->loop);
if (req->loop != NULL)
uv__req_unregister(req->loop);
/* See initialization in uv_getaddrinfo(). */ /* See initialization in uv_getaddrinfo(). */
if (req->hints) if (req->hints)
@ -149,6 +151,8 @@ int uv_getaddrinfo(uv_loop_t* loop,
if (req == NULL || (hostname == NULL && service == NULL)) if (req == NULL || (hostname == NULL && service == NULL))
return UV_EINVAL; return UV_EINVAL;
if (loop == NULL && cb != NULL)
return UV_EINVAL;
/* FIXME(bnoordhuis) IDNA does not seem to work z/OS, /* FIXME(bnoordhuis) IDNA does not seem to work z/OS,
* probably because it uses EBCDIC rather than ASCII. * probably because it uses EBCDIC rather than ASCII.
@ -175,7 +179,10 @@ int uv_getaddrinfo(uv_loop_t* loop,
if (buf == NULL) if (buf == NULL)
return UV_ENOMEM; return UV_ENOMEM;
uv__req_init(loop, req, UV_GETADDRINFO); UV_REQ_INIT(req, UV_GETADDRINFO);
if (loop != NULL)
uv__req_register(loop);
req->loop = loop; req->loop = loop;
req->cb = cb; req->cb = cb;
req->addrinfo = NULL; req->addrinfo = NULL;

19
src/win/getaddrinfo.c
View File

@ -208,7 +208,8 @@ static void uv__getaddrinfo_done(struct uv__work* w, int status) {
} }
complete: complete:
uv__req_unregister(req->loop); if (req->loop != NULL)
uv__req_unregister(req->loop);
/* finally do callback with converted result */ /* finally do callback with converted result */
if (req->getaddrinfo_cb) if (req->getaddrinfo_cb)
@ -239,7 +240,7 @@ void uv_freeaddrinfo(struct addrinfo* ai) {
*/ */
int uv_getaddrinfo(uv_loop_t* loop, int uv_getaddrinfo(uv_loop_t* loop,
uv_getaddrinfo_t* req, uv_getaddrinfo_t* req,
uv_getaddrinfo_cb getaddrinfo_cb, uv_getaddrinfo_cb cb,
const char* node, const char* node,
const char* service, const char* service,
const struct addrinfo* hints) { const struct addrinfo* hints) {
@ -252,12 +253,15 @@ int uv_getaddrinfo(uv_loop_t* loop,
size_t hintoff = 0; size_t hintoff = 0;
ssize_t rc; ssize_t rc;
if (req == NULL || (node == NULL && service == NULL)) { if (req == NULL || (node == NULL && service == NULL))
return UV_EINVAL; return UV_EINVAL;
} if (loop == NULL && cb != NULL)
return UV_EINVAL;
uv__once_init();
UV_REQ_INIT(req, UV_GETADDRINFO); UV_REQ_INIT(req, UV_GETADDRINFO);
req->getaddrinfo_cb = getaddrinfo_cb; req->getaddrinfo_cb = cb;
req->addrinfo = NULL; req->addrinfo = NULL;
req->loop = loop; req->loop = loop;
req->retcode = 0; req->retcode = 0;
@ -330,9 +334,10 @@ int uv_getaddrinfo(uv_loop_t* loop,
req->addrinfow = NULL; req->addrinfow = NULL;
} }
uv__req_register(loop); if (loop != NULL)
uv__req_register(loop);
if (getaddrinfo_cb) { if (cb) {
uv__work_submit(loop, uv__work_submit(loop,
&req->work_req, &req->work_req,
UV__WORK_SLOW_IO, UV__WORK_SLOW_IO,

6
test/test-getaddrinfo.c
View File

@ -119,7 +119,7 @@ TEST_IMPL(getaddrinfo_fail_sync) {
uv_getaddrinfo_t req; uv_getaddrinfo_t req;
/* Use a FQDN by ending in a period */ /* Use a FQDN by ending in a period */
ASSERT_GT(0, uv_getaddrinfo(uv_default_loop(), ASSERT_GT(0, uv_getaddrinfo(NULL,
&req, &req,
NULL, NULL,
"example.invalid.", "example.invalid.",
@ -165,15 +165,13 @@ TEST_IMPL(getaddrinfo_basic_sync) {
#endif #endif
uv_getaddrinfo_t req; uv_getaddrinfo_t req;
ASSERT_OK(uv_getaddrinfo(uv_default_loop(), ASSERT_OK(uv_getaddrinfo(NULL,
&req, &req,
NULL, NULL,
name, name,
NULL, NULL,
NULL)); NULL));
uv_freeaddrinfo(req.addrinfo); uv_freeaddrinfo(req.addrinfo);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0; return 0;
} }