(SM): Оптимизация: 1) перевёл механизм аварийного следа с std::list на…

extensions/SharedMemory/SharedMemory.cc

@@ -36,13 +36,12 @@ SharedMemory::SharedMemory( ObjectId id, string datafile, std::string confname )
     heartbeatCheckTime(5000),
     histSaveTime(0),
     wdt(0),
-    activated(false),
-    workready(false),
+    activated(0),
+    workready(0),
     dblogging(false),
     msecPulsar(0)
 {
     mutex_start.setName(myname + "_mutex_start");
-    mutex_act.setName(myname + "_mutex_act");
 
     string cname(confname);
     if( cname.empty() )
@@ -140,7 +139,7 @@ void SharedMemory::timerInfo( const TimerMessage *tm )
         checkHeartBeat();
     else if( tm->id == tmEvent )
     {
-        workready = true;
+        workready = 1;
         // рассылаем уведомление, о том, чтобы стартанули
         SystemMessage sm1(SystemMessage::WatchDog);
         sendEvent(sm1);
@@ -236,10 +235,7 @@ bool SharedMemory::activateObject()
     // пока не пройдёт инициализация датчиков
     // см. sysCommand()
     {
-        {
-            uniset_rwmutex_wrlock l(mutex_act);
-            activated = false;
-        }
+        activated = 0;
 
         UniSetTypes::uniset_rwmutex_wrlock l(mutex_start);
         res = IONotifyController_LT::activateObject();
@@ -258,10 +254,7 @@ bool SharedMemory::activateObject()
                 hit->ioit = myioEnd();
         }
 
-        {
-            uniset_rwmutex_wrlock l(mutex_act);
-            activated = true;
-        }
+        activated = 1;
     }
 
     cerr << "************************** activate: " << pt.getCurrent() << " msec " << endl;
@@ -767,7 +760,6 @@ std::ostream& operator<<( std::ostream& os, const SharedMemory::HistoryInfo& h )
 // ------------------------------------------------------------------------------------------
 bool SharedMemory::isActivated()
 {
-    uniset_rwmutex_rlock l(mutex_act);
     return activated;
 }
 // ------------------------------------------------------------------------------------------

extensions/SharedMemory/SharedMemory.h

@@ -3,7 +3,7 @@
 #define SharedMemory_H_
 // -----------------------------------------------------------------------------
 #include <string>
-#include <list>
+#include <deque>
 #include "IONotifyController_LT.h"
 #include "Mutex.h"
 #include "PassiveTimer.h"
@@ -274,7 +274,7 @@ class SharedMemory:
 
 
         // ------------  HISTORY  --------------------
-        typedef std::list<long> HBuffer;
+        typedef std::deque<long> HBuffer;
 
         struct HistoryItem
         {
@@ -289,7 +289,7 @@ class SharedMemory:
             {
                 buf.push_back(val);
                 if( buf.size() >= size )
-                    buf.erase(buf.begin());
+                    buf.pop_front();
             }
         };
 
@@ -400,8 +400,8 @@ class SharedMemory:
         typedef std::list<HeartBeatInfo> HeartBeatList;
         HeartBeatList hlist; // список датчиков "сердцебиения"
         WDTInterface* wdt;
-        bool activated;
-        bool workready;
+        UniSetTypes::mutex_atomic_t activated;
+        UniSetTypes::mutex_atomic_t workready;
 
         typedef std::list<UniSetTypes::ObjectId> EventList;
         EventList elst;
@@ -425,13 +425,10 @@ class SharedMemory:
         void checkHistoryFilter( UniXML_iterator& it );
         bool isActivated();
 
-
         IOStateList::iterator itPulsar;
         IOController_i::SensorInfo siPulsar;
         int msecPulsar;
 
-        UniSetTypes::uniset_rwmutex mutex_act;
-
     private:
         HistorySlot m_historySignal;
 };