M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 19:28:26 +08:00
Code Issues Projects Releases Wiki Activity

coredevice: do not desync kernel TCP stream on RPCReturnValueError.

Browse Source 
And propagate the error upwards instead of trying to squeeze it
through the core device in futility.
This commit is contained in:
whitequark 2017-06-25 04:47:32 +00:00
parent fdb24ef139
commit 31b52ff1b3
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/comm_kernel.py
View File

@ -524,6 +524,8 @@ class CommKernel:
self._write_header(_H2DMsgType.RPC_REPLY) self._write_header(_H2DMsgType.RPC_REPLY)
self._write_bytes(return_tags) self._write_bytes(return_tags)
self._send_rpc_value(bytearray(return_tags), result, result, service) self._send_rpc_value(bytearray(return_tags), result, result, service)
except RPCReturnValueError as exn:
raise
except Exception as exn: except Exception as exn:
logger.debug("rpc service: %d %r %r ! %r", service_id, args, kwargs, exn) logger.debug("rpc service: %d %r %r ! %r", service_id, args, kwargs, exn)

33
artiq/test/coredevice/test_embedding.py
View File

@ -3,6 +3,7 @@ from time import sleep
from artiq.experiment import * from artiq.experiment import *
from artiq.test.hardware_testbench import ExperimentCase from artiq.test.hardware_testbench import ExperimentCase
from artiq.coredevice.comm_kernel import RPCReturnValueError
class _Roundtrip(EnvExperiment): class _Roundtrip(EnvExperiment):
@ -96,6 +97,12 @@ class _RPCTypes(EnvExperiment):
def return_str(self) -> TStr: def return_str(self) -> TStr:
return "foo" return "foo"
def return_bytes(self) -> TBytes:
return b"foo"
def return_bytearray(self) -> TByteArray:
return bytearray(b"foo")
def return_tuple(self) -> TTuple([TInt32, TInt32]): def return_tuple(self) -> TTuple([TInt32, TInt32]):
return (1, 2) return (1, 2)
@ -105,6 +112,9 @@ class _RPCTypes(EnvExperiment):
def return_range(self) -> TRange32: def return_range(self) -> TRange32:
return range(10) return range(10)
def return_mismatch(self):
return b"foo"
@kernel @kernel
def run_recv(self): def run_recv(self):
core_log(self.return_bool()) core_log(self.return_bool())
@ -112,6 +122,8 @@ class _RPCTypes(EnvExperiment):
core_log(self.return_int64()) core_log(self.return_int64())
core_log(self.return_float()) core_log(self.return_float())
core_log(self.return_str()) core_log(self.return_str())
core_log(self.return_bytes())
core_log(self.return_bytearray())
core_log(self.return_tuple()) core_log(self.return_tuple())
core_log(self.return_list()) core_log(self.return_list())
core_log(self.return_range()) core_log(self.return_range())
@ -126,20 +138,31 @@ class _RPCTypes(EnvExperiment):
self.accept(0x100000000) self.accept(0x100000000)
self.accept(1.0) self.accept(1.0)
self.accept("foo") self.accept("foo")
self.accept(b"foo")
self.accept(bytearray(b"foo"))
self.accept((2, 3)) self.accept((2, 3))
self.accept([1, 2]) self.accept([1, 2])
self.accept(range(10)) self.accept(range(10))
self.accept(self) self.accept(self)
def run(self): @kernel
self.run_send() def run_mismatch(self):
self.run_recv() self.return_mismatch()
class RPCTypesTest(ExperimentCase): class RPCTypesTest(ExperimentCase):
def test_args(self): def test_send(self):
exp = self.create(_RPCTypes) exp = self.create(_RPCTypes)
exp.run() exp.run_send()
def test_recv(self):
exp = self.create(_RPCTypes)
exp.run_send()
def test_mismatch(self):
exp = self.create(_RPCTypes)
with self.assertRaises(RPCReturnValueError):
exp.run_mismatch()
class _RPCCalls(EnvExperiment): class _RPCCalls(EnvExperiment):