From ce7d630676603101acce6daba80b010b584cbfbb Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Fri, 18 Mar 2022 15:06:14 -0400 Subject: [PATCH] Pass in fqsn from fsp admin apis --- piker/ui/_fsp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/piker/ui/_fsp.py b/piker/ui/_fsp.py index ac35067c..d56cc2d5 100644 --- a/piker/ui/_fsp.py +++ b/piker/ui/_fsp.py @@ -386,6 +386,7 @@ class FspAdmin: portal: tractor.Portal, complete: trio.Event, started: trio.Event, + fqsn: str, dst_shm: ShmArray, conf: dict, target: Fsp, @@ -397,7 +398,6 @@ class FspAdmin: cluster and sleeps until signalled to exit. ''' - brokername, sym = self.linked.symbol.front_feed() ns_path = str(target.ns_path) async with ( portal.open_context( @@ -406,8 +406,7 @@ class FspAdmin: cascade, # data feed key - brokername=brokername, - symbol=sym, + fqsn=fqsn, # mems src_shm_token=self.src_shm.token, @@ -429,7 +428,7 @@ class FspAdmin: ): # register output data self._registry[ - (brokername, sym, ns_path) + (fqsn, ns_path) ] = ( stream, dst_shm, @@ -452,11 +451,11 @@ class FspAdmin: ) -> (ShmArray, trio.Event): - fqsn = self.linked.symbol.front_feed() + fqsn = self.linked.symbol.front_fqsn() # allocate an output shm array key, dst_shm, opened = maybe_mk_fsp_shm( - '.'.join(fqsn), + fqsn, target=target, readonly=True, ) @@ -477,6 +476,7 @@ class FspAdmin: portal, complete, started, + fqsn, dst_shm, conf, target,