KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finer grained polling

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-13 19:41:40 +05:30
parent 628246c3da
commit d5df301317
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/prewarm.py
View File

@ -164,7 +164,7 @@ class PrewarmProcess:
input_buf = b'' input_buf = b''
st = time.monotonic() st = time.monotonic()
while time.monotonic() - st < timeout: while time.monotonic() - st < timeout:
for (fd, event) in self.poll.poll(200): for (fd, event) in self.poll.poll(2):
if event & error_events: if event & error_events:
raise PrewarmProcessFailed('Failed doing I/O with prewarm process') raise PrewarmProcessFailed('Failed doing I/O with prewarm process')
if fd == self.read_from_process_fd and event & select.POLLIN: if fd == self.read_from_process_fd and event & select.POLLIN:
@ -192,7 +192,7 @@ class PrewarmProcess:
st = time.monotonic() st = time.monotonic()
while time.monotonic() - st < timeout and output_buf: while time.monotonic() - st < timeout and output_buf:
self.poll_to_send(bool(output_buf)) self.poll_to_send(bool(output_buf))
for (fd, event) in self.poll.poll(200): for (fd, event) in self.poll.poll(2):
if event & error_events: if event & error_events:
raise PrewarmProcessFailed('Failed doing I/O with prewarm process: {event}') raise PrewarmProcessFailed('Failed doing I/O with prewarm process: {event}')
if fd == self.write_to_process_fd and event & select.POLLOUT: if fd == self.write_to_process_fd and event & select.POLLOUT:

12
kitty_tests/prewarm.py
View File

@ -6,7 +6,9 @@ import json
import os import os
import select import select
import signal import signal
import subprocess
import tempfile import tempfile
import time
from kitty.constants import is_macos, kitty_exe from kitty.constants import is_macos, kitty_exe
from kitty.fast_data_types import ( from kitty.fast_data_types import (
@ -62,7 +64,6 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
self.ae(int(p.from_worker.readline()), data['pid']) self.ae(int(p.from_worker.readline()), data['pid'])
def test_signal_handling(self): def test_signal_handling(self):
import subprocess
expecting_code = 0 expecting_code = 0
found_signal = False found_signal = False
@ -82,12 +83,17 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
if signal is not None: if signal is not None:
p.send_signal(signal) p.send_signal(signal)
if q is not None: if q is not None:
for (fd, event) in poll.poll(5000): st = time.monotonic()
while time.monotonic() - st < 5:
for (fd, event) in poll.poll(10):
if fd == signal_read_fd:
read_signals(signal_read_fd, handle_signal) read_signals(signal_read_fd, handle_signal)
if found_signal:
break
self.assertTrue(found_signal, f'Failed to to get SIGCHLD for signal {signal}') self.assertTrue(found_signal, f'Failed to to get SIGCHLD for signal {signal}')
poll = select.poll() poll = select.poll()
p = subprocess.Popen([kitty_exe(), '+runpy', 'while True: x=2+2'], stderr=subprocess.DEVNULL, stdin=subprocess.PIPE) p = subprocess.Popen([kitty_exe(), '+runpy', 'while True:\n x=2+2'], stderr=subprocess.DEVNULL, stdin=subprocess.PIPE)
signal_read_fd = install_signal_handlers(signal.SIGCHLD)[0] signal_read_fd = install_signal_handlers(signal.SIGCHLD)[0]
try: try:
poll.register(signal_read_fd, select.POLLIN) poll.register(signal_read_fd, select.POLLIN)