forked from M-Labs/artiq
1
0
Fork 0

coredevice/comm_tcp: support retrieving analyzer data

This commit is contained in:
Sebastien Bourdeauducq 2015-12-18 18:22:50 +08:00
parent 52102a1a79
commit 0832c71a66
1 changed files with 23 additions and 6 deletions

View File

@ -24,20 +24,26 @@ def set_keepalive(sock, after_idle, interval, max_fails):
sys.platform) sys.platform)
def initialize_connection(host, port):
sock = socket.create_connection((host, port), 5.0)
sock.settimeout(None)
set_keepalive(sock, 3, 2, 3)
logger.debug("connected to host %s on port %d", host, port)
sock.sendall(b"ARTIQ coredev\n")
return sock
class Comm(CommGeneric): class Comm(CommGeneric):
def __init__(self, dmgr, host, port=1381): def __init__(self, dmgr, host, port=1381, port_analyzer=1382):
super().__init__() super().__init__()
self.host = host self.host = host
self.port = port self.port = port
self.port_analyzer = port_analyzer
def open(self): def open(self):
if hasattr(self, "socket"): if hasattr(self, "socket"):
return return
self.socket = socket.create_connection((self.host, self.port), 5.0) self.socket = initialize_connection(self.host, self.port)
self.socket.settimeout(None)
set_keepalive(self.socket, 3, 2, 3)
logger.debug("connected to host %s on port %d", self.host, self.port)
self.write(b"ARTIQ coredev\n")
def close(self): def close(self):
if not hasattr(self, "socket"): if not hasattr(self, "socket"):
@ -57,3 +63,14 @@ class Comm(CommGeneric):
def write(self, data): def write(self, data):
self.socket.sendall(data) self.socket.sendall(data)
def get_analyzer_dump(self):
sock = initialize_connection(self.host, self.port_analyzer)
r = bytes()
while True:
buf = sock.recv(8192)
if not buf:
break
r += buf
sock.close()
return r