c9fa191334
Cherry-picked from #111814. The same feature-detected fix was proposed earlier in #58699, #65182 and #57459 (final form). Co-authored-by: nankingjing <76432572+nankingjing@users.noreply.github.com> Co-authored-by: TheNeuralVault <jdkabattles@gmail.com> Co-authored-by: gongyi <yigongsyl@gmail.com>
73 lines
3.0 KiB
Python
73 lines
3.0 KiB
Python
"""Shared daemon-thread ThreadPoolExecutor.
|
|
|
|
Stdlib workers are non-daemon AND registered in ``_threads_queues``, whose atexit
|
|
hook joins every worker even after ``shutdown(wait=False)`` — one wedged worker
|
|
(tool blocked on network I/O, hung provider, stuck subagent) blocks interpreter
|
|
exit forever. This variant spawns daemon workers and skips that registration.
|
|
Use it for best-effort/interruptible work that must never hold the process open;
|
|
NOT for work that must complete before exit (durable writes belong on foreground
|
|
threads with explicit bounded joins).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
import weakref
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
from concurrent.futures.thread import _worker
|
|
from contextvars import copy_context
|
|
|
|
__all__ = ["DaemonThreadPoolExecutor"]
|
|
|
|
|
|
class DaemonThreadPoolExecutor(ThreadPoolExecutor):
|
|
"""ThreadPoolExecutor variant whose workers do not block process exit."""
|
|
|
|
def submit(self, fn, /, *args, **kwargs):
|
|
"""Submit a callable, propagating the caller's contextvars. Stdlib only does
|
|
this from 3.14; on 3.11-3.13 a bare worker starts with an EMPTY Context and
|
|
drops profile secret scope / HERMES_HOME override — under the multiplexed
|
|
gateway a credential read then fails closed with ``UnscopedSecretError``.
|
|
Unconditional: on 3.14+ ``ctx.run`` re-applies the same context (no-op)."""
|
|
ctx = copy_context()
|
|
|
|
def _run_with_context(*call_args, **call_kwargs):
|
|
return ctx.run(fn, *call_args, **call_kwargs)
|
|
return super().submit(_run_with_context, *args, **kwargs)
|
|
|
|
def _adjust_thread_count(self) -> None:
|
|
# Mirrors CPython's implementation with two changes:
|
|
# daemon=True and no _threads_queues registration.
|
|
if self._idle_semaphore.acquire(timeout=0):
|
|
return
|
|
|
|
def weakref_cb(_, q=self._work_queue):
|
|
q.put(None)
|
|
num_threads = len(self._threads)
|
|
if num_threads < self._max_workers:
|
|
thread_name = "%s_%d" % (self._thread_name_prefix or self, num_threads)
|
|
executor_ref = weakref.ref(self, weakref_cb)
|
|
if hasattr(self, "_create_worker_context"):
|
|
# Python 3.14 replaced _initializer/_initargs with a factory
|
|
# that supplies the worker's initializer context.
|
|
worker_args = (
|
|
executor_ref,
|
|
self._create_worker_context(),
|
|
self._work_queue,
|
|
)
|
|
else:
|
|
worker_args = (
|
|
executor_ref,
|
|
self._work_queue,
|
|
self._initializer,
|
|
self._initargs,
|
|
)
|
|
# Carry the active profile into the review thread so MEMORY.md / skill review writes land in the
|
|
# right profile (#54937).
|
|
t = threading.Thread(
|
|
name=thread_name, target=_worker, daemon=True,
|
|
args=worker_args,
|
|
)
|
|
t.start()
|
|
self._threads.add(t)
|