mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Close unneeded fds in forked children

Browse Source
This commit is contained in:
Kovid Goyal
2022-06-12 20:26:20 +05:30
parent a1a637c7f1
commit 9fcb8e5b6e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kitty/prewarm.py
View File

@@ -14,7 +14,8 @@ from dataclasses import dataclass
from importlib import import_module from importlib import import_module
from itertools import count from itertools import count
from typing import ( from typing import (
IO, TYPE_CHECKING, Any, Dict, List, NoReturn, Optional, Tuple, Union, cast IO, TYPE_CHECKING, Any, Dict, List, NoReturn, Optional, Sequence, Tuple,
Union, cast
) )
from kitty.constants import kitty_exe, running_in_kitty from kitty.constants import kitty_exe, running_in_kitty
@@ -268,7 +269,7 @@ def child_main(cmd: Dict[str, Any], ready_fd: int) -> NoReturn:
raise SystemExit(0) raise SystemExit(0)
def fork(shm_address: str) -> Tuple[int, int, int]: def fork(shm_address: str, all_non_child_fds: Sequence[int]) -> Tuple[int, int, int]:
sz = pos = 0 sz = pos = 0
with SharedMemory(name=shm_address, unlink_on_exit=True) as shm: with SharedMemory(name=shm_address, unlink_on_exit=True) as shm:
data = shm.read_data_with_size() data = shm.read_data_with_size()
@@ -301,6 +302,8 @@ def fork(shm_address: str) -> Tuple[int, int, int]:
# child process # child process
os.close(r) os.close(r)
os.close(ready_fd_write) os.close(ready_fd_write)
for fd in all_non_child_fds:
os.close(fd)
os.setsid() os.setsid()
signal.signal(signal.SIGUSR1, signal.SIG_DFL) signal.signal(signal.SIGUSR1, signal.SIG_DFL)
tty_name = cmd.get('tty_name') tty_name = cmd.get('tty_name')
@@ -340,6 +343,9 @@ def main(stdin_fd: int, stdout_fd: int, notify_child_death_fd: int) -> None:
warnings.filterwarnings('ignore', category=RuntimeWarning, module='runpy') warnings.filterwarnings('ignore', category=RuntimeWarning, module='runpy')
prewarm() prewarm()
def get_all_non_child_fds() -> Sequence[int]:
return [notify_child_death_fd, stdin_fd, stdout_fd] + list(child_ready_fds.values()) + list(child_death_fds)
def check_event(event: int, err_msg: str) -> None: def check_event(event: int, err_msg: str) -> None:
if event & select.POLLHUP: if event & select.POLLHUP:
raise SystemExit(0) raise SystemExit(0)
@@ -365,13 +371,12 @@ def main(stdin_fd: int, stdout_fd: int, notify_child_death_fd: int) -> None:
child_id = int(payload) child_id = int(payload)
cfd = child_ready_fds.pop(child_id) cfd = child_ready_fds.pop(child_id)
if cfd is not None: if cfd is not None:
os.write(cfd, b'1')
os.close(cfd) os.close(cfd)
elif cmd == 'quit': elif cmd == 'quit':
raise SystemExit(0) raise SystemExit(0)
elif cmd == 'fork': elif cmd == 'fork':
try: try:
child_pid, child_death_fd, ready_fd_write = fork(payload) child_pid, child_death_fd, ready_fd_write = fork(payload, get_all_non_child_fds())
except Exception as e: except Exception as e:
es = str(e).replace('\n', ' ') es = str(e).replace('\n', ' ')
output_buf += f'ERR:{es}\n'.encode() output_buf += f'ERR:{es}\n'.encode()