M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

sync_struct/Subscriber: add before_receive_cb, export reader/writer

This commit is contained in:
Sebastien Bourdeauducq 2015-02-07 01:13:15 +08:00
parent 8979d9d5e7
commit 0d0a05a487
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/protocols/sync_struct.py
View File

@ -64,17 +64,19 @@ class Subscriber:
self.notify_cb = notify_cb
@asyncio.coroutine
def connect(self, host, port):
self._reader, self._writer = \
def connect(self, host, port, before_receive_cb=None):
self.reader, self.writer = \
yield from asyncio.open_connection(host, port)
try:
self._writer.write(_init_string)
self._writer.write((self.notifier_name + "\n").encode())
if before_receive_cb is not None:
before_receive_cb()
self.writer.write(_init_string)
self.writer.write((self.notifier_name + "\n").encode())
self.receive_task = asyncio.Task(self._receive_cr())
except:
self._writer.close()
del self._reader
del self._writer
self.writer.close()
del self.reader
del self.writer
raise
@asyncio.coroutine
@ -86,15 +88,15 @@ class Subscriber:
except asyncio.CancelledError:
pass
finally:
self._writer.close()
del self._reader
del self._writer
self.writer.close()
del self.reader
del self.writer
@asyncio.coroutine
def _receive_cr(self):
targets = []
while True:
line = yield from self._reader.readline()
line = yield from self.reader.readline()
if not line:
return
mod = pyon.decode(line.decode())