Skip to content

gh-89977: Keep the GIL for short socket calls #157981

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

Open
methane wants to merge 3 commits into
base: main
Choose a base branch
from
Open

gh-89977: Keep the GIL for short socket calls #157981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e198115
gh-89977: Keep the GIL for short socket and epoll control calls
methane Sep 23, 2026
1d17164
gh-89977: Revert epoll GIL changes
methane Sep 29, 2026
f097d7a
gh-89977: Remove unrelated socket name test
methane Sep 29, 2026
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
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2026-09-23-09-21-25.gh-issue-89977.fmia18.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Avoid releasing the GIL for :meth:`socket.socket.setblocking`,
:meth:`socket.socket.getsockname`, :meth:`socket.socket.getpeername`, and
:func:`socket.gethostname`.
9 changes: 0 additions & 9 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,6 @@ internal_setblocking(PySocketSockObject *s, int block)
int delay_flag, new_delay_flag;
#endif

Py_BEGIN_ALLOW_THREADS
#ifndef MS_WINDOWS
#if (defined(HAVE_SYS_IOCTL_H) && defined(FIONBIO))
block = !block;
Expand All @@ -855,8 +854,6 @@ internal_setblocking(PySocketSockObject *s, int block)
result = 0;

done:
Py_END_ALLOW_THREADS

if (result) {
#ifndef MS_WINDOWS
PyErr_SetFromErrno(PyExc_OSError);
Expand Down Expand Up @@ -3915,9 +3912,7 @@ _socket_socket_getsockname_impl(PySocketSockObject *s)
if (!getsockaddrlen(s, &addrlen))
return NULL;
memset(&addrbuf, 0, addrlen);
Py_BEGIN_ALLOW_THREADS
res = getsockname(get_sock_fd(s), SAS2SA(&addrbuf), &addrlen);
Py_END_ALLOW_THREADS
if (res < 0)
return s->errorhandler();
return makesockaddr(get_sock_fd(s), SAS2SA(&addrbuf), addrlen,
Expand Down Expand Up @@ -3950,9 +3945,7 @@ _socket_socket_getpeername_impl(PySocketSockObject *s)
if (!getsockaddrlen(s, &addrlen))
return NULL;
memset(&addrbuf, 0, addrlen);
Py_BEGIN_ALLOW_THREADS
res = getpeername(get_sock_fd(s), SAS2SA(&addrbuf), &addrlen);
Py_END_ALLOW_THREADS
if (res < 0)
return s->errorhandler();
return makesockaddr(get_sock_fd(s), SAS2SA(&addrbuf), addrlen,
Expand Down Expand Up @@ -5968,9 +5961,7 @@ _socket_gethostname_impl(PyObject *module)
#else
char buf[1024];
int res;
Py_BEGIN_ALLOW_THREADS
res = gethostname(buf, (int) sizeof buf - 1);
Py_END_ALLOW_THREADS
if (res < 0)
return set_error();
buf[sizeof buf - 1] = '\0';
Expand Down
Loading