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

aqctl_moninj_proxy: fix all major bugs

This commit is contained in:
Sebastien Bourdeauducq 2022-03-19 19:06:12 +08:00
parent bbb2c75194
commit d3073022ac
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/frontend/aqctl_moninj_proxy.py
View File

@ -88,7 +88,7 @@ class MonitorMux:
for listener in listeners: for listener in listeners:
if event[0] == EventType.PROBE: if event[0] == EventType.PROBE:
listener.monitor_cb(event[1], event[2], value) listener.monitor_cb(event[1], event[2], value)
elif event[1] == EventType.MONITOR: elif event[0] == EventType.INJECTION:
listener.injection_status_cb(event[1], event[2], value) listener.injection_status_cb(event[1], event[2], value)
else: else:
raise ValueError raise ValueError
@ -129,19 +129,19 @@ class ProxyConnection:
ty = await self.reader.read(1) ty = await self.reader.read(1)
if not ty: if not ty:
return return
if ty == "\x00": # MonitorProbe if ty == b"\x00": # MonitorProbe
packet = await self.reader.readexactly(6) packet = await self.reader.readexactly(6)
enable, channel, probe = struct.unpack("<blb", packet) enable, channel, probe = struct.unpack("<blb", packet)
self.monitor_mux.monitor_probe(self, enable, channel, probe) self.monitor_mux.monitor_probe(self, enable, channel, probe)
elif ty == "\x01": # Inject elif ty == b"\x01": # Inject
packet = await self.reader.readexactly(6) packet = await self.reader.readexactly(6)
channel, overrd, value = struct.unpack("<lbb", packet) channel, overrd, value = struct.unpack("<lbb", packet)
self.monitor_mux.comm_moninj.inject(channel, overrd, value) self.monitor_mux.comm_moninj.inject(channel, overrd, value)
elif ty == "\x02": # GetInjectionStatus elif ty == b"\x02": # GetInjectionStatus
packet = await self.reader.readexactly(5) packet = await self.reader.readexactly(5)
channel, overrd = struct.unpack("<lb", packet) channel, overrd = struct.unpack("<lb", packet)
self.monitor_mux.comm_moninj.get_injection_status(channel, overrd) self.monitor_mux.comm_moninj.get_injection_status(channel, overrd)
elif ty == "\x03": # MonitorInjection elif ty == b"\x03": # MonitorInjection
packet = await self.reader.readexactly(6) packet = await self.reader.readexactly(6)
enable, channel, overrd = struct.unpack("<blb", packet) enable, channel, overrd = struct.unpack("<blb", packet)
self.monitor_mux.monitor_injection(self, enable, channel, overrd) self.monitor_mux.monitor_injection(self, enable, channel, overrd)
@ -155,7 +155,7 @@ class ProxyConnection:
self.writer.write(packet) self.writer.write(packet)
def injection_status_cb(self, channel, override, value): def injection_status_cb(self, channel, override, value):
packet = struct.pack("<blbl", 1, channel, override, value) packet = struct.pack("<blbb", 1, channel, override, value)
self.writer.write(packet) self.writer.write(packet)
@ -195,7 +195,7 @@ def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
common_args.init_logger_from_args(args) common_args.init_logger_from_args(args)
bind_adress = common_args.bind_address_from_args(args) bind_address = common_args.bind_address_from_args(args)
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
try: try: