The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(update): Windows checkout-lock probe no longer leaks a ctypes type per call
kshitijk4poord21408ec665a
diff --git a/hermes_cli/update_lock.py b/hermes_cli/update_lock.pyindex a0bfe9c9de5..b62c938178c 100644--- a/hermes_cli/update_lock.py+++ b/hermes_cli/update_lock.py@@ -33,6 +33,7 @@ import threadingimport timefrom contextlib import contextmanager, suppressfrom dataclasses import dataclass+from functools import cachefrom pathlib import Pathfrom stat import S_ISREG@@ -167,6 +168,33 @@ def _windows_kernel32():return kernel32+_LOCKFILE_FAIL_IMMEDIATELY = 0x1+++@cache+def _windows_lockfile_api():+ """kernel32 with LockFileEx/UnlockFileEx typed, plus the OVERLAPPED struct, built once.++ Built per call, each fresh struct's ``ctypes.POINTER`` stays in ctypes' pointer-type cache+ forever before Python 3.14, so a gateway polling the checkout lock would leak per probe.+ """+ import ctypes+ from ctypes import wintypes++ class _Overlapped(ctypes.Structure):+ _fields_ = [("Internal", ctypes.c_void_p), ("InternalHigh", ctypes.c_void_p),+ ("Offset", wintypes.DWORD), ("OffsetHigh", wintypes.DWORD), ("hEvent", wintypes.HANDLE)]++ kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)+ kernel32.LockFileEx.argtypes = [wintypes.HANDLE, wintypes.DWORD, wintypes.DWORD, wintypes.DWORD,+ wintypes.DWORD, ctypes.POINTER(_Overlapped)]+ kernel32.LockFileEx.restype = wintypes.BOOL+ kernel32.UnlockFileEx.argtypes = [wintypes.HANDLE, wintypes.DWORD, wintypes.DWORD, wintypes.DWORD,+ ctypes.POINTER(_Overlapped)]+ kernel32.UnlockFileEx.restype = wintypes.BOOL+ return kernel32, _Overlapped++def _windows_create_filetime(pid: int) -> int | None:"""GetProcessTimes creation FILETIME (100 ns ticks since 1601) or ``None``."""import ctypes@@ -1008,27 +1036,20 @@ def _try_lock(fd: int, *, shared: bool = False) -> bool:def _try_shared_lock(fd: int) -> bool:if sys.platform == "win32":# msvcrt has no shared mode: LockFileEx without LOCKFILE_EXCLUSIVE_LOCK over the owner byte- # and the 16 lease bytes. Any failure answers held, as the exclusive probe did.+ # and the 16 lease bytes. Any LockFileEx failure answers held, as the exclusive probe did;+ # an OSError (get_osfhandle on a bad fd) reaches checkout_lock_held, which answers free.import ctypesimport msvcrtfrom ctypes import wintypes- class _Overlapped(ctypes.Structure):- _fields_ = [("Internal", ctypes.c_void_p), ("InternalHigh", ctypes.c_void_p),- ("Offset", wintypes.DWORD), ("OffsetHigh", wintypes.DWORD), ("hEvent", wintypes.HANDLE)]-- kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)- kernel32.LockFileEx.argtypes = [wintypes.HANDLE, wintypes.DWORD, wintypes.DWORD, wintypes.DWORD,- wintypes.DWORD, ctypes.POINTER(_Overlapped)]- kernel32.LockFileEx.restype = wintypes.BOOL- kernel32.UnlockFileEx.argtypes = [wintypes.HANDLE, wintypes.DWORD, wintypes.DWORD, wintypes.DWORD,- ctypes.POINTER(_Overlapped)]- kernel32.UnlockFileEx.restype = wintypes.BOOL+ kernel32, overlapped = _windows_lockfile_api()handle = wintypes.HANDLE(msvcrt.get_osfhandle(fd))span = 1 + _LEASE_SLOTS- if not kernel32.LockFileEx(handle, 0x1, 0, span, 0, ctypes.byref(_Overlapped(Offset=_WINDOWS_LOCK_OFFSET))):- return False # 0x1 = LOCKFILE_FAIL_IMMEDIATELY- kernel32.UnlockFileEx(handle, 0, span, 0, ctypes.byref(_Overlapped(Offset=_WINDOWS_LOCK_OFFSET)))+ if not kernel32.LockFileEx(handle, _LOCKFILE_FAIL_IMMEDIATELY, 0, span, 0,+ ctypes.byref(overlapped(Offset=_WINDOWS_LOCK_OFFSET))):+ return False+ # The result is ignored: the caller closes fd next, which normally releases the lock too.+ kernel32.UnlockFileEx(handle, 0, span, 0, ctypes.byref(overlapped(Offset=_WINDOWS_LOCK_OFFSET)))return Trueimport fcntldiff --git a/tests/hermes_cli/test_update_lock_probe_readers.py b/tests/hermes_cli/test_update_lock_probe_readers.pyindex 9060bb78d0a..8a944f1f4a2 100644--- a/tests/hermes_cli/test_update_lock_probe_readers.py+++ b/tests/hermes_cli/test_update_lock_probe_readers.py@@ -112,3 +112,19 @@ def test_concurrent_lock_probes_never_fence_a_launch_posix(install) -> None:@pytest.mark.platforms("windows")def test_concurrent_lock_probes_never_fence_a_launch_windows(install) -> None:_assert_readers_never_fence(*install)++[email protected]("windows")+def test_repeated_windows_probes_build_no_new_ctypes_pointer_types(install, monkeypatch) -> None:+ """A long-lived gateway probes every 30 s. Before Python 3.14 ctypes caches every pointer type+ forever, so once the first probe has built its types, later probes must not build any."""+ import ctypes++ root, _home = install+ assert update_lock.checkout_lock_held(root) is False # the first probe may build its types once+ real_pointer = ctypes.POINTER+ built = []+ monkeypatch.setattr(ctypes, "POINTER", lambda cls: built.append(cls) or real_pointer(cls))+ for _ in range(50):+ assert update_lock.checkout_lock_held(root) is False+ assert built == []