goodboy
/
tractor
1
0
Fork 2
Code Issues 5 Pull Requests 8 Packages Projects Releases Wiki Activity

recv_fds doesnt need to be an acm

one_ring_to_rule_them_all
Guillermo Rodriguez 2025-04-02 15:00:40 -03:00
parent b8d1fd6978
commit dfc0254995
No known key found for this signature in database
GPG Key ID: 002CC5F1E6BDA53E
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tractor/ipc/_ringbuf/_ringd.py
View File

@ -70,8 +70,8 @@ async def _attach_to_ring(
name=ring_name, name=ring_name,
sock_path=sock_path sock_path=sock_path
) as (ctx, token), ) as (ctx, token),
recv_fds(sock_path, fd_amount) as fds,
): ):
fds = await recv_fds(sock_path, fd_amount)
log.info( log.info(
f'received fds: {fds}' f'received fds: {fds}'
) )

6
tractor/linux/_fdshare.py
View File

@ -29,10 +29,10 @@ async def send_fds(fds: list[int], sock_path: str):
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
await sock.bind(sock_path) await sock.bind(sock_path)
sock.listen(1) sock.listen(1)
yield
fds = array.array('i', fds) fds = array.array('i', fds)
# first byte of msg will be len of fds to send % 256 # first byte of msg will be len of fds to send % 256
msg = bytes([len(fds) % 256]) msg = bytes([len(fds) % 256])
yield
conn, _ = await sock.accept() conn, _ = await sock.accept()
await conn.sendmsg( await conn.sendmsg(
[msg], [msg],
@ -46,7 +46,6 @@ async def send_fds(fds: list[int], sock_path: str):
sock.close() sock.close()
@acm
async def recv_fds(sock_path: str, amount: int) -> tuple: async def recv_fds(sock_path: str, amount: int) -> tuple:
stream = await trio.open_unix_socket(sock_path) stream = await trio.open_unix_socket(sock_path)
sock = stream.socket sock = stream.socket
@ -87,8 +86,7 @@ async def recv_fds(sock_path: str, amount: int) -> tuple:
) )
) )
yield tuple(a) return tuple(a)
return
except (ValueError, IndexError): except (ValueError, IndexError):
pass pass