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

comm_kernel: cleanup

This commit is contained in:
Sebastien Bourdeauducq 2020-04-12 16:02:36 +08:00
parent 9dc24f255e
commit de57039e6e
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
artiq/coredevice/comm_kernel.py
View File

@ -92,7 +92,11 @@ class CommKernel:
del self.socket del self.socket
logger.debug("disconnected") logger.debug("disconnected")
def read(self, length): #
# Reader interface
#
def _read(self, length):
r = bytes() r = bytes()
while len(r) < length: while len(r) < length:
rn = self.socket.recv(min(8192, length - len(r))) rn = self.socket.recv(min(8192, length - len(r)))
@ -101,27 +105,20 @@ class CommKernel:
r += rn r += rn
return r return r
def write(self, data):
self.socket.sendall(data)
#
# Reader interface
#
def _read_header(self): def _read_header(self):
self.open() self.open()
# Wait for a synchronization sequence, 5a 5a 5a 5a. # Wait for a synchronization sequence, 5a 5a 5a 5a.
sync_count = 0 sync_count = 0
while sync_count < 4: while sync_count < 4:
(sync_byte, ) = struct.unpack("B", self.read(1)) (sync_byte, ) = struct.unpack("B", self._read(1))
if sync_byte == 0x5a: if sync_byte == 0x5a:
sync_count += 1 sync_count += 1
else: else:
sync_count = 0 sync_count = 0
# Read message header. # Read message header.
(raw_type, ) = struct.unpack("B", self.read(1)) (raw_type, ) = struct.unpack("B", self._read(1))
self._read_type = Reply(raw_type) self._read_type = Reply(raw_type)
logger.debug("receiving message: type=%r", logger.debug("receiving message: type=%r",
@ -136,30 +133,27 @@ class CommKernel:
self._read_header() self._read_header()
self._read_expect(ty) self._read_expect(ty)
def _read_chunk(self, length):
return self.read(length)
def _read_int8(self): def _read_int8(self):
(value, ) = struct.unpack("B", self._read_chunk(1)) (value, ) = struct.unpack("B", self._read(1))
return value return value
def _read_int32(self): def _read_int32(self):
(value, ) = struct.unpack(">l", self._read_chunk(4)) (value, ) = struct.unpack(">l", self._read(4))
return value return value
def _read_int64(self): def _read_int64(self):
(value, ) = struct.unpack(">q", self._read_chunk(8)) (value, ) = struct.unpack(">q", self._read(8))
return value return value
def _read_float64(self): def _read_float64(self):
(value, ) = struct.unpack(">d", self._read_chunk(8)) (value, ) = struct.unpack(">d", self._read(8))
return value return value
def _read_bool(self): def _read_bool(self):
return True if self._read_int8() else False return True if self._read_int8() else False
def _read_bytes(self): def _read_bytes(self):
return self._read_chunk(self._read_int32()) return self._read(self._read_int32())
def _read_string(self): def _read_string(self):
return self._read_bytes().decode("utf-8") return self._read_bytes().decode("utf-8")
@ -168,38 +162,41 @@ class CommKernel:
# Writer interface # Writer interface
# #
def _write(self, data):
self.socket.sendall(data)
def _write_header(self, ty): def _write_header(self, ty):
self.open() self.open()
logger.debug("sending message: type=%r", ty) logger.debug("sending message: type=%r", ty)
# Write synchronization sequence and header. # Write synchronization sequence and header.
self.write(struct.pack(">lB", 0x5a5a5a5a, ty.value)) self._write(struct.pack(">lB", 0x5a5a5a5a, ty.value))
def _write_empty(self, ty): def _write_empty(self, ty):
self._write_header(ty) self._write_header(ty)
def _write_chunk(self, chunk): def _write_chunk(self, chunk):
self.write(chunk) self._write(chunk)
def _write_int8(self, value): def _write_int8(self, value):
self.write(struct.pack("B", value)) self._write(struct.pack("B", value))
def _write_int32(self, value): def _write_int32(self, value):
self.write(struct.pack(">l", value)) self._write(struct.pack(">l", value))
def _write_int64(self, value): def _write_int64(self, value):
self.write(struct.pack(">q", value)) self._write(struct.pack(">q", value))
def _write_float64(self, value): def _write_float64(self, value):
self.write(struct.pack(">d", value)) self._write(struct.pack(">d", value))
def _write_bool(self, value): def _write_bool(self, value):
self.write(struct.pack("B", value)) self._write(struct.pack("B", value))
def _write_bytes(self, value): def _write_bytes(self, value):
self._write_int32(len(value)) self._write_int32(len(value))
self.write(value) self._write(value)
def _write_string(self, value): def _write_string(self, value):
self._write_bytes(value.encode("utf-8")) self._write_bytes(value.encode("utf-8"))
@ -207,12 +204,13 @@ class CommKernel:
# #
# Exported APIs # Exported APIs
# #
def check_system_info(self): def check_system_info(self):
self._write_empty(Request.SystemInfo) self._write_empty(Request.SystemInfo)
self._read_header() self._read_header()
self._read_expect(Reply.SystemInfo) self._read_expect(Reply.SystemInfo)
runtime_id = self._read_chunk(4) runtime_id = self._read(4)
if runtime_id != b"AROR": if runtime_id != b"AROR":
raise UnsupportedDevice("Unsupported runtime ID: {}" raise UnsupportedDevice("Unsupported runtime ID: {}"
.format(runtime_id)) .format(runtime_id))