Skip to content

Commit

Permalink
Replace deprecated asyncio.get_child_watcher()
Browse files Browse the repository at this point in the history
Use PidfdChildWatcher if os.pidfd_open is available and
otherwise use ThreadedChildWatcher which should work in any case.

Fixes #583
  • Loading branch information
cryptomilk committed Jan 10, 2025
1 parent eb14e83 commit 932611b
Showing 1 changed file with 37 additions and 4 deletions.
41 changes: 37 additions & 4 deletions pynvim/msgpack_rpc/event_loop/asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,42 @@ async def connect_stdout():

@override
def _connect_child(self, argv: List[str]) -> None:
def can_use_pidfd():
# Unix system without pidfd_open?
if not hasattr(os, 'pidfd_open'):
return False

# Check that we are not blocked by security policy like SECCOMP
try:
pid = os.getpid()
fd = os.pidfd_open(pid, 0)
os.close(fd)
except OSError:
return False

return True

def get_child_watcher():
if can_use_pidfd():
try:
from asyncio.unix_events import PidfdChildWatcher
return PidfdChildWatcher()
except ImportError:
pass

try:
from asyncio.unix_events import ThreadedChildWatcher
return ThreadedChildWatcher()
except ImportError:
pass

# FIXME Python 3.7, return None if we drop support
return asyncio.get_child_watcher()

if os.name != 'nt':
# see #238, #241
self._child_watcher = asyncio.get_child_watcher()
self._child_watcher.attach_loop(self._loop)
watcher = get_child_watcher()
watcher.attach_loop(self._loop)
self._child_watcher = watcher

async def create_subprocess():
transport: asyncio.SubprocessTransport # type: ignore
Expand Down Expand Up @@ -250,7 +282,8 @@ def _close_transport(transport):
# Windows: for ProactorBasePipeTransport, close() doesn't take in
# effect immediately (closing happens asynchronously inside the
# event loop), need to wait a bit for completing graceful shutdown.
if os.name == 'nt' and hasattr(transport, '_sock'):
if (sys.version_info.major == 3 and sys.version_info.minor < 13 and
os.name == 'nt' and hasattr(transport, '_sock')):
async def wait_until_closed():
# pylint: disable-next=protected-access
while transport._sock is not None:
Expand Down

0 comments on commit 932611b

Please sign in to comment.