Pass in fqsn from fsp admin apis
							parent
							
								
									c0d1facf3b
								
							
						
					
					
						commit
						7a959e756d
					
				| 
						 | 
					@ -387,6 +387,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,
 | 
				
			||||||
| 
						 | 
					@ -398,7 +399,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(
 | 
				
			||||||
| 
						 | 
					@ -407,8 +407,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,
 | 
				
			||||||
| 
						 | 
					@ -430,7 +429,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,
 | 
				
			||||||
| 
						 | 
					@ -444,6 +443,8 @@ class FspAdmin:
 | 
				
			||||||
                async for msg in stream:
 | 
					                async for msg in stream:
 | 
				
			||||||
                    if msg == 'update':
 | 
					                    if msg == 'update':
 | 
				
			||||||
                        self.linked.graphics_cycle()
 | 
					                        self.linked.graphics_cycle()
 | 
				
			||||||
 | 
					                    else:
 | 
				
			||||||
 | 
					                        log.info(f'recved unexpected fsp engine msg: {msg}')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            await complete.wait()
 | 
					            await complete.wait()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -458,11 +459,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,
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
| 
						 | 
					@ -483,6 +484,7 @@ class FspAdmin:
 | 
				
			||||||
            portal,
 | 
					            portal,
 | 
				
			||||||
            complete,
 | 
					            complete,
 | 
				
			||||||
            started,
 | 
					            started,
 | 
				
			||||||
 | 
					            fqsn,
 | 
				
			||||||
            dst_shm,
 | 
					            dst_shm,
 | 
				
			||||||
            conf,
 | 
					            conf,
 | 
				
			||||||
            target,
 | 
					            target,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue