Убрал "mutex_atomic_t", перевёл на использование std::atomic_..

Utilities/codegen/ctl-cpp-common.xsl

@@ -234,7 +234,7 @@
 		inline const std::string getProp(const std::string& name) { return UniSetTypes::conf->getProp(confnode, name); }
 
 		int smReadyTimeout; 	/*!< время ожидания готовности SM */
-		UniSetTypes::mutex_atomic_t activated;
+		std::atomic_bool activated;
 		int activateTimeout;	/*!< время ожидания готовности UniSetObject к работе */
 		PassiveTimer ptStartUpTimeout;	/*!< время на блокировку обработки WatchDog, если недавно был StartUp */
 		int askPause; /*!< пауза между неудачными попытками заказать датчики */
@@ -350,10 +350,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::activateObject()
 	// пока не пройдёт инициализация датчиков
 	// см. sysCommand()
 	{
-		activated = 0;
+		activated = false;
 		<xsl:if test="normalize-space($BASECLASS)!=''"><xsl:value-of select="normalize-space($BASECLASS)"/>::activateObject();</xsl:if>
 		<xsl:if test="normalize-space($BASECLASS)=''">UniSetObject::activateObject();</xsl:if>
-		activated = 1;
+		activated = true;
 	}
 
 	return true;
@@ -522,7 +522,7 @@ idHeartBeat(DefaultObjectId),
 maxHeartBeat(10),
 confnode(0),
 smReadyTimeout(0),
-activated(0),
+activated(false),
 askPause(2000),
 <xsl:for-each select="//variables/item">
 <xsl:if test="normalize-space(@private)!=''">
@@ -586,7 +586,7 @@ idHeartBeat(DefaultObjectId),
 maxHeartBeat(10),
 confnode(cnode),
 smReadyTimeout(0),
-activated(0),
+activated(false),
 askPause(conf->getPIntProp(cnode,"askPause",2000)),
 <xsl:for-each select="//variables/item">
 <xsl:if test="normalize-space(@private)!=''">
@@ -872,7 +872,7 @@ idLocalTestMode_S(DefaultObjectId),
 idHeartBeat(DefaultObjectId),
 maxHeartBeat(10),
 confnode(0),
-activated(0),
+activated(false),
 askPause(2000)
 {
 	ucrit &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
@@ -906,7 +906,7 @@ in_LocalTestMode_S(false),
 idHeartBeat(DefaultObjectId),
 maxHeartBeat(10),
 confnode(cnode),
-activated(0),
+activated(false),
 askPause(conf->getPIntProp(cnode,"askPause",2000))
 {
 	if( getId() == DefaultObjectId )

extensions/IOControl/IOControl.cc

@@ -43,7 +43,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
     force(false),
     force_out(false),
     maxCardNum(10),
-    activated(0),
+    activated(false),
     readconf_ok(false),
     term(false),
     testMode_as(UniSetTypes::DefaultObjectId),
@@ -786,9 +786,9 @@ bool IOControl::activateObject()
     // пока не пройдёт инициализация датчиков
     // см. sysCommand()
     {
-        activated = 0;
+        activated = false;
         UniSetObject::activateObject();
-        activated = 1;
+        activated = true;
     }
 
     return true;

extensions/IOControl/IOControl.h

@@ -367,7 +367,7 @@ class IOControl:
         int maxCardNum;        /*! максимально разрешённый номер для карты */
 
         UniSetTypes::uniset_mutex iopollMutex;
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
         bool readconf_ok;
         int activateTimeout;
         UniSetTypes::ObjectId sidTestSMReady;

extensions/ModbusMaster/MBExchange.cc

@@ -22,7 +22,7 @@ force_out(false),
 mbregFromID(false),
 sidExchangeMode(DefaultObjectId),
 exchangeMode(emNone),
-activated(0),
+activated(false),
 noQueryOptimization(false),
 no_extimer(false),
 prefix(prefix),
@@ -226,7 +226,7 @@ bool MBExchange::checkProcActive()
 // -----------------------------------------------------------------------------
 void MBExchange::setProcActive( bool st )
 {
-    activated = (st ? 1 : 0);
+    activated = st;
 }
 // -----------------------------------------------------------------------------
 void MBExchange::sigterm( int signo )

extensions/ModbusMaster/MBExchange.h

@@ -299,7 +299,7 @@ class MBExchange:
         IOController::IOStateList::iterator itExchangeMode;
         long exchangeMode; /*!< режим работы см. ExchangeMode */
 
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
         int activateTimeout;
         bool noQueryOptimization;
         bool no_extimer;

extensions/ModbusSlave/MBSlave.cc

@@ -21,7 +21,7 @@ askcount_id(DefaultObjectId),
 respond_id(DefaultObjectId),
 respond_invert(false),
 askCount(0),
-activated(0),
+activated(false),
 activateTimeout(500),
 pingOK(true),
 force(false),
@@ -711,11 +711,11 @@ bool MBSlave::activateObject()
     // пока не пройдёт инициализация датчиков
     // см. sysCommand()
     {
-        activated = 0;
+        activated = false;
         UniSetTypes::uniset_rwmutex_wrlock l(mutex_start);
         UniSetObject_LT::activateObject();
         initIterators();
-        activated = 1;
+        activated = true;
     }
 
     return true;
@@ -724,7 +724,7 @@ bool MBSlave::activateObject()
 void MBSlave::sigterm( int signo )
 {
     dinfo << myname << ": ********* SIGTERM(" << signo <<") ********" << endl;
-    activated = 0;
+    activated = false;
     try
     {
         if( mbslot )

extensions/ModbusSlave/MBSlave.h

@@ -186,7 +186,7 @@ class MBSlave:
         typedef std::map<ModbusRTU::mbErrCode,unsigned int> ExchangeErrorMap;
         ExchangeErrorMap errmap;     /*!< статистика обмена */
 
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
         int activateTimeout;
         bool pingOK;
         timeout_t wait_msec;

extensions/SharedMemory/SharedMemory.cc

@@ -36,8 +36,8 @@ SharedMemory::SharedMemory( ObjectId id, const std::string& datafile, const std:
     heartbeatCheckTime(5000),
     histSaveTime(0),
     wdt(0),
-    activated(0),
-    workready(0),
+    activated(false),
+    workready(false),
     dblogging(false),
     msecPulsar(0)
 {
@@ -233,7 +233,7 @@ bool SharedMemory::activateObject()
     // пока не пройдёт инициализация датчиков
     // см. sysCommand()
     {
-        activated = 0;
+        activated = false;
 
         UniSetTypes::uniset_rwmutex_wrlock l(mutex_start);
         res = IONotifyController_LT::activateObject();
@@ -252,7 +252,7 @@ bool SharedMemory::activateObject()
                 hit.ioit = myioEnd();
         }
 
-        activated = 1;
+        activated = true;
     }
 
     cerr << "************************** activate: " << pt.getCurrent() << " msec " << endl;

extensions/SharedMemory/SharedMemory.h

@@ -407,8 +407,8 @@ class SharedMemory:
         typedef std::list<HeartBeatInfo> HeartBeatList;
         HeartBeatList hlist; // список датчиков "сердцебиения"
         WDTInterface* wdt;
-        UniSetTypes::mutex_atomic_t activated;
-        UniSetTypes::mutex_atomic_t workready;
+        std::atomic_bool activated;
+        std::atomic_bool workready;
 
         typedef std::list<UniSetTypes::ObjectId> EventList;
         EventList elst;

extensions/UNetUDP/UNetExchange.cc

@@ -11,7 +11,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 UniSetObject_LT(objId),
 shm(0),
 initPause(0),
-activated(0),
+activated(false),
 no_sender(false),
 sender(0),
 sender2(0)
@@ -576,11 +576,11 @@ bool UNetExchange::activateObject()
     // пока не пройдёт инициализация датчиков
     // см. sysCommand()
     {
-        activated = 0;
+        activated = false;
         UniSetTypes::uniset_rwmutex_wrlock l(mutex_start);
         UniSetObject_LT::activateObject();
         initIterators();
-        activated = 1;
+        activated = true;
     }
 
     return true;
@@ -589,7 +589,7 @@ bool UNetExchange::activateObject()
 void UNetExchange::sigterm( int signo )
 {
     dinfo << myname << ": ********* SIGTERM(" << signo <<") ********" << endl;
-    activated = 0;
+    activated = false;
     for( auto &it: recvlist )
     {
         try

extensions/UNetUDP/UNetExchange.h

@@ -134,7 +134,7 @@ class UNetExchange:
 
         int steptime;    /*!< периодичность вызова step, [мсек] */
 
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
         int activateTimeout;
 
         struct ReceiverInfo

extensions/UNetUDP/UNetReceiver.cc

@@ -31,7 +31,7 @@ lostPackets(0),
 sidRespond(UniSetTypes::DefaultObjectId),
 respondInvert(false),
 sidLostPackets(UniSetTypes::DefaultObjectId),
-activated(0),
+activated(false),
 r_thr(0),
 u_thr(0),
 pnum(0),
@@ -160,7 +160,7 @@ void UNetReceiver::start()
 {
     if( !activated )
     {
-        activated = 1;
+        activated = true;
         u_thr->start();
         r_thr->start();
     }
@@ -348,7 +348,7 @@ void UNetReceiver::real_update()
 // -----------------------------------------------------------------------------
 void UNetReceiver::stop()
 {
-    activated = 0;
+    activated = false;
 }
 // -----------------------------------------------------------------------------
 void UNetReceiver::receive()

extensions/UNetUDP/UNetReceiver.h

@@ -130,7 +130,7 @@ class UNetReceiver
         UniSetTypes::ObjectId sidLostPackets;
         IOController::IOStateList::iterator itLostPackets;
 
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
 
         ThreadCreator<UNetReceiver>* r_thr;        // receive thread
         ThreadCreator<UNetReceiver>* u_thr;        // update thread

extensions/UNetUDP/UNetSender.cc

@@ -15,7 +15,7 @@ s_fvalue(s_val),
 shm(smi),
 s_host(s_host),
 sendpause(150),
-activated(0),
+activated(false),
 dlist(100),
 maxItem(0),
 packetnum(1),
@@ -195,7 +195,7 @@ void UNetSender::real_send()
 // -----------------------------------------------------------------------------
 void UNetSender::stop()
 {
-    activated = 0;
+    activated = false;
 //    s_thr->stop();
 }
 // -----------------------------------------------------------------------------
@@ -203,7 +203,7 @@ void UNetSender::start()
 {
     if( !activated )
     {
-        activated = 1;
+        activated = true;
         s_thr->start();
     }
 }

extensions/UNetUDP/UNetSender.h

@@ -86,7 +86,7 @@ class UNetSender
 
         std::string myname;
         int sendpause;
-        UniSetTypes::mutex_atomic_t activated;
+        std::atomic_bool activated;
 
         UniSetTypes::uniset_rwmutex pack_mutex;
         UniSetUDP::UDPMessage mypack;

extensions/include/UObject_SK.h

@@ -119,7 +119,7 @@ class UObject_SK:
 		inline const std::string getProp(const std::string& name) { return UniSetTypes::conf->getProp(confnode, name); }
 
 		int smReadyTimeout; 	/*!< время ожидания готовности SM */
-		UniSetTypes::mutex_atomic_t activated;
+		std::atomic_bool activated;
 		int activateTimeout;	/*!< время ожидания готовности UniSetObject к работе */
 		PassiveTimer ptStartUpTimeout;	/*!< время на блокировку обработки WatchDog, если недавно был StartUp */
 		int askPause; /*!< пауза между неудачными попытками заказать датчики */

extensions/lib/UObject_SK.cc

@@ -297,9 +297,9 @@ bool UObject_SK::activateObject()
 	// пока не пройдёт инициализация датчиков
 	// см. sysCommand()
 	{
-		activated = 0;
+		activated = false;
 		UniSetObject::activateObject();
-		activated = 1;
+		activated = true;
 	}
 
 	return true;

include/Mutex.h

@@ -32,8 +32,6 @@
 // -----------------------------------------------------------------------------------------
 namespace UniSetTypes
 {
-    typedef std::atomic_int mutex_atomic_t;
-
     class uniset_mutex
     {
         public:

include/UniSetObject.h

@@ -220,7 +220,7 @@ class UniSetObject:
 
             pid_t msgpid; // pid потока обработки сообщений
             bool reg;
-            UniSetTypes::mutex_atomic_t active;
+            std::atomic_bool active;
 
             bool threadcreate;
             UniSetTimer* tmr;