# HG changeset patch # User Laurent Bessard # Date 1368817114 -7200 # Node ID 7838595559ba9c998973ac7293a6600b3fa8fe11 # Parent e9e9d31938940eac1c792c992842bbccdee3703e# Parent a2f9b44c17c9c3f933599e3eb103b2a5e7a42ba4 Merged diff -r a2f9b44c17c9 -r 7838595559ba py_ext/PythonFileCTNMixin.py --- a/py_ext/PythonFileCTNMixin.py Fri May 17 20:56:15 2013 +0200 +++ b/py_ext/PythonFileCTNMixin.py Fri May 17 20:58:34 2013 +0200 @@ -127,12 +127,11 @@ long __%(name)s_wlock = 0; int __%(name)s_wbuffer_written = 0; void __SafeGetPLCGlob_%(name)s(IEC_%(IECtype)s *pvalue){ - IEC_%(IECtype)s res; while(AtomicCompareExchange(&__%(name)s_rlock, 0, 1)); *pvalue = __%(name)s_rbuffer; AtomicCompareExchange((long*)&__%(name)s_rlock, 1, 0); } -__SafeSetPLCGlob_%(name)s(IEC_%(IECtype)s *value){ +void __SafeSetPLCGlob_%(name)s(IEC_%(IECtype)s *value){ while(AtomicCompareExchange(&__%(name)s_wlock, 0, 1)); __%(name)s_wbuffer = *value; __%(name)s_wbuffer_written = 1;