diff options
| author | Ned Deily <nad@python.org> | 2016-02-15 16:54:08 +1100 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-02-15 16:54:08 +1100 |
| commit | d55d46b927f328ee1cba766ae2997302cf0f0e43 (patch) | |
| tree | 92369b6906bf3f84d5001555ceb95f2f63734b12 /Modules | |
| parent | 290e98b72fe41d6fdfe013eb01a25d40eda15c5d (diff) | |
| download | cpython-d55d46b927f328ee1cba766ae2997302cf0f0e43.tar.gz | |
Issue #25924: Avoid unnecessary serialization of getaddrinfo(3) calls on OS X
versions 10.5 or higher. Original patch by A. Jesse Jiryu Davis.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/socketmodule.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 90aa3afcc1..0b679dfaa3 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -84,6 +84,11 @@ Local naming conventions: */ #ifdef __APPLE__ +#include <AvailabilityMacros.h> +/* for getaddrinfo thread safety test on old versions of OS X */ +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif /* * inet_aton is not available on OSX 10.3, yet we want to use a binary * that was build on 10.4 or later to work on that release, weak linking @@ -184,8 +189,19 @@ if_indextoname(index) -- return the corresponding interface name\n\ #include <sys/param.h> #endif /* On systems on which getaddrinfo() is believed to not be thread-safe, - (this includes the getaddrinfo emulation) protect access with a lock. */ -#if defined(WITH_THREAD) && (defined(__APPLE__) || \ + (this includes the getaddrinfo emulation) protect access with a lock. + + getaddrinfo is thread-safe on Mac OS X 10.5 and later. Originally it was + a mix of code including an unsafe implementation from an old BSD's + libresolv. In 10.5 Apple reimplemented it as a safe IPC call to the + mDNSResponder process. 10.5 is the first be UNIX '03 certified, which + includes the requirement that getaddrinfo be thread-safe. + + See issue #25924 for details. + */ +#if defined(WITH_THREAD) && ( \ + (defined(__APPLE__) && \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || \ (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \ defined(__OpenBSD__) || defined(__NetBSD__) || \ !defined(HAVE_GETADDRINFO)) |