xoscar 0.4.4__tar.gz → 0.4.6__tar.gz

{xoscar-0.4.4/xoscar.egg-info → xoscar-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.4.4
+Version: 0.4.6
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye

{xoscar-0.4.4 → xoscar-0.4.6}/xoscar/backends/communication/dummy.py

@@ -249,12 +249,5 @@ class DummyClient(Client):
     async def close(self):
         await super().close()
         if self._task is not None:
-            task_loop = self._task.get_loop()
-            if task_loop is not None:
-                if not task_loop.is_running():
-                    logger.warning(
-                        "Dummy channel cancel task on a stopped loop, dest address: %s.",
-                        self.dest_address,
-                    )
             self._task.cancel()
             self._task = None

{xoscar-0.4.4 → xoscar-0.4.6}/xoscar/backends/communication/socket.py

@@ -34,6 +34,7 @@ from ...serialization import AioDeserializer, AioSerializer, deserialize
 from ...utils import classproperty, implements, is_py_312, is_v6_ip
 from .base import Channel, ChannelType, Client, Server
 from .core import register_client, register_server
+from .errors import ChannelClosed
 from .utils import read_buffers, write_buffers
 
 _is_windows: bool = sys.platform.startswith("win")
@@ -80,12 +81,19 @@ class SocketChannel(Channel):
         serializer = AioSerializer(message, compress=compress)
         buffers = await serializer.run()
 
-        # write buffers
-        write_buffers(self.writer, buffers)
-        async with self._send_lock:
-            # add lock, or when parallel send,
-            # assertion error may be raised
-            await self.writer.drain()
+        try:
+            # write buffers
+            write_buffers(self.writer, buffers)
+            async with self._send_lock:
+                # add lock, or when parallel send,
+                # assertion error may be raised
+                await self.writer.drain()
+        except RuntimeError as e:
+            if self.writer.is_closing():
+                raise ChannelClosed(
+                    "Channel already closed, cannot write message"
+                ) from e
+            raise e
 
     @implements(Channel.recv)
     async def recv(self):

{xoscar-0.4.4 → xoscar-0.4.6}/xoscar/backends/core.py

@@ -196,12 +196,14 @@ class ActorCallerThreadLocal:
         return await self.call_with_client(client, message, wait)
 
     async def stop(self):
-        logger.debug("Actor caller stop.")
         try:
             await asyncio.gather(*[client.close() for client in self._clients])
         except (ConnectionError, ServerClosed):
             pass
-        self.cancel_tasks()
+        try:
+            self.cancel_tasks()
+        except:
+            pass
 
     def cancel_tasks(self):
         # cancel listening for all clients
@@ -232,14 +234,11 @@ def _cancel_all_tasks(loop):
 
 
 def _safe_run_forever(loop):
-    loop.run_forever()
-    _cancel_all_tasks(loop)
-
-
-def _safe_exit_thread(loop, thread):
-    # To avoid _enter_buffered_busy: could not acquire lock
-    loop.call_soon_threadsafe(loop.stop)
-    thread.join()
+    try:
+        loop.run_forever()
+    finally:
+        _cancel_all_tasks(loop)
+        loop.stop()
 
 
 class ActorCaller:
@@ -253,7 +252,7 @@ class ActorCaller:
         target=_safe_run_forever, args=(_close_loop,), daemon=True
     )
     _close_thread.start()
-    atexit.register(_safe_exit_thread, _close_loop, _close_thread)
+    atexit.register(_close_loop.call_soon_threadsafe, _close_loop.stop)
 
     def __init__(self):
         self._thread_local = threading.local()

{xoscar-0.4.4 → xoscar-0.4.6}/xoscar/backends/indigen/pool.py

@@ -16,6 +16,7 @@
 from __future__ import annotations
 
 import asyncio
+import atexit
 import concurrent.futures as futures
 import configparser
 import contextlib
@@ -29,6 +30,7 @@ import sys
 import threading
 import uuid
 from dataclasses import dataclass
+from multiprocessing import util
 from types import TracebackType
 from typing import List, Optional
 
@@ -79,6 +81,19 @@ logger = logging.getLogger(__name__)
 _init_main_suspended_local = threading.local()
 
 
+def _terminate_children():
+    for c in multiprocessing.active_children():
+        try:
+            c.terminate()
+        except Exception:
+            pass
+
+
+if util:
+    # Import multiprocessing.util to register _exit_function at exit.
+    atexit.register(_terminate_children)
+
+
 def _patch_spawn_get_preparation_data():
     try:
         from multiprocessing import spawn as mp_spawn
@@ -309,6 +324,7 @@ class MainActorPool(MainActorPoolBase):
             raise
         finally:
             status_queue.put(process_status)
+            status_queue.cancel_join_thread()
         await pool.join()
 
     async def append_sub_pool(

{xoscar-0.4.4 → xoscar-0.4.6}/xoscar/backends/pool.py

@@ -377,7 +377,7 @@ class AbstractActorPool(ABC):
         try:
             await channel.send(result)
         except (ChannelClosed, ConnectionResetError):
-            if not self._stopped.is_set():
+            if not self._stopped.is_set() and not channel.closed:
                 raise
         except Exception as ex:
             logger.exception(

{xoscar-0.4.4 → xoscar-0.4.6/xoscar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.4.4
+Version: 0.4.6
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye