connectors/__init__.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Thu, 28 Apr 2016 13:05:57 +0300
changeset 1507 d7f474d10210
parent 1455 4ba27ed51e48
child 1571 486f94a8032c
permissions -rwxr-xr-x
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.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     1
#!/usr/bin/env python
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     2
# -*- coding: utf-8 -*-
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     3
#
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
     4
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     5
#
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
     6
# See COPYING file for copyrights details.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     7
#
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
     8
# This library is free software; you can redistribute it and/or
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
     9
# modify it under the terms of the GNU General Public
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    10
# License as published by the Free Software Foundation; either
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    11
# version 2.1 of the License, or (at your option) any later version.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    12
#
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    13
# This library is distributed in the hope that it will be useful,
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    16
# General Public License for more details.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    17
#
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    18
# You should have received a copy of the GNU General Public
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    19
# License along with this library; if not, write to the Free Software
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    20
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    21
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    22
# Package initialisation
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    23
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    24
from os import listdir, path
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    25
399
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 298
diff changeset
    26
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    27
_base_path = path.split(__file__)[0]
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    28
399
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 298
diff changeset
    29
733
915be999f3f0 targets and connectors are nor extensible
Edouard Tisserant
parents: 717
diff changeset
    30
def _GetLocalConnectorClassFactory(name):
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    31
    return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_factory")
733
915be999f3f0 targets and connectors are nor extensible
Edouard Tisserant
parents: 717
diff changeset
    32
1440
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    33
connectors = {name:_GetLocalConnectorClassFactory(name)
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    34
                  for name in listdir(_base_path)
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    35
                      if path.isdir(path.join(_base_path, name))
733
915be999f3f0 targets and connectors are nor extensible
Edouard Tisserant
parents: 717
diff changeset
    36
                          and not name.startswith("__")}
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    37
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    38
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 591
diff changeset
    39
def ConnectorFactory(uri, confnodesroot):
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    40
    """
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    41
    Return a connector corresponding to the URI
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    42
    or None if cannot connect to URI
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    43
    """
1440
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    44
    servicetype = uri.split("://")[0].upper()
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    45
    if servicetype == "LOCAL":
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    46
        # Local is special case
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    47
        # pyro connection to local runtime
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    48
        # started on demand, listening on random port
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    49
        servicetype = "PYRO"
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    50
        runtime_port = confnodesroot.AppFrame.StartLocalRuntime(
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    51
            taskbaricon=True)
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    52
        uri = "PYROLOC://127.0.0.1:" + str(runtime_port)
1440
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    53
    elif servicetype in connectors:
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    54
        pass
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    55
    elif servicetype[-1] == 'S' and servicetype[:-1] in connectors:
1440
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    56
        servicetype = servicetype[:-1]
1455
4ba27ed51e48 add pyrossl client side
Ronan Bignaux <r.bignaux@rbi.io>
parents: 1440
diff changeset
    57
    else:
1440
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    58
        return None
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    59
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    60
    # import module according to uri type
e8daabf2c438 Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes
Edouard Tisserant
parents: 763
diff changeset
    61
    connectorclass = connectors[servicetype]()
733
915be999f3f0 targets and connectors are nor extensible
Edouard Tisserant
parents: 717
diff changeset
    62
    return connectorclass(uri, confnodesroot)