adeck/python-urx-getl-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wait for program to be really send before returning

Browse Source 
could trigger a bug where a move command is send
after many very short commands such as set_digitial_out
This commit is contained in:
Olivier R-D 2015-06-03 09:03:29 +02:00
parent 0c3608848d
commit 132c8b4e2a
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
urx/ursecmon.py
View File

@ -25,6 +25,15 @@ class ParsingException(Exception):
def __init__(self, *args): def __init__(self, *args):
Exception.__init__(self, *args) Exception.__init__(self, *args)
class Program(object):
def __init__(self, prog):
self.program = prog
self.condition = Condition()
def __str__(self):
return "Program({})".format(self.program)
__repr__ = __str__
class TimeoutException(Exception): class TimeoutException(Exception):
@ -35,7 +44,7 @@ class TimeoutException(Exception):
class ParserUtils(object): class ParserUtils(object):
def __init__(self): def __init__(self):
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger("ursecmon")
self.is_v30 = False self.is_v30 = False
def parse(self, data): def parse(self, data):
@ -203,7 +212,7 @@ class SecondaryMonitor(Thread):
def __init__(self, host): def __init__(self, host):
Thread.__init__(self) Thread.__init__(self)
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger("ursecmon")
self._parser = ParserUtils() self._parser = ParserUtils()
self._dict = {} self._dict = {}
self._dictLock = Lock() self._dictLock = Lock()
@ -227,11 +236,16 @@ class SecondaryMonitor(Thread):
If another program is send while a program is running the first program is aborded. If another program is send while a program is running the first program is aborded.
""" """
prog.strip() prog.strip()
self.logger.debug("Sending program: " + prog) self.logger.debug("Enqueueing program: %s", prog)
if not isinstance(prog, bytes): if not isinstance(prog, bytes):
prog = prog.encode() prog = prog.encode()
with self._prog_queue_lock:
self._prog_queue.append(prog + b"\n") data = Program(prog + b"\n")
with data.condition:
with self._prog_queue_lock:
self._prog_queue.append(data)
data.condition.wait()
self.logger.debug("program sendt: %s", data)
def run(self): def run(self):
""" """
@ -240,12 +254,13 @@ class SecondaryMonitor(Thread):
Only the last connected client is the primary client, Only the last connected client is the primary client,
so this is not guaranted and we cannot rely on information to the primary client. so this is not guaranted and we cannot rely on information to the primary client.
""" """
while not self._trystop: while not self._trystop:
with self._prog_queue_lock: with self._prog_queue_lock:
if len(self._prog_queue) > 0: if len(self._prog_queue) > 0:
prog = self._prog_queue.pop(0) data = self._prog_queue.pop(0)
self._s_secondary.send(prog) self._s_secondary.send(data.program)
with data.condition:
data.condition.notify_all()
data = self._get_data() data = self._get_data()
try: try: