Skip to content

[pull] master from ruby:master #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 20, 2025
Merged

[pull] master from ruby:master #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d484e3
Fix indentation in clear_method_cache_by_id_in_class [ci skip]
peterzhu2118 Aug 20, 2025
5c96bbf
Avoid spawning thread for trivial getnameinfo calls
jhawthorn Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ext/socket/raddrinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,10 @@ rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hint

#endif

#define GETNAMEINFO_WONT_BLOCK(host, serv, flags) \
((!(host) || ((flags) & NI_NUMERICHOST)) && \
(!(serv) || ((flags) & NI_NUMERICSERV)))

#if GETADDRINFO_IMPL == 0

int
Expand Down Expand Up @@ -615,6 +619,10 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
char *host, size_t hostlen,
char *serv, size_t servlen, int flags)
{
if (GETNAMEINFO_WONT_BLOCK(host, serv, flags)) {
return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
}

struct getnameinfo_arg arg;
int ret;
arg.sa = sa;
Expand Down Expand Up @@ -743,6 +751,10 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
struct getnameinfo_arg *arg;
int err = 0, gni_errno = 0;

if (GETNAMEINFO_WONT_BLOCK(host, serv, flags)) {
return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
}

start:
retry = 0;

Expand Down
2 changes: 1 addition & 1 deletion vm_method.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid)
}

rb_gccct_clear_table(Qnil);
}
}
}

static void
Expand Down