occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

aqctl_coreanalyzer_proxy: cleanup

This commit is contained in:
Sebastien Bourdeauducq 2023-12-08 18:56:10 +08:00
parent b09a39c82e
commit 05a9422e67
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/frontend/aqctl_coreanalyzer_proxy.py
View File

@ -2,13 +2,14 @@ import argparse
import asyncio import asyncio
import atexit import atexit
import logging import logging
import struct
from sipyco.asyncio_tools import AsyncioServer, SignalHandler, atexit_register_coroutine from sipyco.asyncio_tools import AsyncioServer, SignalHandler, atexit_register_coroutine
from sipyco.pc_rpc import Server from sipyco.pc_rpc import Server
from sipyco import common_args from sipyco import common_args
from artiq.coredevice.comm_analyzer import get_analyzer_dump from artiq.coredevice.comm_analyzer import get_analyzer_dump
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -38,9 +39,8 @@ class ProxyServer(AsyncioServer):
writer.close() writer.close()
def request_dump_cb(self, dump): def request_dump_cb(self, dump):
encoded_dump = struct.pack(">L", len(dump)) + dump
for recipient in self._recipients: for recipient in self._recipients:
recipient.put_nowait(encoded_dump) recipient.put_nowait(dump)
class ProxyControl: class ProxyControl:
@ -99,8 +99,6 @@ def main():
loop.run_until_complete(server.start(bind_address, args.port_control)) loop.run_until_complete(server.start(bind_address, args.port_control))
atexit_register_coroutine(server.stop, loop=loop) atexit_register_coroutine(server.stop, loop=loop)
logger.info("ARTIQ core analyzer proxy is ready.")
_, pending = loop.run_until_complete(asyncio.wait( _, pending = loop.run_until_complete(asyncio.wait(
[loop.create_task(signal_handler.wait_terminate()), [loop.create_task(signal_handler.wait_terminate()),
loop.create_task(server.wait_terminate())], loop.create_task(server.wait_terminate())],