Added DEFAULT_SELECTOR_SELECT_TIMEOUT

Author: abhinavsingh

proxy/common/constants.py

@@ -107,6 +107,7 @@ def _env_threadless_compliant() -> bool:
 DEFAULT_MAX_SEND_SIZE = 16 * 1024
 DEFAULT_WORK_KLASS = 'proxy.http.HttpProtocolHandler'
 DEFAULT_ENABLE_PROXY_PROTOCOL = False
+DEFAULT_SELECTOR_SELECT_TIMEOUT = 0.1
 
 DEFAULT_DEVTOOLS_DOC_URL = 'http://proxy'
 DEFAULT_DEVTOOLS_FRAME_ID = secrets.token_hex(8)

proxy/core/acceptor/acceptor.py

@@ -29,6 +29,7 @@
 
 from ..event import EventQueue
 
+from ...common.constants import DEFAULT_SELECTOR_SELECT_TIMEOUT
 from ...common.utils import is_threadless
 from ...common.logger import Logger
 
@@ -105,7 +106,7 @@ def __init__(
     def run_once(self) -> None:
         with self.lock:
             assert self.selector and self.sock
-            events = self.selector.select(timeout=1)
+            events = self.selector.select(timeout=DEFAULT_SELECTOR_SELECT_TIMEOUT)
             if len(events) == 0:
                 return
             conn, addr = self.sock.accept()
@@ -131,6 +132,7 @@ def run(self) -> None:
         try:
             self.selector.register(self.sock, selectors.EVENT_READ)
             while not self.running.is_set():
+                # logger.debug('Looking for new work')
                 self.run_once()
         except KeyboardInterrupt:
             pass

proxy/core/acceptor/threadless.py

@@ -32,7 +32,7 @@
 
 from ...common.logger import Logger
 from ...common.types import Readables, Writables
-from ...common.constants import DEFAULT_TIMEOUT
+from ...common.constants import DEFAULT_TIMEOUT, DEFAULT_SELECTOR_SELECT_TIMEOUT
 
 logger = logging.getLogger(__name__)
 
@@ -94,7 +94,7 @@ def selected_events(self) -> Generator[
                 # ValueError exceptions raised by selector.register
                 # for invalid fd.
                 self.selector.register(fd, worker_events[fd])
-        ev = self.selector.select(timeout=1)
+        ev = self.selector.select(timeout=DEFAULT_SELECTOR_SELECT_TIMEOUT)
         readables = []
         writables = []
         for key, mask in ev:
@@ -219,6 +219,7 @@ def run(self) -> None:
             self.selector.register(self.client_queue, selectors.EVENT_READ)
             self.loop = asyncio.get_event_loop_policy().get_event_loop()
             while not self.running.is_set():
+                # logger.debug('Working on {0} works'.format(len(self.works)))
                 self.run_once()
         except KeyboardInterrupt:
             pass

proxy/http/handler.py

@@ -31,7 +31,8 @@
 from ..core.base import BaseTcpServerHandler
 from ..core.connection import TcpClientConnection
 from ..common.flag import flags
-from ..common.constants import DEFAULT_CLIENT_RECVBUF_SIZE, DEFAULT_KEY_FILE, DEFAULT_TIMEOUT
+from ..common.constants import DEFAULT_CLIENT_RECVBUF_SIZE, DEFAULT_KEY_FILE
+from ..common.constants import DEFAULT_SELECTOR_SELECT_TIMEOUT, DEFAULT_TIMEOUT
 
 
 logger = logging.getLogger(__name__)
@@ -365,7 +366,7 @@ def _selected_events(self) -> SelectedEventsGeneratorType:
         events = self.get_events()
         for fd in events:
             self.selector.register(fd, events[fd])
-        ev = self.selector.select(timeout=1)
+        ev = self.selector.select(timeout=DEFAULT_SELECTOR_SELECT_TIMEOUT)
         readables = []
         writables = []
         for key, mask in ev:
@@ -396,7 +397,7 @@ def _flush(self) -> None:
             while self.work.has_buffer():
                 ev: List[
                     Tuple[selectors.SelectorKey, int]
-                ] = self.selector.select(timeout=1)
+                ] = self.selector.select(timeout=DEFAULT_SELECTOR_SELECT_TIMEOUT)
                 if len(ev) == 0:
                     continue
                 self.work.flush()

proxy/http/websocket/client.py

@@ -25,7 +25,7 @@
 
 from ..parser import httpParserTypes, HttpParser
 
-from ...common.constants import DEFAULT_BUFFER_SIZE
+from ...common.constants import DEFAULT_BUFFER_SIZE, DEFAULT_SELECTOR_SELECT_TIMEOUT
 from ...common.utils import new_socket_connection, build_websocket_handshake_request, text_
 from ...core.connection import tcpConnectionTypes, TcpConnection
 
@@ -93,7 +93,7 @@ def run_once(self) -> bool:
         if self.has_buffer():
             ev |= selectors.EVENT_WRITE
         self.selector.register(self.sock.fileno(), ev)
-        events = self.selector.select(timeout=1)
+        events = self.selector.select(timeout=DEFAULT_SELECTOR_SELECT_TIMEOUT)
         self.selector.unregister(self.sock)
         for _, mask in events:
             if mask & selectors.EVENT_READ and self.on_message: