beremiz

Added a semaphore when starting runtime's python thread to make sure startPLC doesn't return before PLC is really initialized.

2012-02-16, Edouard Tisserant
ef60d7e188e6
Parents dac752b613bb
Children bb340874f09e
Added a semaphore when starting runtime's python thread to make sure startPLC doesn't return before PLC is really initialized.
1 files changed, 6 insertions(+), 2 deletions(-)
  • +6 -2
    runtime/PLCObject.py
    • --- a/runtime/PLCObject.py Thu Feb 16 14:57:04 2012 +0100
    +++ b/runtime/PLCObject.py Thu Feb 16 15:13:05 2012 +0100
    @@ -23,7 +23,7 @@
    #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    import Pyro.core as pyro
    -from threading import Timer, Thread, Lock
    +from threading import Timer, Thread, Lock, Semaphore
    import ctypes, os, commands, types, sys
    from targets.typemapping import SameEndianessTypeTranslator as TypeTranslator
    @@ -217,6 +217,7 @@
    if self._startPLC(len(self.argv),c_argv(*self.argv)) == 0:
    self.PLCStatus = "Started"
    self.StatusChange()
    + self.StartSem.release()
    self.evaluator(self.PrepareRuntimePy)
    res,cmd = "None","None"
    while True:
    @@ -240,14 +241,17 @@
    if error is not None:
    PLCprint("Problem %s PLC"%error)
    self.PLCStatus = "Broken"
    + self.StatusChange()
    + self.StartSem.release()
    self._FreePLC()
    def StartPLC(self):
    PLCprint("StartPLC")
    if self.CurrentPLCFilename is not None and self.PLCStatus == "Stopped":
    - self.PLCStatus = "Started"
    + self.StartSem=Semaphore(0)
    self.PythonThread = Thread(target=self.PythonThreadProc)
    self.PythonThread.start()
    + self.StartSem.acquire()
    def StopPLC(self):
    PLCprint("StopPLC")