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

minimize locking

Browse Source
This commit is contained in:
Olivier R-D 2013-04-11 09:52:33 +02:00
parent 83e2b7e164
commit 8e0538ab09
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
urx/ursecmon.py
View File

@ -190,7 +190,6 @@ class SecondaryMonitor(Thread):
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger(self.__class__.__name__)
self.logger.setLevel(logLevel) self.logger.setLevel(logLevel)
self._parser = ParserUtils(parserLogLevel) self._parser = ParserUtils(parserLogLevel)
self._s_secondary = None
self._dict = {} self._dict = {}
self._dictLock = Lock() self._dictLock = Lock()
self.host = host self.host = host
@ -211,11 +210,11 @@ class SecondaryMonitor(Thread):
send program to robot in URRobot format send program to robot in URRobot format
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()
self.logger.debug("Sending program: " + prog)
if type(prog) != bytes:
prog = prog.encode()
with self._prog_queue_lock: with self._prog_queue_lock:
prog.strip()
self.logger.debug("Sending program: " + prog)
if type(prog) != bytes:
prog = prog.encode()
self._prog_queue.append(prog + b"\n") self._prog_queue.append(prog + b"\n")
@ -236,8 +235,9 @@ class SecondaryMonitor(Thread):
data = self._get_data() data = self._get_data()
try: try:
tmpdict = self._parser.parse(data)
with self._dictLock: with self._dictLock:
self._dict = self._parser.parse(data) self._dict = tmpdict
except ParsingException as ex: except ParsingException as ex:
self.logger.warn("Error parsing one packet from urrobot: " + str(ex) ) self.logger.warn("Error parsing one packet from urrobot: " + str(ex) )
continue continue