beremiz

Arbitrary variable forcing

2009-12-07, Edouard TISSERANT
f66a092b6e74
Parents 92f449479084
Children 029688dad14d
Arbitrary variable forcing
3 files changed, 53 insertions(+), 41 deletions(-)
  • +5 -2
    connectors/PYRO/__init__.py
  • +38 -34
    runtime/PLCObject.py
  • +10 -5
    targets/plc_debug.c
    • --- a/connectors/PYRO/__init__.py Mon Dec 07 21:27:23 2009 +0100
    +++ b/connectors/PYRO/__init__.py Mon Dec 07 22:04:43 2009 +0100
    @@ -20,6 +20,7 @@
    #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    import Pyro.core as pyro
    from Pyro.errors import PyroError
    +import Pyro.util
    import traceback
    from time import sleep
    import copy
    @@ -55,9 +56,11 @@
    def catcher_func(*args,**kwargs):
    try:
    return func(*args,**kwargs)
    - except PyroError,e:
    + except Exception,e:
    #pluginsroot.logger.write_error(traceback.format_exc())
    - pluginsroot.logger.write_error(str(e)+"\n")
    + errmess = ''.join(Pyro.util.getPyroTraceback(e))
    + pluginsroot.logger.write_error(errmess+"\n")
    + print errmess
    pluginsroot._connector = None
    return default
    return catcher_func
    --- a/runtime/PLCObject.py Mon Dec 07 21:27:23 2009 +0100
    +++ b/runtime/PLCObject.py Mon Dec 07 22:04:43 2009 +0100
    @@ -132,7 +132,7 @@
    self._RegisterDebugVariable = self.PLClibraryHandle.RegisterDebugVariable
    self._RegisterDebugVariable.restype = None
    - self._RegisterDebugVariable.argtypes = [ctypes.c_int]
    + self._RegisterDebugVariable.argtypes = [ctypes.c_int, ctypes.c_void_p]
    self._FreeDebugData = self.PLClibraryHandle.FreeDebugData
    self._FreeDebugData.restype = None
    @@ -327,6 +327,36 @@
    except:
    return False
    +
    + class IEC_STRING(ctypes.Structure):
    + """
    + Must be changed according to changes in iec_types.h
    + """
    + _fields_ = [("len", ctypes.c_uint8),
    + ("body", ctypes.c_char * 126)]
    +
    + TypeTranslator = {"BOOL" : (ctypes.c_uint8, lambda x:x.value!=0, lambda t,x:t(x)),
    + "STEP" : (ctypes.c_uint8, lambda x:x.value, lambda t,x:t(x)),
    + "TRANSITION" : (ctypes.c_uint8, lambda x:x.value, lambda t,x:t(x)),
    + "ACTION" : (ctypes.c_uint8, lambda x:x.value, lambda t,x:t(x)),
    + "SINT" : (ctypes.c_int8, lambda x:x.value, lambda t,x:t(x)),
    + "USINT" : (ctypes.c_uint8, lambda x:x.value, lambda t,x:t(x)),
    + "BYTE" : (ctypes.c_uint8, lambda x:x.value, lambda t,x:t(x)),
    + "STRING" : (IEC_STRING, lambda x:x.body[:x.len], lambda t,x:t(len(x),x)),
    + "INT" : (ctypes.c_int16, lambda x:x.value, lambda t,x:t(x)),
    + "UINT" : (ctypes.c_uint16, lambda x:x.value, lambda t,x:t(x)),
    + "WORD" : (ctypes.c_uint16, lambda x:x.value, lambda t,x:t(x)),
    + "WSTRING" : (None, None, None),#TODO
    + "DINT" : (ctypes.c_int32, lambda x:x.value, lambda t,x:t(x)),
    + "UDINT" : (ctypes.c_uint32, lambda x:x.value, lambda t,x:t(x)),
    + "DWORD" : (ctypes.c_uint32, lambda x:x.value, lambda t,x:t(x)),
    + "LINT" : (ctypes.c_int64, lambda x:x.value, lambda t,x:t(x)),
    + "ULINT" : (ctypes.c_uint64, lambda x:x.value, lambda t,x:t(x)),
    + "LWORD" : (ctypes.c_uint64, lambda x:x.value, lambda t,x:t(x)),
    + "REAL" : (ctypes.c_float, lambda x:x.value, lambda t,x:t(x)),
    + "LREAL" : (ctypes.c_double, lambda x:x.value, lambda t,x:t(x)),
    + }
    +
    def SetTraceVariablesList(self, idxs):
    """
    Call ctype imported function to append
    @@ -338,42 +368,16 @@
    # keep a copy of requested idx
    self._Idxs = idxs[:]
    self._ResetDebugVariables()
    - for idx,iectype in idxs:
    - self._RegisterDebugVariable(idx)
    + for idx,iectype,force in idxs:
    + if force !=None:
    + c_type,unpack_func, pack_func = self.TypeTranslator.get(iectype, (None,None,None))
    + force = ctypes.byref(pack_func(c_type,force))
    + self._RegisterDebugVariable(idx, force)
    self._resumeDebug()
    else:
    self._suspendDebug(True)
    self._Idxs = []
    - class IEC_STRING(ctypes.Structure):
    - """
    - Must be changed according to changes in iec_types.h
    - """
    - _fields_ = [("len", ctypes.c_uint8),
    - ("body", ctypes.c_char * 126)]
    -
    - TypeTranslator = {"BOOL" : (ctypes.c_uint8, lambda x:x.value!=0),
    - "STEP" : (ctypes.c_uint8, lambda x:x.value),
    - "TRANSITION" : (ctypes.c_uint8, lambda x:x.value),
    - "ACTION" : (ctypes.c_uint8, lambda x:x.value),
    - "SINT" : (ctypes.c_int8, lambda x:x.value),
    - "USINT" : (ctypes.c_uint8, lambda x:x.value),
    - "BYTE" : (ctypes.c_uint8, lambda x:x.value),
    - "STRING" : (IEC_STRING, lambda x:x.body[:x.len]),
    - "INT" : (ctypes.c_int16, lambda x:x.value),
    - "UINT" : (ctypes.c_uint16, lambda x:x.value),
    - "WORD" : (ctypes.c_uint16, lambda x:x.value),
    - "WSTRING" : (None, None),#TODO
    - "DINT" : (ctypes.c_int32, lambda x:x.value),
    - "UDINT" : (ctypes.c_uint32, lambda x:x.value),
    - "DWORD" : (ctypes.c_uint32, lambda x:x.value),
    - "LINT" : (ctypes.c_int64, lambda x:x.value),
    - "ULINT" : (ctypes.c_uint64, lambda x:x.value),
    - "LWORD" : (ctypes.c_uint64, lambda x:x.value),
    - "REAL" : (ctypes.c_float, lambda x:x.value),
    - "LREAL" : (ctypes.c_double, lambda x:x.value),
    - }
    -
    def GetTraceVariables(self):
    """
    Return a list of variables, corresponding to the list of required idx
    @@ -386,9 +390,9 @@
    buffer = ctypes.c_void_p()
    offset = 0
    if self._GetDebugData(ctypes.byref(tick),ctypes.byref(size),ctypes.byref(buffer)) == 0 :
    - for idx, iectype in self._Idxs:
    + for idx, iectype, forced in self._Idxs:
    cursor = ctypes.c_void_p(buffer.value + offset)
    - c_type,unpack_func = self.TypeTranslator.get(iectype, (None,None))
    + c_type,unpack_func, pack_func = self.TypeTranslator.get(iectype, (None,None,None))
    if c_type is not None and offset < size:
    res.append(unpack_func(ctypes.cast(cursor,
    ctypes.POINTER(c_type)).contents))
    --- a/targets/plc_debug.c Mon Dec 07 21:27:23 2009 +0100
    +++ b/targets/plc_debug.c Mon Dec 07 22:04:43 2009 +0100
    @@ -146,15 +146,20 @@
    #define __RegisterDebugVariable_case_t(TYPENAME) \
    case TYPENAME##_ENUM :\
    - ((__IEC_##TYPENAME##_t *)varp)->flags |= __IEC_DEBUG_FLAG;\
    + ((__IEC_##TYPENAME##_t *)varp)->flags |= flags;\
    + if(force)\
    + ((__IEC_##TYPENAME##_t *)varp)->value = *((TYPENAME *)force);\
    break;
    #define __RegisterDebugVariable_case_p(TYPENAME)\
    case TYPENAME##_P_ENUM :\
    - ((__IEC_##TYPENAME##_p *)varp)->flags |= __IEC_DEBUG_FLAG;\
    + ((__IEC_##TYPENAME##_p *)varp)->flags |= flags;\
    + if(force)\
    + ((__IEC_##TYPENAME##_p *)varp)->fvalue = *((TYPENAME *)force);\
    break;
    -void RegisterDebugVariable(int idx)
    +void RegisterDebugVariable(int idx, void* force)
    {
    void *varp = NULL;
    + unsigned char flags = force ? __IEC_DEBUG_FLAG | __IEC_FORCE_FLAG : __IEC_DEBUG_FLAG;
    switch(__find_variable(idx, &varp)){
    ANY(__RegisterDebugVariable_case_t)
    ANY(__RegisterDebugVariable_case_p)
    @@ -165,12 +170,12 @@
    #define __ResetDebugVariablesIterator_case_t(TYPENAME) \
    case TYPENAME##_ENUM :\
    - ((__IEC_##TYPENAME##_t *)varp)->flags &= ~__IEC_DEBUG_FLAG;\
    + ((__IEC_##TYPENAME##_t *)varp)->flags &= ~(__IEC_DEBUG_FLAG|__IEC_FORCE_FLAG);\
    break;
    #define __ResetDebugVariablesIterator_case_p(TYPENAME)\
    case TYPENAME##_P_ENUM :\
    - ((__IEC_##TYPENAME##_p *)varp)->flags &= ~__IEC_DEBUG_FLAG;\
    + ((__IEC_##TYPENAME##_p *)varp)->flags &= ~(__IEC_DEBUG_FLAG|__IEC_FORCE_FLAG);\
    break;
    void ResetDebugVariablesIterator(void* varp, __IEC_types_enum vartype)