Commit dbc9f370 authored by Pavel Vainerman's avatar Pavel Vainerman

(smemory-plus): добавил вывод логов -add-XXX

parent c8fa61d2
...@@ -165,15 +165,16 @@ ...@@ -165,15 +165,16 @@
</services> </services>
<!-- ******************* Идентификаторы объектов ***************** --> <!-- ******************* Идентификаторы объектов ***************** -->
<objects name="UniObjects"> <objects name="UniObjects">
<item name="TestProc"/> <item id="6000" name="TestProc"/>
<item name="LProcessor"/> <item id="6001" name="LProcessor"/>
<item name="IOControl"/> <item id="6002" name="IOControl"/>
<item name="RTUExchange"/> <item id="6003" name="RTUExchange"/>
<item name="MBSlave1"/> <item id="6004" name="MBSlave1"/>
<item name="MBMaster1"/> <item id="6005" name="MBMaster1"/>
<item name="UDPExchange"/> <item id="6006" name="UDPExchange"/>
<item name="UDPExchange2"/> <item id="6007" name="UDPExchange2"/>
<item name="UNetExchange"/> <item id="6008" name="UNetExchange"/>
<item id="6009" name="MBMaster2"/>
</objects> </objects>
</ObjectsMap> </ObjectsMap>
<messages idfromfile="1" name="messages"> <messages idfromfile="1" name="messages">
......
...@@ -81,6 +81,9 @@ int main( int argc, const char **argv ) ...@@ -81,6 +81,9 @@ int main( int argc, const char **argv )
p << "io"; p << "io";
if( i > 0 ) p << i; if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add IOControl(" << p.str() << ")" << endl;
IOControl* ic = IOControl::init_iocontrol(argc,argv,shm->getId(),shm,p.str()); IOControl* ic = IOControl::init_iocontrol(argc,argv,shm->getId(),shm,p.str());
if( ic == NULL ) if( ic == NULL )
return 1; return 1;
...@@ -106,6 +109,9 @@ int main( int argc, const char **argv ) ...@@ -106,6 +109,9 @@ int main( int argc, const char **argv )
p << "rtu"; p << "rtu";
if( i > 0 ) p << i; if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add RTUExchange(" << p.str() << ")" << endl;
RTUExchange* rtu = RTUExchange::init_rtuexchange(argc,argv,shm->getId(),shm,p.str()); RTUExchange* rtu = RTUExchange::init_rtuexchange(argc,argv,shm->getId(),shm,p.str());
if( rtu == NULL ) if( rtu == NULL )
return 1; return 1;
...@@ -127,6 +133,9 @@ int main( int argc, const char **argv ) ...@@ -127,6 +133,9 @@ int main( int argc, const char **argv )
p << "mbs"; p << "mbs";
if( i > 0 ) p << i; if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add MBSlave(" << p.str() << ")" << endl;
MBSlave* mbs = MBSlave::init_mbslave(argc,argv,shm->getId(),shm,p.str()); MBSlave* mbs = MBSlave::init_mbslave(argc,argv,shm->getId(),shm,p.str());
if( mbs == NULL ) if( mbs == NULL )
return 1; return 1;
...@@ -139,7 +148,7 @@ int main( int argc, const char **argv ) ...@@ -139,7 +148,7 @@ int main( int argc, const char **argv )
for( int i=0; i<MaxAddNum; i++ ) for( int i=0; i<MaxAddNum; i++ )
{ {
stringstream s; stringstream s;
s << "--add-mbtcp"; s << "--add-mbmaster";
if( i>0 ) s << i; if( i>0 ) s << i;
bool add_mbmaster = findArgParam(s.str(),argc,argv) != -1; bool add_mbmaster = findArgParam(s.str(),argc,argv) != -1;
...@@ -150,6 +159,9 @@ int main( int argc, const char **argv ) ...@@ -150,6 +159,9 @@ int main( int argc, const char **argv )
p << "mbtcp"; p << "mbtcp";
if( i > 0 ) p << i; if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add MBTCPMaster(" << p.str() << ")" << endl;
MBTCPMaster* mbm1 = MBTCPMaster::init_mbmaster(argc,argv,shm->getId(),shm,p.str()); MBTCPMaster* mbm1 = MBTCPMaster::init_mbmaster(argc,argv,shm->getId(),shm,p.str());
if( mbm1 == NULL ) if( mbm1 == NULL )
return 1; return 1;
...@@ -165,6 +177,9 @@ int main( int argc, const char **argv ) ...@@ -165,6 +177,9 @@ int main( int argc, const char **argv )
if( unet == NULL ) if( unet == NULL )
return 1; return 1;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add UNetExchnage.." << endl;
act.addObject(static_cast<class UniSetObject*>(unet)); act.addObject(static_cast<class UniSetObject*>(unet));
} }
// --------------------------------------- // ---------------------------------------
......
...@@ -4,7 +4,7 @@ ulimit -Sc 10000000 ...@@ -4,7 +4,7 @@ ulimit -Sc 10000000
START=uniset-start.sh START=uniset-start.sh
${START} -f ./uniset-smemory-plus --smemory-id SharedMemory --confile test.xml \ ${START} -f ./uniset-smemory-plus --smemory-id SharedMemory --confile test.xml \
--unideb-add-levels info,crit,warn,level9,system,level3,level2,level1 \ --dlog-add-levels any \
--io-name IOControl \ --io-name IOControl \
--io-polltime 100 \ --io-polltime 100 \
--io-s-filter-field io \ --io-s-filter-field io \
...@@ -22,6 +22,15 @@ ${START} -f ./uniset-smemory-plus --smemory-id SharedMemory --confile test.xml ...@@ -22,6 +22,15 @@ ${START} -f ./uniset-smemory-plus --smemory-id SharedMemory --confile test.xml
--mbtcp-gateway-port 2048 \ --mbtcp-gateway-port 2048 \
--mbtcp-recv-timeout 200 \ --mbtcp-recv-timeout 200 \
--mbtcp-force-out 1 \ --mbtcp-force-out 1 \
--add-mbmaster2 \
--mbtcp2-name MBMaster2 \
--mbtcp2-confnode MBMaster1 \
--mbtcp2-filter-field rs \
--mbtcp2-filter-value 1 \
--mbtcp2-gateway-iaddr localhost \
--mbtcp2-gateway-port 2049 \
--mbtcp2-recv-timeout 200 \
--mbtcp2-force-out 1 \
# --add-rtu \ # --add-rtu \
# --rs-dev /dev/cbsideA1 \ # --rs-dev /dev/cbsideA1 \
# --rs-id RTUExchange \ # --rs-id RTUExchange \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment