beremiz

runtime: fix bugs introduced in previous commit, and refactor some code
wxPython4
2022-08-16, Edouard Tisserant
efdefbad49eb
Parents 8a54fd58a552
Children cbc6a6ccd52e
runtime: fix bugs introduced in previous commit, and refactor some code
2 files changed, 27 insertions(+), 35 deletions(-)
  • +24 -33
    Beremiz_service.py
  • +3 -2
    runtime/Worker.py
    • --- a/Beremiz_service.py Tue Aug 16 19:52:49 2022 +0200
    +++ b/Beremiz_service.py Tue Aug 16 23:42:42 2022 +0200
    @@ -37,6 +37,7 @@
    from builtins import str as text
    from past.builtins import execfile
    from six.moves import builtins
    +from functools import partial
    import runtime
    from runtime.PyroServer import PyroServer
    @@ -547,30 +548,6 @@
    except Exception:
    LogMessageAndException(_("WAMP client startup failed. "))
    -if havetwisted or havewx:
    - if havetwisted:
    - # reactor._installSignalHandlersAgain()
    - waker_func = reactor._runInMainThread
    - def ui_blocking_call():
    - # FIXME: had to disable SignaHandlers install because
    - # signal not working in non-main thread
    - reactor.run(installSignalHandlers=False)
    - else:
    - waker_func = wx.CallAfter
    - ui_blocking_call = app.MainLoop
    -
    - def ui_launched_report():
    - # IDE expects to see that string to stop waiting for runtime
    - # to be ready and connnect to it.
    - print("UI thread started successfully.")
    -
    - # This orders ui loop to signal when ready on Stdout
    - if havetwisted:
    - reactor.callLater(0, ui_launched_report)
    - else:
    - wx.CallAfter(ui_launched_report)
    -
    -
    pyro_thread = None
    def FirstWorkerJob():
    @@ -601,19 +578,33 @@
    runtime.GetPLCObjectSingleton().AutoLoad(autostart)
    -try:
    - if havetwisted or havewx:
    - # worker that copes with wx and (wx)reactor
    - runtime.MainWorker.interleave(waker_func, FirstWorkerJob)
    - ui_blocking_call()
    - runtime.MainWorker.stop()
    +if havetwisted or havewx:
    +
    + waker_func = wx.CallAfter if havewx else partial(reactor.callLater,0)
    +
    + # This orders ui loop to signal when ready on Stdout
    + waker_func(print,"UI thread started successfully.")
    +
    + # worker that copes with wx and (wx)reactor
    + runtime.MainWorker.interleave(waker_func, FirstWorkerJob)
    - else:
    + try:
    + if havetwisted:
    + reactor.run(installSignalHandlers=False)
    + else:
    + app.MainLoop
    + except KeyboardInterrupt:
    + pass
    +
    + runtime.MainWorker.stop()
    +
    +else:
    + try:
    # blocking worker loop
    runtime.MainWorker.runloop(FirstWorkerJob)
    + except KeyboardInterrupt:
    + pass
    -except KeyboardInterrupt:
    - pass
    pyroserver.Quit()
    pyro_thread.join()
    --- a/runtime/Worker.py Tue Aug 16 19:52:49 2022 +0200
    +++ b/runtime/Worker.py Tue Aug 16 23:42:42 2022 +0200
    @@ -123,9 +123,10 @@
    self.feed.wait()
    self.mutex.release()
    - self.own_thread = Thread(target = wakerfeedingloop).start()
    + self.own_thread = Thread(target = wakerfeedingloop)
    + self.own_thread.start()
    - def stop():
    + def stop(self):
    """
    !interleave
    """