Pass in fqsn from fsp admin apis

fqsns
Tyler Goodlet 2022-03-18 15:06:14 -04:00
parent 6ac60fbe22
commit ce7d630676
1 changed files with 6 additions and 6 deletions
piker/ui

View File

@ -386,6 +386,7 @@ class FspAdmin:
portal: tractor.Portal, portal: tractor.Portal,
complete: trio.Event, complete: trio.Event,
started: trio.Event, started: trio.Event,
fqsn: str,
dst_shm: ShmArray, dst_shm: ShmArray,
conf: dict, conf: dict,
target: Fsp, target: Fsp,
@ -397,7 +398,6 @@ class FspAdmin:
cluster and sleeps until signalled to exit. cluster and sleeps until signalled to exit.
''' '''
brokername, sym = self.linked.symbol.front_feed()
ns_path = str(target.ns_path) ns_path = str(target.ns_path)
async with ( async with (
portal.open_context( portal.open_context(
@ -406,8 +406,7 @@ class FspAdmin:
cascade, cascade,
# data feed key # data feed key
brokername=brokername, fqsn=fqsn,
symbol=sym,
# mems # mems
src_shm_token=self.src_shm.token, src_shm_token=self.src_shm.token,
@ -429,7 +428,7 @@ class FspAdmin:
): ):
# register output data # register output data
self._registry[ self._registry[
(brokername, sym, ns_path) (fqsn, ns_path)
] = ( ] = (
stream, stream,
dst_shm, dst_shm,
@ -452,11 +451,11 @@ class FspAdmin:
) -> (ShmArray, trio.Event): ) -> (ShmArray, trio.Event):
fqsn = self.linked.symbol.front_feed() fqsn = self.linked.symbol.front_fqsn()
# allocate an output shm array # allocate an output shm array
key, dst_shm, opened = maybe_mk_fsp_shm( key, dst_shm, opened = maybe_mk_fsp_shm(
'.'.join(fqsn), fqsn,
target=target, target=target,
readonly=True, readonly=True,
) )
@ -477,6 +476,7 @@ class FspAdmin:
portal, portal,
complete, complete,
started, started,
fqsn,
dst_shm, dst_shm,
conf, conf,
target, target,