jc211
/
tractor
forked from goodboy/tractor
1
0
Fork 0
Code Pull Requests Activity

Port inter-process method calls to `Portal.run_from_ns()`

func_refs_always
Tyler Goodlet 2020-12-22 10:26:07 -05:00
parent 7134f35d6e
commit 9fd3c42eb1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tractor/_actor.py
View File

@ -712,7 +712,7 @@ class Actor:
assert isinstance(self._arb_addr, tuple) assert isinstance(self._arb_addr, tuple)
async with get_arbiter(*self._arb_addr) as arb_portal: async with get_arbiter(*self._arb_addr) as arb_portal:
await arb_portal.run( await arb_portal.run_from_ns(
'self', 'self',
'register_actor', 'register_actor',
uid=self.uid, uid=self.uid,
@ -788,8 +788,11 @@ class Actor:
cs.shield = True cs.shield = True
try: try:
async with get_arbiter(*self._arb_addr) as arb_portal: async with get_arbiter(*self._arb_addr) as arb_portal:
await arb_portal.run( await arb_portal.run_from_ns(
'self', 'unregister_actor', uid=self.uid) 'self',
'unregister_actor',
uid=self.uid
)
except OSError: except OSError:
failed = True failed = True
if cs.cancelled_caught: if cs.cancelled_caught:

9
tractor/_debug.py
View File

@ -180,15 +180,14 @@ def _breakpoint(debug_func) -> Awaitable[None]:
try: try:
async with get_root() as portal: async with get_root() as portal:
with trio.fail_after(.5): with trio.fail_after(.5):
agen = await portal.run( stream = await portal.run(
'tractor._debug', tractor._debug._hijack_stdin_relay_to_child,
'_hijack_stdin_relay_to_child',
subactor_uid=actor.uid, subactor_uid=actor.uid,
) )
async with aclosing(agen): async with aclosing(stream):
# block until first yield above # block until first yield above
async for val in agen: async for val in stream:
assert val == 'Locked' assert val == 'Locked'
task_status.started() task_status.started()

4
tractor/_discovery.py
View File

@ -60,7 +60,7 @@ async def find_actor(
""" """
actor = current_actor() actor = current_actor()
async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal: async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal:
sockaddr = await arb_portal.run('self', 'find_actor', name=name) sockaddr = await arb_portal.run_from_ns('self', 'find_actor', name=name)
# TODO: return portals to all available actors - for now just # TODO: return portals to all available actors - for now just
# the last one that registered # the last one that registered
if name == 'arbiter' and actor.is_arbiter: if name == 'arbiter' and actor.is_arbiter:
@ -84,7 +84,7 @@ async def wait_for_actor(
""" """
actor = current_actor() actor = current_actor()
async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal: async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal:
sockaddrs = await arb_portal.run('self', 'wait_for_actor', name=name) sockaddrs = await arb_portal.run_from_ns('self', 'wait_for_actor', name=name)
sockaddr = sockaddrs[-1] sockaddr = sockaddrs[-1]
async with _connect_chan(*sockaddr) as chan: async with _connect_chan(*sockaddr) as chan:
async with open_portal(chan) as portal: async with open_portal(chan) as portal: