[modbusmaster][reload config]: first prototype

extensions/ModbusMaster/MBTCPMaster.cc

@@ -38,8 +38,8 @@ MBTCPMaster::MBTCPMaster(uniset::ObjectId objId, uniset::ObjectId shmId,
     auto conf = uniset_conf();
 
 	// префикс для "свойств" - по умолчанию "tcp_";
-    prop_prefix = initPropPrefix("tcp_");
-    mbinfo << myname << "(init): prop_prefix=" << prop_prefix << endl;
+	mbconf->prop_prefix = initPropPrefix(mbconf->s_field, "tcp_");
+	mbinfo << myname << "(init): prop_prefix=" << mbconf->prop_prefix << endl;
 
     UniXML::iterator it(cnode);
 
@@ -62,14 +62,7 @@ MBTCPMaster::MBTCPMaster(uniset::ObjectId objId, uniset::ObjectId shmId,
     mbinfo << myname << "(init): persisten-connection=" << (!force_disconnect) << endl;
 
 	if( shm->isLocalwork() )
-    {
-        readConfiguration();
-
-        if( !noQueryOptimization )
-            rtuQueryOptimization(devices);
-
-        initDeviceList();
-    }
+		mbconf->loadConfig(conf->getConfXML(), conf->getXMLSensorsSection());
 	else
 		ic->addReadItem( sigc::mem_fun(this, &MBTCPMaster::readItem) );
 
@@ -77,7 +70,7 @@ MBTCPMaster::MBTCPMaster(uniset::ObjectId objId, uniset::ObjectId shmId,
     pollThread->setFinalAction(this, &MBTCPMaster::final_thread);
 
 	if( mblog->is_info() )
-        printMap(devices);
+		MBConfig::printMap(mbconf->devices);
 }
 // -----------------------------------------------------------------------------
 MBTCPMaster::~MBTCPMaster()
@@ -112,11 +105,11 @@ std::shared_ptr<ModbusClient> MBTCPMaster::initMB( bool reopen )
     mbtcp->connect(iaddr, port);
     mbtcp->setForceDisconnect(force_disconnect);
 
-    if( recv_timeout > 0 )
-        mbtcp->setTimeout(recv_timeout);
+	if( mbconf->recv_timeout > 0 )
+		mbtcp->setTimeout(mbconf->recv_timeout);
 
-    mbtcp->setSleepPause(sleepPause_msec);
-    mbtcp->setAfterSendPause(aftersend_pause);
+	mbtcp->setSleepPause(mbconf->sleepPause_msec);
+	mbtcp->setAfterSendPause(mbconf->aftersend_pause);
 
     mbinfo << myname << "(init): ipaddr=" << iaddr << " port=" << port
            << " connection=" << (mbtcp->isConnection() ? "OK" : "FAIL" ) << endl;
@@ -182,7 +175,7 @@ void MBTCPMaster::poll_thread()
 		if( !isProcActive() )
 			break;
 
-        msleep(polltime);
+		msleep(mbconf->polltime);
 	}
 
 	dinfo << myname << "(poll_thread): thread finished.." << endl;

extensions/ModbusMaster/MBTCPMultiMaster.cc

@@ -38,8 +38,8 @@ MBTCPMultiMaster::MBTCPMultiMaster( uniset::ObjectId objId, uniset::ObjectId shm
 
 	auto conf = uniset_conf();
 
-    prop_prefix = initPropPrefix("tcp_");
-    mbinfo << myname << "(init): prop_prefix=" << prop_prefix << endl;
+	mbconf->prop_prefix = initPropPrefix(mbconf->s_field, "tcp_");
+	mbinfo << myname << "(init): prop_prefix=" << mbconf->prop_prefix << endl;
 
 	UniXML::iterator it(cnode);
 
@@ -50,7 +50,7 @@ MBTCPMultiMaster::MBTCPMultiMaster( uniset::ObjectId objId, uniset::ObjectId shm
 
 	// Т.к. при "многоканальном" доступе к slave, смена канала должна происходит сразу после
 	// неудачной попытки запросов по одному из каналов, то ПЕРЕОПРЕДЕЛЯЕМ reopen, на channel-timeout..
-    int channelTimeout = conf->getArgPInt("--" + prefix + "-default-channel-timeout", it.getProp("channelTimeout"), default_timeout);
+	int channelTimeout = conf->getArgPInt("--" + prefix + "-default-channel-timeout", it.getProp("channelTimeout"), mbconf->default_timeout);
 	ptReopen.setTiming(channelTimeout);
 
 	UniXML::iterator it1(it);
@@ -118,9 +118,9 @@ MBTCPMultiMaster::MBTCPMultiMaster( uniset::ObjectId objId, uniset::ObjectId shm
 		sinf->mbtcp = std::make_shared<ModbusTCPMaster>();
 
 		sinf->ptIgnoreTimeout.setTiming( it1.getPIntProp("ignore_timeout", ignore_timeout) );
-        sinf->recv_timeout = it1.getPIntProp("recv_timeout", recv_timeout);
-        sinf->aftersend_pause = it1.getPIntProp("aftersend_pause", aftersend_pause);
-        sinf->sleepPause_usec = it1.getPIntProp("sleepPause_msec", sleepPause_msec);
+		sinf->recv_timeout = it1.getPIntProp("recv_timeout", mbconf->recv_timeout);
+		sinf->aftersend_pause = it1.getPIntProp("aftersend_pause", mbconf->aftersend_pause);
+		sinf->sleepPause_usec = it1.getPIntProp("sleepPause_msec", mbconf->sleepPause_msec);
 		sinf->respond_invert = it1.getPIntProp("invert", 0);
 		sinf->respond_force = it1.getPIntProp("force", 0);
 
@@ -179,14 +179,7 @@ MBTCPMultiMaster::MBTCPMultiMaster( uniset::ObjectId objId, uniset::ObjectId shm
 	(*mbi)->setUse(true);
 
 	if( shm->isLocalwork() )
-    {
-        readConfiguration();
-
-        if( !noQueryOptimization )
-            rtuQueryOptimization(devices);
-
-        initDeviceList();
-    }
+		mbconf->loadConfig(conf->getConfXML(), conf->getXMLSensorsSection());
 	else
 		ic->addReadItem( sigc::mem_fun(this, &MBTCPMultiMaster::readItem) );
 
@@ -197,11 +190,11 @@ MBTCPMultiMaster::MBTCPMultiMaster( uniset::ObjectId objId, uniset::ObjectId shm
 
 	// Т.к. при "многоканальном" доступе к slave, смена канала должна происходит сразу после
 	// неудачной попытки запросов по одному из каналов, то ПЕРЕОПРЕДЕЛЯЕМ reopen, на channel-timeout..
-    int tout = conf->getArgPInt("--" + prefix + "-default-channel-timeout", it.getProp("channelTimeout"), default_timeout);
+	int tout = conf->getArgPInt("--" + prefix + "-default-channel-timeout", it.getProp("channelTimeout"), mbconf->default_timeout);
 	ptReopen.setTiming(tout);
 
 	if( mblog->is_info() )
-        printMap(devices);
+		MBConfig::printMap(mbconf->devices);
 }
 // -----------------------------------------------------------------------------
 MBTCPMultiMaster::~MBTCPMultiMaster()
@@ -493,7 +486,7 @@ void MBTCPMultiMaster::poll_thread()
 		if( !isProcActive() )
 			break;
 
-        msleep(polltime);
+		msleep(mbconf->polltime);
 	}
 }
 // -----------------------------------------------------------------------------
@@ -574,7 +567,6 @@ void MBTCPMultiMaster::check_thread()
 void MBTCPMultiMaster::initIterators()
 {
     MBExchange::initIterators();
-
 	for( auto&& it : mblist )
 		shm->initIterator(it->respond_it);
 }
@@ -607,7 +599,7 @@ void MBTCPMultiMaster::initCheckConnectionParameters()
 {
     auto conf = uniset_conf();
 
-    bool initFromRegMap = ( findArgParam("--" + prefix + "-check-init-from-regmap", conf->getArgc(), conf->getArgv()) != -1 );
+	bool initFromRegMap = ( findArgParam("--" + mbconf->prefix + "-check-init-from-regmap", conf->getArgc(), conf->getArgv()) != -1 );
 
     if( !initFromRegMap )
         return;
@@ -623,18 +615,16 @@ void MBTCPMultiMaster::initCheckConnectionParameters()
     ModbusRTU::ModbusAddr checkAddr = { 0x00 };
     ModbusRTU::ModbusData checkReg = { 0 };
 
-    if( devices.empty() )
+	if( mbconf->devices.empty() )
 	{
-
         mbwarn << myname << "(init): devices list empty?!" << endl;
         return;
     }
 
 	// идём по устройствам
-    for( const auto& d : devices )
+	for( const auto& d : mbconf->devices )
 	{
 		checkAddr = d.second->mbaddr;
-
         if( d.second->pollmap.empty() )
             continue;
 

extensions/ModbusMaster/Makefile.am

@@ -4,7 +4,7 @@ libMBMaster_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la \
 								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
 libMBMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libMBMaster_la_SOURCES 	= MBExchange.cc RTUStorage.cc
+libMBMaster_la_SOURCES 	= MBExchange.cc MBConfig.cc RTUStorage.cc
 
 bin_PROGRAMS 		= @PACKAGE@-mbtcpmaster @PACKAGE@-mbtcpmultimaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup @PACKAGE@-mtr-read
 lib_LTLIBRARIES 	= libUniSet2MBTCPMaster.la libUniSet2RTU.la

extensions/ModbusMaster/RTUExchange.cc

@@ -34,70 +34,62 @@ RTUExchange::RTUExchange(uniset::ObjectId objId, uniset::ObjectId shmId, const s
     rs_pre_clean(false)
 {
 	if( objId == DefaultObjectId )
-        throw uniset::SystemError("(RTUExchange): objId=-1?!! Use --" + prefix + "-name" );
+		throw uniset::SystemError("(RTUExchange): objId=-1?!! Use --" + mbconf->prefix + "-name" );
 
     auto conf = uniset_conf();
 
 	// префикс для "свойств" - по умолчанию
-    prop_prefix = "";
+	mbconf->prop_prefix = "";
 
 	// если задано поле для "фильтрации"
 	// то в качестве префикса используем его
-    if( !s_field.empty() )
-        prop_prefix = s_field + "_";
+	if( !mbconf->s_field.empty() )
+		mbconf->prop_prefix = mbconf->s_field + "_";
 
 	// если "принудительно" задан префикс
 	// используем его.
 	{
-        string p("--" + prefix + "-set-prop-prefix");
+		string p("--" + mbconf->prefix + "-set-prop-prefix");
 		string v = conf->getArgParam(p, "");
 
 		if( !v.empty() && v[0] != '-' )
-            prop_prefix = v;
+			mbconf->prop_prefix = v;
 		// если параметр всё-таки указан, считаем, что это попытка задать "пустой" префикс
 		else if( findArgParam(p, conf->getArgc(), conf->getArgv()) != -1 )
-            prop_prefix = "";
+			mbconf->prop_prefix = "";
 	}
 
-    mbinfo << myname << "(init): prop_prefix=" << prop_prefix << endl;
+	mbinfo << myname << "(init): prop_prefix=" << mbconf->prop_prefix << endl;
 
     UniXML::iterator it(cnode);
-
 	// ---------- init RS ----------
-    devname    = conf->getArgParam("--" + prefix + "-dev", it.getProp("device"));
+	devname    = conf->getArgParam("--" + mbconf->prefix + "-dev", it.getProp("device"));
 
     if( devname.empty() )
         throw uniset::SystemError(myname + "(RTUExchange): Unknown device..." );
 
-    string speed = conf->getArgParam("--" + prefix + "-speed", it.getProp("speed"));
+	string speed = conf->getArgParam("--" + mbconf->prefix + "-speed", it.getProp("speed"));
 
     if( speed.empty() )
         speed = "38400";
 
-    use485F = conf->getArgInt("--" + prefix + "-use485F", it.getProp("use485F"));
-    transmitCtl = conf->getArgInt("--" + prefix + "-transmit-ctl", it.getProp("transmitCtl"));
+	use485F = conf->getArgInt("--" + mbconf->prefix + "-use485F", it.getProp("use485F"));
+	transmitCtl = conf->getArgInt("--" + mbconf->prefix + "-transmit-ctl", it.getProp("transmitCtl"));
 	defSpeed = ComPort::getSpeed(speed);
 
-    sleepPause_msec = conf->getArgPInt("--" + prefix + "-sleepPause-usec", it.getProp("slepePause"), 100);
+	mbconf->sleepPause_msec = conf->getArgPInt("--" + mbconf->prefix + "-sleepPause-usec", it.getProp("slepePause"), 100);
 
-    rs_pre_clean = conf->getArgInt("--" + prefix + "-pre-clean", it.getProp("pre_clean"));
+	rs_pre_clean = conf->getArgInt("--" + mbconf->prefix + "-pre-clean", it.getProp("pre_clean"));
 
 	if( shm->isLocalwork() )
-    {
-        readConfiguration();
-
-        if( !noQueryOptimization )
-            rtuQueryOptimization(devices);
-
-        initDeviceList();
-    }
+		mbconf->loadConfig(conf->getConfXML(), conf->getXMLSensorsSection());
 	else
 		ic->addReadItem( sigc::mem_fun(this, &RTUExchange::readItem) );
 
     initMB(false);
 
 	if( dlog()->is_info() )
-        printMap(devices);
+		MBConfig::printMap(mbconf->devices);
 }
 // -----------------------------------------------------------------------------
 void RTUExchange::help_print( int argc, const char* const* argv )
@@ -155,11 +147,11 @@ std::shared_ptr<ModbusClient> RTUExchange::initMB( bool reopen )
 		if( ic )
 			ic->logAgregator()->add(loga);
 
-        if( recv_timeout > 0 )
-            mbrtu->setTimeout(recv_timeout);
+		if( mbconf->recv_timeout > 0 )
+			mbrtu->setTimeout(mbconf->recv_timeout);
 
-        mbrtu->setSleepPause(sleepPause_msec);
-        mbrtu->setAfterSendPause(aftersend_pause);
+		mbrtu->setSleepPause(mbconf->sleepPause_msec);
+		mbrtu->setAfterSendPause(mbconf->aftersend_pause);
 
 		mbinfo << myname << "(init): dev=" << devname << " speed=" << ComPort::getSpeed( mbrtu->getSpeed() ) << endl;
 	}
@@ -236,11 +228,11 @@ bool RTUExchange::poll()
 	bool allNotRespond = true;
 	ComPort::Speed s = mbrtu->getSpeed();
 
-    for( auto it1 : devices )
+	for( auto it1 : mbconf->devices )
 	{
 		auto d = it1.second;
 
-        if( d->mode_id != DefaultObjectId && d->mode == emSkipExchange )
+		if( d->mode_id != DefaultObjectId && d->mode == MBConfig::emSkipExchange )
 			continue;
 
 		if( d->speed != s )
@@ -251,7 +243,7 @@ bool RTUExchange::poll()
 
 		d->prev_numreply.store(d->numreply);
 
-        if( d->dtype == MBExchange::dtRTU188 )
+		if( d->dtype == MBConfig::dtRTU188 )
 		{
 			if( !d->rtu188 )
 				continue;
@@ -294,7 +286,7 @@ bool RTUExchange::poll()
 				{
 					try
 					{
-                        if( d->dtype == RTUExchange::dtRTU || d->dtype == RTUExchange::dtMTR )
+						if( d->dtype == MBConfig::dtRTU || d->dtype == MBConfig::dtMTR )
 						{
 							if( rs_pre_clean )
 								mb->cleanupChannel();
@@ -311,7 +303,7 @@ bool RTUExchange::poll()
 						dlog3 << myname << "(poll): FAILED ask addr=" << ModbusRTU::addr2str(d->mbaddr)
 							  << " reg=" << ModbusRTU::dat2str(it->second->mbreg)
 							  << " for sensors: ";
-                        print_plist(dlog()->level3(), it->second->slst);
+						mbconf->print_plist(dlog()->level3(), it->second->slst);
 						dlog()->level3(false) << " err: " << ex << endl;
 					}
 
@@ -329,7 +321,7 @@ bool RTUExchange::poll()
 	updateSM();
 
 	// check thresholds
-    for( auto&& t : thrlist )
+	for( auto&& t : mbconf->thrlist )
 	{
 		if( !isProcActive() )
 			return false;
@@ -379,36 +371,3 @@ std::shared_ptr<RTUExchange> RTUExchange::init_rtuexchange(int argc, const char*
     return make_shared<RTUExchange>(ID, icID, ic, prefix);
 }
 // -----------------------------------------------------------------------------
-bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML::iterator& it )
-{
-    if( !MBExchange::initDeviceInfo(m, a, it) )
-        return false;
-
-    auto d = m.find(a);
-
-    if( d == m.end() )
-    {
-        mbwarn << myname << "(initDeviceInfo): not found device for addr=" << ModbusRTU::addr2str(a) << endl;
-        return false;
-    }
-
-    string s = it.getProp("speed");
-
-    if( !s.empty() )
-    {
-        d->second->speed = ComPort::getSpeed(s);
-
-        if( d->second->speed == ComPort::ComSpeed0 )
-        {
-            d->second->speed = defSpeed;
-            mbcrit << myname << "(initDeviceInfo): Unknown speed=" << s <<
-                   " for addr=" << ModbusRTU::addr2str(a) << endl;
-            return false;
-        }
-    }
-    else
-        d->second->speed = defSpeed;
-
-    return true;
-}
-// -----------------------------------------------------------------------------

extensions/ModbusMaster/RTUExchange.h

@@ -53,9 +53,7 @@ namespace uniset
 
             virtual void step() override;
             virtual bool poll() override;
-
 			virtual std::shared_ptr<ModbusClient> initMB( bool reopen = false ) override;
-            virtual bool initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML::iterator& it ) override;
 
         private:
             RTUExchange();

extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -16,6 +16,7 @@
 --mbtcp-persistent-connection 1 \
 --ulog-add-levels system \
 --mbtcp-run-logserver \
+--mbtcp-log-add-levels any \
 $*
 
 #--mbtcp-log-add-levels level4,level3 \

extensions/ModbusMaster/tests/MBTCPTestServer.h

@@ -24,12 +24,6 @@ class MBTCPTestServer
 			replyVal = val;
 		}
 
-        inline void setIgnoreAddrMode( bool state )
-        {
-            if( sslot )
-                sslot->setIgnoreAddrMode(state);
-        }
-
 		void execute();    /*!< основной цикл работы */
 		void setLog( std::shared_ptr<DebugStream> dlog );
 

extensions/ModbusMaster/tests/mbmaster-test-configure.xml

@@ -134,6 +134,8 @@
             <!-- undefined state -->
 			<item id="1070" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="240" mbfunc="0x03" default="150" undefined_value="65535" breaklim="100" name="UndefinedState_FS" iotype="AI" textname="Тестирование неопределённого состояния"/>
 
+			<item id="1080" default="1080" name="Reload1_FS" iotype="AI" textname="Тестирование перезагрузки конфига"/>
+
 			<item id="10000" iotype="DI" name="TestMode_S" textname="Тестовый датчик"/>
 
 		</sensors>

extensions/ModbusMaster/tests/mbmaster-test-configure2.xml

+<?xml version="1.0" encoding="utf-8"?>
+<UNISETPLC xmlns:xi="http://www.w3.org/2001/XInclude">
+	<UserData/>
+	<!-- Общие(стартовые) параметры по UniSet -->
+	<UniSet>
+		<NameService host="localhost" port="2809"/>
+		<LocalNode name="LocalhostNode"/>
+		<RootSection name="UNISET_PLC"/>
+		<CountOfNet name="1"/>
+		<RepeatCount name="3"/>
+		<RepeatTimeoutMS name="50"/>
+		<WatchDogTime name="0"/>
+		<PingNodeTime name="0"/>
+		<AutoStartUpTime name="1"/>
+		<DumpStateTime name="10"/>
+		<SleepTickMS name="500"/>
+		<UniSetDebug levels="" name="ulog"/>
+		<ConfDir name="./"/>
+		<DataDir name="./"/>
+		<BinDir name="./"/>
+		<LogDir name="./"/>
+		<DocDir name="./"/>
+		<LockDir name="./"/>
+		<Services></Services>
+	</UniSet>
+	<dlog name="dlog"/>
+
+	<settings>
+	    <SharedMemory name="SharedMemory" shmID="SharedMemory"/>
+	    <MBTCPMaster1 name="MBTCPMaster1" exchangeModeID="MBTCPMaster_Mode_AS">
+            <DeviceList>
+                <item addr="0x01" timeout="1000" invert="1" respondSensor="Slave_Not_Respond_S" safemodeSensor="Slave1_SafemodeSensor_S" safemodeValue="42"/>
+                <item addr="0x02" timeout="1000" safemodeResetIfNotRespond="1"/>
+                <item addr="0x03" timeout="500"/>
+            </DeviceList>
+        </MBTCPMaster1>
+        <MBTCPMultiMaster1 name="MBTCPMultiMaster1" poll_time="200" reply_timeout="60">
+            <DeviceList>
+                <item addr="0x01" invert="1" respondSensor="Slave_Not_Respond_S" timeout="1000" safemodeSensor="Slave1_SafemodeSensor_S" safemodeValue="42" />
+                <item addr="0x02" timeout="1000" safemodeResetIfNotRespond="1"/>
+            </DeviceList>
+            <GateList>
+                <item ip="127.0.0.1" port="20053" recv_timeout="200" invert="1" respondSensor="Slave1_Not_Respond_S"/>
+                <item ip="127.0.0.1" port="20055" recv_timeout="200" invert="1" respondSensor="Slave2_Not_Respond_S"/>
+            </GateList>
+        </MBTCPMultiMaster1>
+	</settings>
+	<ObjectsMap idfromfile="1">
+		<!--
+	Краткие пояснения к полям секции 'sensors'
+	==========================================
+	node 		- узел на котором физически находится данный датчик
+	iotype 		- тип датчика
+	priority 	- приоритет сообщения об изменении данного датчика
+	textname 	- текстовое имя датчика
+-->
+		<nodes port="2809">
+			<item id="3000" infserver="InfoServer" ip="127.0.0.1" name="LocalhostNode" textname="Локальный узел"/>
+		</nodes>
+		<!-- ************************ Датчики ********************** -->
+		<sensors name="Sensors">
+			<!-- reload conf -->
+			<item id="1080" mb="1" mbtype="rtu" mbaddr="0x03" mbreg="340" mbfunc="0x03" name="Reload1_FS" iotype="AI" textname="Тестирование перезагрузки конфига"/>
+		</sensors>
+		<thresholds/>
+		<controllers name="Controllers">
+			<item id="5000" name="SharedMemory"/>
+		</controllers>
+		<!-- ******************* Идентификаторы сервисов ***************** -->
+		<services name="Services">
+		</services>
+		<!-- ******************* Идентификаторы объектов ***************** -->
+		<objects name="UniObjects">
+			<item id="6000" name="TestProc"/>
+			<item id="6004" name="MBTCPMaster1"/>
+			<item id="6005" name="MBTCPMultiMaster1"/>
+		</objects>
+	</ObjectsMap>
+	<messages idfromfile="1" name="messages"/>
+</UNISETPLC>

extensions/ModbusMaster/tests/run_test_mbtcpmaster.cc

@@ -15,6 +15,7 @@ using namespace uniset;
 using namespace uniset::extensions;
 // --------------------------------------------------------------------------
 std::shared_ptr<SharedMemory> shm;
+std::shared_ptr<MBTCPMaster> mbm;
 // --------------------------------------------------------------------------
 int main( int argc, const char* argv[] )
 {
@@ -46,15 +47,14 @@ int main( int argc, const char* argv[] )
         if( !shm )
             return 1;
 
-        auto mb = MBTCPMaster::init_mbmaster(argc, argv, shm->getId(), (apart ? nullptr : shm ));
+		mbm = MBTCPMaster::init_mbmaster(argc, argv, shm->getId(), (apart ? nullptr : shm ));
 
-        if( !mb )
+		if( !mbm )
 			return 1;
 
         auto act = UniSetActivator::Instance();
-
 		act->add(shm);
-        act->add(mb);
+		act->add(mbm);
 
         SystemMessage sm(SystemMessage::StartUp);
         act->broadcast( sm.transport_msg() );

extensions/ModbusMaster/tests/run_test_mbtcpmaster.sh

@@ -16,7 +16,7 @@ cd -
 --mbtcp-gateway-iaddr localhost \
 --mbtcp-gateway-port 20048 \
 --mbtcp-polltime 50 --mbtcp-recv-timeout 500
-#--mbtcp-log-add-levels any
+# --mbtcp-log-add-levels any
 #--mbtcp-default-mbinit-ok 1
 #--dlog-add-levels any
 

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -8,6 +8,8 @@
 #include "UniSetTypes.h"
 #include "MBTCPTestServer.h"
 #include "MBTCPMultiMaster.h"
+#include "MBTCPMaster.h"
+#include "UniSetActivator.h"
 // -----------------------------------------------------------------------------
 using namespace std;
 using namespace uniset;
@@ -15,7 +17,7 @@ using namespace uniset;
 static ModbusRTU::ModbusAddr slaveADDR = 0x01; // conf->getArgInt("--mbs-my-addr");
 static int port = 20048; // conf->getArgInt("--mbs-inet-port");
 static string iaddr("127.0.0.1"); // conf->getArgParam("--mbs-inet-addr");
-static unordered_set<ModbusRTU::ModbusAddr> vaddr = { slaveADDR, 0x02 };
+static unordered_set<ModbusRTU::ModbusAddr> vaddr = { slaveADDR, 0x02, 0x03 };
 static shared_ptr<MBTCPTestServer> mbs;
 static shared_ptr<UInterface> ui;
 static std::shared_ptr<SMInterface> smi;
@@ -23,8 +25,10 @@ static ObjectId mbID = 6004; // MBTCPMaster1
 static int polltime = 100; // conf->getArgInt("--mbtcp-polltime");
 static ObjectId slaveNotRespond = 10; // Slave_Not_Respond_S
 static const ObjectId exchangeMode = 11; // MBTCPMaster_Mode_AS
+static const string confile2 = "mbmaster-test-configure2.xml";
 // -----------------------------------------------------------------------------
 extern std::shared_ptr<SharedMemory> shm;
+extern std::shared_ptr<MBTCPMaster> mbm;
 // -----------------------------------------------------------------------------
 static void InitTest()
 {
@@ -81,6 +85,8 @@ static void InitTest()
 		msleep(2000);
 		CHECK( ui->getValue(slaveNotRespond) == 0 );
 	}
+
+	REQUIRE( mbm != nullptr );
 }
 // -----------------------------------------------------------------------------
 TEST_CASE("MBTCPMaster: reconnect", "[modbus][mbmaster][mbtcpmaster]")
@@ -508,8 +514,8 @@ TEST_CASE("MBTCPMaster: exchangeMode", "[modbus][exchangemode][mbmaster][mbtcpma
 	SECTION("WriteOnly")
 	{
 		// emWriteOnly=1,     /*!< "только посылка данных" (работают только write-функции) */
-        ui->setValue(exchangeMode, MBExchange::emWriteOnly );
-        REQUIRE( ui->getValue(exchangeMode) == MBExchange::emWriteOnly );
+		ui->setValue(exchangeMode, MBConfig::emWriteOnly );
+		REQUIRE( ui->getValue(exchangeMode) == MBConfig::emWriteOnly );
 
 		SECTION("read")
 		{
@@ -537,8 +543,8 @@ TEST_CASE("MBTCPMaster: exchangeMode", "[modbus][exchangemode][mbmaster][mbtcpma
 	SECTION("ReadOnly")
 	{
 		// emReadOnly=2,        /*!< "только чтение" (работают только read-функции) */
-        ui->setValue(exchangeMode, MBExchange::emReadOnly );
-        REQUIRE( ui->getValue(exchangeMode) == MBExchange::emReadOnly );
+		ui->setValue(exchangeMode, MBConfig::emReadOnly );
+		REQUIRE( ui->getValue(exchangeMode) == MBConfig::emReadOnly );
 
 		SECTION("read")
 		{
@@ -566,8 +572,8 @@ TEST_CASE("MBTCPMaster: exchangeMode", "[modbus][exchangemode][mbmaster][mbtcpma
 	SECTION("SkipSaveToSM")
 	{
 		// emSkipSaveToSM=3,    /*!< не писать данные в SM (при этом работают и read и write функции */
-        ui->setValue(exchangeMode, MBExchange::emSkipSaveToSM );
-        REQUIRE( ui->getValue(exchangeMode) == MBExchange::emSkipSaveToSM );
+		ui->setValue(exchangeMode, MBConfig::emSkipSaveToSM );
+		REQUIRE( ui->getValue(exchangeMode) == MBConfig::emSkipSaveToSM );
 
 		SECTION("read")
 		{
@@ -592,8 +598,8 @@ TEST_CASE("MBTCPMaster: exchangeMode", "[modbus][exchangemode][mbmaster][mbtcpma
 	SECTION("SkipExchange")
 	{
 		// emSkipExchange=4  /*!< отключить обмен */
-        ui->setValue(exchangeMode, MBExchange::emSkipExchange );
-        REQUIRE( ui->getValue(exchangeMode) == MBExchange::emSkipExchange );
+		ui->setValue(exchangeMode, MBConfig::emSkipExchange );
+		REQUIRE( ui->getValue(exchangeMode) == MBConfig::emSkipExchange );
 
 		SECTION("read")
 		{
@@ -613,8 +619,8 @@ TEST_CASE("MBTCPMaster: exchangeMode", "[modbus][exchangemode][mbmaster][mbtcpma
 		{
 			msleep(1100);
 			CHECK( ui->getValue(slaveNotRespond) == 1 );
-            ui->setValue(exchangeMode, MBExchange::emNone );
-            REQUIRE( ui->getValue(exchangeMode) == MBExchange::emNone );
+			ui->setValue(exchangeMode, MBConfig::emNone );
+			REQUIRE( ui->getValue(exchangeMode) == MBConfig::emNone );
 			msleep(1100);
 			CHECK( ui->getValue(slaveNotRespond) == 0 );
 		}
@@ -766,6 +772,23 @@ TEST_CASE("MBTCPMaster: udefined value", "[modbus][undefined][mbmaster][mbtcpmas
     REQUIRE( ui->getValue(1070) == 120 );
 }
 // -----------------------------------------------------------------------------
+TEST_CASE("MBTCPMaster: reload config", "[modbus][reload][mbmaster][mbtcpmaster]")
+{
+	InitTest();
+
+	mbs->setReply(160);
+	msleep(polltime + 200);
+	REQUIRE( ui->getValue(1070) == 160 );
+	REQUIRE( ui->getValue(1080) == 1080 );
+
+	// add new mbreg
+	REQUIRE( mbm->reconfigure(confile2) );
+
+	msleep(polltime + 600);
+	REQUIRE( ui->getValue(1080) == 160 );
+}
+// -----------------------------------------------------------------------------
+
 #if 0
 // -----------------------------------------------------------------------------
 static bool init_iobase( IOBase* ib, const std::string& sensor )

extensions/include/UObject_SK.h

@@ -187,7 +187,7 @@ class UObject_SK:
         virtual void httpGetUserData( Poco::JSON::Object::Ptr& jdata ) {} /*!<  для пользовательских данных в httpGet() */
         virtual Poco::JSON::Object::Ptr httpDumpIO();
         virtual Poco::JSON::Object::Ptr httpRequestLog( const Poco::URI::QueryParameters& p );
-        virtual Poco::JSON::Object::Ptr request_conf_set( const std::string& req, const Poco::URI::QueryParameters& p );
+        virtual Poco::JSON::Object::Ptr request_conf_set( const std::string& req, const Poco::URI::QueryParameters& p ) override;
 #endif
 
         // Выполнение очередного шага программы

extensions/lib/UObject_SK.cc

@@ -705,12 +705,47 @@ Poco::JSON::Object::Ptr UObject_SK::httpRequestLog( const Poco::URI::QueryParame
 Poco::JSON::Object::Ptr UObject_SK::request_conf_set( const std::string& req, const Poco::URI::QueryParameters& params )
 {
     Poco::JSON::Object::Ptr jret = new Poco::JSON::Object();
+    Poco::JSON::Array::Ptr jupdated = uniset::json::make_child_array(jret, "updated");
+    
     for( const auto& p: params )
     {
+        if( p.first == "sleep_msec" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                sleep_msec = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
+        if( p.first == "resetMsgTime" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                resetMsgTime = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
+        if( p.first == "forceOut" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                forceOut = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
         
     }
 
-    jret->set("Result","OK");
+    jret->set("Result", (jupdated->size() > 0 ? "OK" : "FAIL") );
     return jret;
 }
 #endif

include/modbus/ModbusTCPServer.h

@@ -60,9 +60,6 @@ namespace uniset
             /*! текущее количество подключений */
             size_t getCountSessions() const noexcept;
 
-            void setIgnoreAddrMode( bool st );
-            bool getIgnoreAddrMode() const noexcept;
-
 			// Сбор статистики по соединениям...
 			struct SessionInfo
 			{

src/Communications/Modbus/ModbusTCPServer.cc

@@ -81,16 +81,6 @@ namespace uniset
 		return sessCount;
 	}
 	// -------------------------------------------------------------------------
-	void ModbusTCPServer::setIgnoreAddrMode(bool st)
-	{
-		ignoreAddr = st;
-	}
-	// -------------------------------------------------------------------------
-	bool ModbusTCPServer::getIgnoreAddrMode() const noexcept
-	{
-		return ignoreAddr;
-	}
-	// -------------------------------------------------------------------------
 	void ModbusTCPServer::setSessionTimeout( timeout_t msec )
 	{
 		sessTimeout = msec;

uniset2.files

-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/gcc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/gcc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-1/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-1/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-1/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-1/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++-config-0/coverity-macro-compat.h
 ./docs/Makefile.am
 ./extensions/Backend-OpenTSDB/BackendOpenTSDB.cc
 ./extensions/Backend-OpenTSDB/BackendOpenTSDB.h
@@ -132,6 +110,8 @@
 ./extensions/Makefile.am
 ./extensions/ModbusMaster/main.cc
 ./extensions/ModbusMaster/Makefile.am
+./extensions/ModbusMaster/MBConfig.cc
+./extensions/ModbusMaster/MBConfig.h
 ./extensions/ModbusMaster/MBExchange.cc
 ./extensions/ModbusMaster/MBExchange.h
 ./extensions/ModbusMaster/mb-perf-test.cc