forked from M-Labs/artiq
add aqctl_moninj_proxy
This commit is contained in:
parent
710786388c
commit
bbb2c75194
225
artiq/frontend/aqctl_moninj_proxy.py
Executable file
225
artiq/frontend/aqctl_moninj_proxy.py
Executable file
@ -0,0 +1,225 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import argparse
|
||||
import logging
|
||||
import asyncio
|
||||
import struct
|
||||
from enum import Enum
|
||||
|
||||
from sipyco.asyncio_tools import AsyncioServer
|
||||
from sipyco.pc_rpc import Server
|
||||
from sipyco import common_args
|
||||
|
||||
from artiq.coredevice.comm_moninj import CommMonInj
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class EventType(Enum):
|
||||
PROBE = 0
|
||||
INJECTION = 1
|
||||
|
||||
|
||||
class MonitorMux:
|
||||
def __init__(self):
|
||||
self.listeners = dict()
|
||||
self.comm_moninj = None
|
||||
|
||||
def _monitor(self, listener, event):
|
||||
try:
|
||||
listeners = self.listeners[event]
|
||||
except KeyError:
|
||||
listeners = []
|
||||
self.listeners[event] = listeners
|
||||
if event[0] == EventType.PROBE:
|
||||
logger.debug("starting monitoring channel %d probe %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_probe(True, event[1], event[2])
|
||||
elif event[0] == EventType.INJECTION:
|
||||
logger.debug("starting monitoring channel %d injection %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_injection(True, event[1], event[2])
|
||||
else:
|
||||
raise ValueError
|
||||
if listener in listeners:
|
||||
logger.warning("listener trying to subscribe twice to %s", event)
|
||||
else:
|
||||
listeners.append(listener)
|
||||
|
||||
def _unmonitor(self, listener, event):
|
||||
try:
|
||||
listeners = self.listeners[event]
|
||||
except KeyError:
|
||||
listeners = []
|
||||
try:
|
||||
listeners.remove(listener)
|
||||
except ValueError:
|
||||
logger.warning("listener trying to unsubscribe from %s, but was not subscribed", event)
|
||||
return
|
||||
if not listeners:
|
||||
del self.listeners[event]
|
||||
if event[0] == EventType.PROBE:
|
||||
logger.debug("stopped monitoring channel %d probe %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_probe(False, event[1], event[2])
|
||||
elif event[0] == EventType.INJECTION:
|
||||
logger.debug("stopped monitoring channel %d injection %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_injection(False, event[1], event[2])
|
||||
else:
|
||||
raise ValueError
|
||||
|
||||
def monitor_probe(self, listener, enable, channel, probe):
|
||||
if enable:
|
||||
self._monitor(listener, (EventType.PROBE, channel, probe))
|
||||
else:
|
||||
self._unmonitor(listener, (EventType.PROBE, channel, probe))
|
||||
|
||||
def monitor_injection(self, listener, enable, channel, overrd):
|
||||
if enable:
|
||||
self._monitor(listener, (EventType.INJECTION, channel, overrd))
|
||||
else:
|
||||
self._unmonitor(listener, (EventType.INJECTION, channel, overrd))
|
||||
|
||||
def _event_cb(self, event, value):
|
||||
try:
|
||||
listeners = self.listeners[event]
|
||||
except KeyError:
|
||||
# We may still receive buffered events shortly after an unsubscription. They can be ignored.
|
||||
logger.debug("received event %s but no listener", event)
|
||||
listeners = []
|
||||
for listener in listeners:
|
||||
if event[0] == EventType.PROBE:
|
||||
listener.monitor_cb(event[1], event[2], value)
|
||||
elif event[1] == EventType.MONITOR:
|
||||
listener.injection_status_cb(event[1], event[2], value)
|
||||
else:
|
||||
raise ValueError
|
||||
|
||||
def monitor_cb(self, channel, probe, value):
|
||||
self._event_cb((EventType.PROBE, channel, probe), value)
|
||||
|
||||
def injection_status_cb(self, channel, override, value):
|
||||
self._event_cb((EventType.INJECTION, channel, override), value)
|
||||
|
||||
def remove_listener(self, listener):
|
||||
for event, listeners in list(self.listeners.items()):
|
||||
try:
|
||||
listeners.remove(listener)
|
||||
except ValueError:
|
||||
pass
|
||||
if not listeners:
|
||||
del self.listeners[event]
|
||||
if event[0] == EventType.PROBE:
|
||||
logger.debug("stopped monitoring channel %d probe %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_probe(False, event[1], event[2])
|
||||
elif event[0] == EventType.INJECTION:
|
||||
logger.debug("stopped monitoring channel %d injection %d", event[1], event[2])
|
||||
self.comm_moninj.monitor_injection(False, event[1], event[2])
|
||||
else:
|
||||
raise ValueError
|
||||
|
||||
|
||||
class ProxyConnection:
|
||||
def __init__(self, monitor_mux, reader, writer):
|
||||
self.monitor_mux = monitor_mux
|
||||
self.reader = reader
|
||||
self.writer = writer
|
||||
|
||||
async def handle(self):
|
||||
try:
|
||||
while True:
|
||||
ty = await self.reader.read(1)
|
||||
if not ty:
|
||||
return
|
||||
if ty == "\x00": # MonitorProbe
|
||||
packet = await self.reader.readexactly(6)
|
||||
enable, channel, probe = struct.unpack("<blb", packet)
|
||||
self.monitor_mux.monitor_probe(self, enable, channel, probe)
|
||||
elif ty == "\x01": # Inject
|
||||
packet = await self.reader.readexactly(6)
|
||||
channel, overrd, value = struct.unpack("<lbb", packet)
|
||||
self.monitor_mux.comm_moninj.inject(channel, overrd, value)
|
||||
elif ty == "\x02": # GetInjectionStatus
|
||||
packet = await self.reader.readexactly(5)
|
||||
channel, overrd = struct.unpack("<lb", packet)
|
||||
self.monitor_mux.comm_moninj.get_injection_status(channel, overrd)
|
||||
elif ty == "\x03": # MonitorInjection
|
||||
packet = await self.reader.readexactly(6)
|
||||
enable, channel, overrd = struct.unpack("<blb", packet)
|
||||
self.monitor_mux.monitor_injection(self, enable, channel, overrd)
|
||||
else:
|
||||
raise ValueError
|
||||
finally:
|
||||
self.monitor_mux.remove_listener(self)
|
||||
|
||||
def monitor_cb(self, channel, probe, value):
|
||||
packet = struct.pack("<blbq", 0, channel, probe, value)
|
||||
self.writer.write(packet)
|
||||
|
||||
def injection_status_cb(self, channel, override, value):
|
||||
packet = struct.pack("<blbl", 1, channel, override, value)
|
||||
self.writer.write(packet)
|
||||
|
||||
|
||||
class ProxyServer(AsyncioServer):
|
||||
def __init__(self, monitor_mux):
|
||||
AsyncioServer.__init__(self)
|
||||
self.monitor_mux = monitor_mux
|
||||
|
||||
async def _handle_connection_cr(self, reader, writer):
|
||||
line = await reader.readline()
|
||||
if line != b"ARTIQ moninj\n":
|
||||
logger.error("incorrect magic")
|
||||
return
|
||||
writer.write(b"e")
|
||||
await ProxyConnection(self.monitor_mux, reader, writer).handle()
|
||||
|
||||
|
||||
def get_argparser():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="ARTIQ moninj proxy")
|
||||
common_args.verbosity_args(parser)
|
||||
common_args.simple_network_args(parser, [
|
||||
("proxy", "proxying", 1383),
|
||||
("control", "control", 1384)
|
||||
])
|
||||
parser.add_argument("core_addr", metavar="CORE_ADDR",
|
||||
help="hostname or IP address of the core device")
|
||||
return parser
|
||||
|
||||
|
||||
class PingTarget:
|
||||
def ping(self):
|
||||
return True
|
||||
|
||||
|
||||
def main():
|
||||
args = get_argparser().parse_args()
|
||||
common_args.init_logger_from_args(args)
|
||||
|
||||
bind_adress = common_args.bind_address_from_args(args)
|
||||
|
||||
loop = asyncio.get_event_loop()
|
||||
try:
|
||||
monitor_mux = MonitorMux()
|
||||
comm_moninj = CommMonInj(monitor_mux.monitor_cb, monitor_mux.injection_status_cb)
|
||||
monitor_mux.comm_moninj = comm_moninj
|
||||
loop.run_until_complete(comm_moninj.connect(args.core_addr))
|
||||
try:
|
||||
proxy_server = ProxyServer(monitor_mux)
|
||||
loop.run_until_complete(proxy_server.start(bind_address, args.port_proxy))
|
||||
try:
|
||||
server = Server({"moninj_proxy": PingTarget()}, None, True)
|
||||
loop.run_until_complete(server.start(bind_address, args.port_control))
|
||||
try:
|
||||
loop.run_until_complete(server.wait_terminate())
|
||||
finally:
|
||||
loop.run_until_complete(server.stop())
|
||||
finally:
|
||||
loop.run_until_complete(proxy_server.stop())
|
||||
finally:
|
||||
loop.run_until_complete(comm_moninj.close())
|
||||
finally:
|
||||
loop.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -9,7 +9,7 @@ class TestFrontends(unittest.TestCase):
|
||||
"""Test --help as a simple smoke test against catastrophic breakage."""
|
||||
commands = {
|
||||
"aqctl": [
|
||||
"corelog"
|
||||
"corelog", "moninj_proxy"
|
||||
],
|
||||
"artiq": [
|
||||
"client", "compile", "coreanalyzer", "coremgmt",
|
||||
|
||||
@ -10,7 +10,9 @@ Default network ports
|
||||
+---------------------------------+--------------+
|
||||
| Core device (analyzer) | 1382 |
|
||||
+---------------------------------+--------------+
|
||||
| Core device (mon/inj) | 1383 |
|
||||
| Moninj (core device or proxy) | 1383 |
|
||||
+---------------------------------+--------------+
|
||||
| Moninj (proxy control) | 1384 |
|
||||
+---------------------------------+--------------+
|
||||
| Master (logging input) | 1066 |
|
||||
+---------------------------------+--------------+
|
||||
|
||||
@ -109,6 +109,14 @@ Core device logging controller
|
||||
:ref: artiq.frontend.aqctl_corelog.get_argparser
|
||||
:prog: aqctl_corelog
|
||||
|
||||
Moninj proxy
|
||||
------------
|
||||
|
||||
.. argparse::
|
||||
:ref: artiq.frontend.aqctl_moninj_proxy.get_argparser
|
||||
:prog: aqctl_moninj_proxy
|
||||
|
||||
|
||||
.. _core-device-rtio-analyzer-tool:
|
||||
|
||||
Core device RTIO analyzer tool
|
||||
|
||||
1
setup.py
1
setup.py
@ -33,6 +33,7 @@ console_scripts = [
|
||||
"artiq_run = artiq.frontend.artiq_run:main",
|
||||
"artiq_flash = artiq.frontend.artiq_flash:main",
|
||||
"aqctl_corelog = artiq.frontend.aqctl_corelog:main",
|
||||
"aqctl_moninj_proxy = artiq.frontend.aqctl_moninj_proxy:main",
|
||||
"afws_client = artiq.frontend.afws_client:main",
|
||||
]
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user