1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor GETADDRINFO_IMPL instead of GETADDRINFO_EMU

Browse Source 
This is a preparation for introducing cancellable
getaddrinfo/getnameinfo.
This commit is contained in:
Yusuke Endoh 2023-10-18 16:19:51 +09:00
parent 9ce607a8d4
commit 25ef8d262a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/socket/raddrinfo.c
View File

@ -10,6 +10,17 @@
#include "rubysocket.h" #include "rubysocket.h"
// GETADDRINFO_IMPL == 0 : call getaddrinfo/getnameinfo directly
// GETADDRINFO_IMPL == 1 : call getaddrinfo/getnameinfo without gvl (but uncancellable)
#ifndef GETADDRINFO_IMPL
# ifdef GETADDRINFO_EMU
# define GETADDRINFO_IMPL 0
# else
# define GETADDRINFO_IMPL 1
# endif
#endif
#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6)) #if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
#define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0])) #define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0]))
static const int lookup_order_table[] = { static const int lookup_order_table[] = {
@ -173,7 +184,7 @@ parse_numeric_port(const char *service, int *portp)
} }
#endif #endif
#ifndef GETADDRINFO_EMU #if GETADDRINFO_IMPL != 0
struct getaddrinfo_arg struct getaddrinfo_arg
{ {
const char *node; const char *node;
@ -305,7 +316,7 @@ rb_freeaddrinfo(struct rb_addrinfo *ai)
static int static int
rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hints, struct addrinfo **ai) rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hints, struct addrinfo **ai)
{ {
#ifdef GETADDRINFO_EMU #if GETADDRINFO_IMPL == 0
return getaddrinfo(hostp, portp, hints, ai); return getaddrinfo(hostp, portp, hints, ai);
#else #else
struct getaddrinfo_arg arg; struct getaddrinfo_arg arg;
@ -318,7 +329,7 @@ rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hint
#endif #endif
} }
#ifndef GETADDRINFO_EMU #if GETADDRINFO_IMPL != 0
struct getnameinfo_arg struct getnameinfo_arg
{ {
const struct sockaddr *sa; const struct sockaddr *sa;
@ -346,7 +357,7 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
char *host, size_t hostlen, char *host, size_t hostlen,
char *serv, size_t servlen, int flags) char *serv, size_t servlen, int flags)
{ {
#ifdef GETADDRINFO_EMU #if GETADDRINFO_IMPL == 0
return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
#else #else
struct getnameinfo_arg arg; struct getnameinfo_arg arg;