fixing _stop for None pids

python · vstinner · Mar 20, 2025 · Feb 21, 2025 · Feb 21, 2025 · Feb 21, 2025
commit 8e43a8393305b49915f150f1593273fa220c6e15
@@ -75,8 +75,16 @@ def _reentrant_call_error(self):
         raise ReentrantCallError(
             "Reentrant call into the multiprocessing resource tracker")
 
+    def __del__(self):
+        # making sure child processess are cleaned before ResourceTracker
+        # gets destructed.
+        # see https://github.com/python/cpython/issues/88887
+        self._stop()
+
     def _stop(self):
         with self._lock:
+            if self._pid is None:
+                return
             # This should not happen (_stop() isn't called by a finalizer)
             # but we check for it anyway.
             if self._lock._recursion_count() > 1:
@@ -191,7 +199,7 @@ def unregister(self, name, rtype):
         '''Unregister name of resource with resource tracker.'''
         self._send('UNREGISTER', name, rtype)
 
-    def _send(self, cmd, name, rtype):
+    def _send(self, cmd, name, rtype)::77
         try:
             self.ensure_running()
         except ReentrantCallError:
@@ -212,16 +220,6 @@ def _send(self, cmd, name, rtype):
         assert nbytes == len(msg), "nbytes {0:n} but len(msg) {1:n}".format(
             nbytes, len(msg))
 
-    def __del__(self):
-        # making sure child processess are cleaned before ResourceTracker
-        # gets destructed.
-        # see https://github.com/python/cpython/issues/88887
-        try:
-            self._stop()
-        except (OSError, TypeError, AttributeError) as e:
-                pass
-
-
 _resource_tracker = ResourceTracker()
 ensure_running = _resource_tracker.ensure_running
 register = _resource_tracker.register