portal 3.1.3__tar.gz → 3.1.5__tar.gz

{portal-3.1.3/portal.egg-info → portal-3.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.3
+Version: 3.1.5
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.3 → portal-3.1.5}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.3'
+__version__ = '3.1.5'
 
 import multiprocessing as mp
 try:

{portal-3.1.3 → portal-3.1.5}/portal/buffers.py

@@ -54,7 +54,7 @@ class RecvBuffer:
 
   def __init__(self, maxsize):
     self.maxsize = maxsize
-    self.lenbuf = bytearray(4)
+    self.lenbuf = b''
     self.buffer = None
     self.pos = 0
 
@@ -64,9 +64,10 @@ class RecvBuffer:
 
   def recv(self, sock):
     if self.buffer is None:
-      size = sock.recv_into(memoryview(self.lenbuf)[self.pos:])
-      self.pos += max(0, size)
-      if self.pos == 4:
+      part = sock.recv(4 - len(self.lenbuf))
+      self.lenbuf += part
+      size = len(part)
+      if len(self.lenbuf) == 4:
         length = int.from_bytes(self.lenbuf, 'little', signed=False)
         assert 1 <= length <= self.maxsize, (1, length, self.maxsize)
         # We use Numpy to allocate uninitialized memory because Python's

{portal-3.1.3 → portal-3.1.5}/portal/client_socket.py

@@ -1,7 +1,7 @@
 import collections
 import dataclasses
 import queue
-import selectors
+import select
 import socket
 import sys
 import threading
@@ -109,40 +109,41 @@ class ClientSocket:
 
   def _loop(self):
     recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
-    sel = selectors.DefaultSelector()
     sock = None
+    isconn = False  # Local mirror of self.isconn without the lock.
 
-    while self.running or (self.sendq and self.isconn.is_set()):
+    while self.running or (self.sendq and isconn):
 
-      if not self.isconn.is_set():
+      if not isconn:
         if not self.options.autoconn and not self.wantconn.wait(timeout=0.2):
           continue
         sock = self._connect()
         if not sock:
           break
-        sel.register(sock, selectors.EVENT_READ | selectors.EVENT_WRITE)
         self.isconn.set()
+        isconn = True
         if not self.options.autoconn:
           self.wantconn.clear()
         [x() for x in self.callbacks_conn]
 
       try:
 
-        sel.select(timeout=0.2)
+        readable, writable, _ = select.select([sock], [sock], [], 0.2)
 
-        try:
-          recvbuf.recv(sock)
-          if recvbuf.done():
-            if self.recvq.qsize() > self.options.max_recv_queue:
-              raise RuntimeError('Too many incoming messages enqueued')
-            msg = recvbuf.result()
-            self.recvq.put(msg)
-            [x(msg) for x in self.callbacks_recv]
-            recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
-        except BlockingIOError:
-          pass
-
-        if self.sendq:
+        if readable:
+          try:
+            recvbuf.recv(sock)
+            if recvbuf.done():
+              if self.recvq.qsize() > self.options.max_recv_queue:
+                raise RuntimeError('Too many incoming messages enqueued')
+              msg = recvbuf.result()
+              self.recvq.put(msg)
+              [x(msg) for x in self.callbacks_recv]
+              recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
+          except BlockingIOError:
+            pass
+
+        if self.sendq and writable:
           try:
             self.sendq[0].send(sock)
             if self.sendq[0].done():
@@ -155,7 +156,7 @@ class ClientSocket:
         detail = f'{detail}: {e}' if str(e) else detail
         self._log(f'Connection to server lost ({detail})')
         self.isconn.clear()
-        sel.unregister(sock)
+        isconn = False
         sock.close()
         # Clear message queue on disconnect. There is no meaningful concept of
         # sucessful delivery of a message at this level. For example, the
@@ -206,6 +207,7 @@ class ClientSocket:
     else:
       sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
       addr = self.addr
+    # sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
     after = self.options.keepalive_after
     every = self.options.keepalive_every
     fails = self.options.keepalive_fails

{portal-3.1.3 → portal-3.1.5}/portal/contextlib.py

@@ -147,6 +147,7 @@ class Context:
       if self.errfile and self.errfile.exists():
         print(f'Shutting down due to error file: {self.errfile}')
         self.shutdown(2)
+        break
       if self.done.wait(self.interval):
         break
 

{portal-3.1.3 → portal-3.1.5}/portal/server_socket.py

@@ -47,6 +47,7 @@ class ServerSocket:
       self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
       self.addr = (self.options.host, port)
     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    # self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
     self.sock.bind(self.addr)
     self.sock.setblocking(False)
     self.sock.listen()

{portal-3.1.3 → portal-3.1.5/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.3
+Version: 3.1.5
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner