(SM): убрал hbmutex и реализацию функций localXXX. Не могу вспомнить,

extensions/SharedMemory/SharedMemory.cc

@@ -527,59 +527,6 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
 	return true;
 }
 // ------------------------------------------------------------------------------------------
-void SharedMemory::localSaveValue( AIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Long newvalue, UniSetTypes::ObjectId sup_id )
-{
-	if( hist.empty() )
-	{
-		IONotifyController_LT::localSaveValue( it, si, newvalue, sup_id );
-		return;
-	}
-
-	uniset_mutex_lock l(hbmutex);
-	IONotifyController_LT::localSaveValue( it, si, newvalue, sup_id );
-}
-// ------------------------------------------------------------------------------------------
-void SharedMemory::localSaveState( DIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Boolean newstate, UniSetTypes::ObjectId sup_id )
-{
-	if( hist.empty() )
-	{
-		IONotifyController_LT::localSaveState( it, si, newstate, sup_id );
-		return;
-	}
-
-	uniset_mutex_lock l(hbmutex);
-	IONotifyController_LT::localSaveState( it, si, newstate, sup_id );
-}
-// ------------------------------------------------------------------------------------------
-void SharedMemory::localSetState( DIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Boolean newstate, UniSetTypes::ObjectId sup_id )
-{
-	if( hist.empty() )
-	{
-		IONotifyController_LT::localSetState( it, si, newstate, sup_id );
-		return;
-	}
-
-	uniset_mutex_lock l(hbmutex);
-	IONotifyController_LT::localSetState( it, si, newstate, sup_id );
-}
-// ------------------------------------------------------------------------------------------
-void SharedMemory::localSetValue( AIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Long value, UniSetTypes::ObjectId sup_id )
-{
-	if( hist.empty() )
-	{
-		IONotifyController_LT::localSetValue( it, si, value, sup_id );
-		return;
-	}
-
-	uniset_mutex_lock l(hbmutex);
-	IONotifyController_LT::localSetValue( it, si, value, sup_id );
-}
-// ------------------------------------------------------------------------------------------
-
 SharedMemory* SharedMemory::init_smemory( int argc, const char* const* argv )
 {
 	string dfile = conf->getArgParam("--datfile", conf->getConfFileName());

extensions/SharedMemory/SharedMemory.h

@@ -351,16 +351,6 @@ class SharedMemory:
 		virtual void askSensors( UniversalIO::UIOCommand cmd );
 		virtual void sendEvent( UniSetTypes::SystemMessage& sm );
 
-		virtual void localSaveValue( AIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Long newvalue, UniSetTypes::ObjectId sup_id );
-		virtual void localSaveState( DIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Boolean newstate, UniSetTypes::ObjectId sup_id );
-	  	virtual void localSetState( DIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Boolean newstate, UniSetTypes::ObjectId sup_id );
-		virtual void localSetValue( AIOStateList::iterator& it, const IOController_i::SensorInfo& si,
-										CORBA::Long value, UniSetTypes::ObjectId sup_id );
-
-
 		// действия при завершении работы
 		virtual void sigterm( int signo );
 		bool activateObject();
@@ -413,7 +403,6 @@ class SharedMemory:
 
 		typedef std::list<HeartBeatInfo> HeartBeatList;
 		HeartBeatList hlist; // список датчиков "сердцебиения"
-		UniSetTypes::uniset_mutex hbmutex;
 		WDTInterface* wdt;
 		bool activated;
 		bool workready;