portal 3.1.4__tar.gz → 3.1.6__tar.gz

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

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

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

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

{portal-3.1.4 → portal-3.1.6}/portal/client.py

@@ -98,17 +98,17 @@ class Client:
     reqnum = bytes(data[:8])
     status = int.from_bytes(data[8:16], 'little', signed=False)
     future = self.futures.pop(reqnum, None)
-    assert future, (
-        f'Unexpected request number: {reqnum}',
-        sorted(self.futures.keys()))
-    if status == 0:
+    if not future:
+      existing = sorted(self.futures.keys())
+      print(f'Unexpected request number: {reqnum}', existing)
+    elif status == 0:
       data = packlib.unpack(data[16:])
       future.set_result(data)
+      with self.cond: self.cond.notify_all()
     else:
       message = bytes(data[16:]).decode('utf-8')
       self._seterr(future, RuntimeError(message))
-    with self.cond:
-      self.cond.notify_all()
+      with self.cond: self.cond.notify_all()
     self.socket.recv()
 
   def _disc(self):

{portal-3.1.4 → portal-3.1.6}/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,7 +109,6 @@ 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.
 
@@ -121,7 +120,6 @@ class ClientSocket:
         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:
@@ -130,12 +128,9 @@ class ClientSocket:
 
       try:
 
-        ready = sel.select(timeout=0.2)
-        if not ready:
-          continue
-        _, mask = ready[0]
+        readable, writable, _ = select.select([sock], [sock], [], 0.2)
 
-        if mask & selectors.EVENT_READ:
+        if readable:
           try:
             recvbuf.recv(sock)
             if recvbuf.done():
@@ -148,7 +143,7 @@ class ClientSocket:
           except BlockingIOError:
             pass
 
-        if self.sendq and mask & selectors.EVENT_WRITE:
+        if self.sendq and writable:
           try:
             self.sendq[0].send(sock)
             if self.sendq[0].done():
@@ -162,7 +157,6 @@ class ClientSocket:
         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
         # sucessful delivery of a message at this level. For example, the
@@ -213,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.4 → portal-3.1.6}/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.4 → portal-3.1.6}/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.4 → portal-3.1.6/portal.egg-info}/PKG-INFO

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