editors/IECCodeViewer.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Thu, 28 Apr 2016 13:05:57 +0300
changeset 1507 d7f474d10210
parent 1262 7b9259945453
child 1511 91538d0c242c
permissions -rw-r--r--
fix issue with sometimes wrong return code of ProcessLogger


As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list

The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.

Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     1
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     2
from editors.TextViewer import TextViewer
1057
3837e165b3f9 Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents: 815
diff changeset
     3
from plcopen.plcopen import TestTextElement
815
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     4
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     5
class IECCodeViewer(TextViewer):
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     6
    
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     7
    def __del__(self):
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     8
        TextViewer.__del__(self)
e4f24593a758 Adding support for extending internationalization to extensions
laurent
parents:
diff changeset
     9
        if getattr(self, "_OnClose"):
1057
3837e165b3f9 Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents: 815
diff changeset
    10
            self._OnClose(self)
1262
7b9259945453 Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents: 1057
diff changeset
    11
    
7b9259945453 Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents: 1057
diff changeset
    12
    def Paste(self):
7b9259945453 Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents: 1057
diff changeset
    13
        if self.Controler is not None:
7b9259945453 Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents: 1057
diff changeset
    14
            TextViewer.Paste(self)
7b9259945453 Fixed bug with Copy/Paste in generated ST code Viewer
Laurent Bessard
parents: 1057
diff changeset
    15
    
1057
3837e165b3f9 Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents: 815
diff changeset
    16
    def Search(self, criteria):
3837e165b3f9 Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents: 815
diff changeset
    17
        return [((self.TagName, "body", 0),) + result for result in TestTextElement(self.Editor.GetText(), criteria)]