portal 3.1.2__tar.gz → 3.1.4__tar.gz

{portal-3.1.2/portal.egg-info → portal-3.1.4}/PKG-INFO

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

{portal-3.1.2 → portal-3.1.4}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.2'
+__version__ = '3.1.4'
 
 import multiprocessing as mp
 try:

{portal-3.1.2 → portal-3.1.4}/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.2 → portal-3.1.4}/portal/client.py

@@ -47,7 +47,7 @@ class Client:
   def stats(self):
     now = time.time()
     stats = {
-        'inflight': self._numinflight(),
+        'inflight': len(self.futures),
         'numsend': self.sendrate[0],
         'numrecv': self.recvrate[0],
         'sendrate': self.sendrate[0] / (now - self.sendrate[1]),
@@ -65,7 +65,7 @@ class Client:
   def call(self, method, *data):
     reqnum = next(self.reqnum).to_bytes(8, 'little', signed=False)
     start = time.time()
-    while self._numinflight() >= self.maxinflight:
+    while len(self.futures) >= self.maxinflight:
       with self.cond: self.cond.wait(timeout=0.2)
       try:
         self.socket.require_connection(timeout=0)
@@ -93,9 +93,6 @@ class Client:
     self.futures.clear()
     self.socket.close(timeout)
 
-  def _numinflight(self):
-    return len([x for x in self.futures.values() if not x.don])
-
   def _recv(self, data):
     assert len(data) >= 16, 'Unexpectedly short response'
     reqnum = bytes(data[:8])

{portal-3.1.2 → portal-3.1.4}/portal/client_socket.py

@@ -111,10 +111,11 @@ class ClientSocket:
     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()
@@ -122,27 +123,32 @@ class ClientSocket:
           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)
+        ready = sel.select(timeout=0.2)
+        if not ready:
+          continue
+        _, mask = ready[0]
 
-        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 mask & selectors.EVENT_READ:
+          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 mask & selectors.EVENT_WRITE:
           try:
             self.sendq[0].send(sock)
             if self.sendq[0].done():
@@ -155,6 +161,7 @@ class ClientSocket:
         detail = f'{detail}: {e}' if str(e) else detail
         self._log(f'Connection to server lost ({detail})')
         self.isconn.clear()
+        isconn = False
         sel.unregister(sock)
         sock.close()
         # Clear message queue on disconnect. There is no meaningful concept of

{portal-3.1.2 → portal-3.1.4/portal.egg-info}/PKG-INFO

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