(SmemoryPlus): Решение проблеммы с "FATAL: exception not rethrown".

extensions/ModbusMaster/MBExchange.cc

@@ -165,13 +165,19 @@ MBExchange::~MBExchange()
     {
         if( it1->second->rtu )
         {
-            delete it1->second->rtu;
-            it1->second->rtu = 0;
+            try {
+                delete it1->second->rtu;
+                it1->second->rtu = 0;
+            }catch(...){}
         }
 
         RTUDevice* d(it1->second);
         for( auto it=d->regmap.begin(); it!=d->regmap.end(); ++it )
-            delete it->second;
+        {
+            try {
+                delete it->second;
+            }catch(...){}
+        }
 
         delete it1->second;
     }
@@ -193,7 +199,8 @@ void MBExchange::waitSMReady()
         ostringstream err;
         err << myname << "(waitSMReady): failed waiting SharedMemory " << ready_timeout << " msec";
         dcrit << err.str() << endl;
-        throw SystemError(err.str());
+        if( checkProcActive() )
+               throw SystemError(err.str());
     }
 }
 // -----------------------------------------------------------------------------
@@ -233,7 +240,15 @@ void MBExchange::sigterm( int signo )
 {
     dwarn << myname << ": ********* SIGTERM(" << signo << ") ********" << endl;
     setProcActive(false);
-    UniSetObject_LT::sigterm(signo);
+    try
+    {
+        UniSetObject_LT::sigterm(signo);
+    }
+    catch( ... )
+    {
+//        std::exception_ptr p = std::current_exception();
+//        std::clog <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
+    }
 }
 // ------------------------------------------------------------------------------------------
 void MBExchange::readConfiguration()
@@ -1507,7 +1522,7 @@ void MBExchange::updateMTR( RegMap::iterator& rit )
                 if( r->mtrType == MTR::mtT4 )
                 {
                     if( save )
-					{
+                    {
                         dwarn << myname << "(updateMTR): write (T4) reg(" << dat2str(r->mbreg) << ") to MTR NOT YET!!!" << endl;
                     }
                     else
@@ -2580,7 +2595,8 @@ void MBExchange::askSensors( UniversalIO::UIOCommand cmd )
 
         dcrit << err.str() << endl;
         kill(SIGTERM,getpid());    // прерываем (перезапускаем) процесс...
-        throw SystemError(err.str());
+        // throw SystemError(err.str());
+        return;
     }
 
     try

extensions/ModbusMaster/MBTCPMaster.cc

@@ -75,6 +75,12 @@ pollThread(0)
 // -----------------------------------------------------------------------------
 MBTCPMaster::~MBTCPMaster()
 {
+    if( pollThread )
+    {
+        pollThread->stop();
+        if( pollThread->isRunning() )
+            pollThread->join();
+    }
     delete pollThread;
     //delete mbtcp;
 }
@@ -146,12 +152,20 @@ void MBTCPMaster::poll_thread()
             if( sidExchangeMode != DefaultObjectId && force )
                 exchangeMode = shm->localGetValue(itExchangeMode,sidExchangeMode);
         }
-        catch(...){}
+        catch(...)
+        {
+            throw;
+        }
+
         try
         {
             poll();
         }
-        catch(...){}
+        catch(...)
+        {
+//            if( !checkProcActive() )
+                throw;
+        }
 
         if( !checkProcActive() )
             break;
@@ -160,6 +174,36 @@ void MBTCPMaster::poll_thread()
     }
 }
 // -----------------------------------------------------------------------------
+void MBTCPMaster::sigterm( int signo )
+{
+    setProcActive(false);
+
+    if( pollThread )
+    {
+        pollThread->stop();
+        if( pollThread->isRunning() )
+            pollThread->join();
+        
+        delete pollThread;
+        pollThread = 0;
+    }
+
+    try
+    {
+        MBExchange::sigterm(signo);
+    }
+    catch( const std::exception& ex )
+    {
+        cerr << "catch: " << ex.what() << endl;
+    }
+    catch( ... )
+    {
+        std::exception_ptr p = std::current_exception();
+        std::clog <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
+    }
+}
+
+// -----------------------------------------------------------------------------
 void MBTCPMaster::help_print( int argc, const char* const* argv )
 {
     cout << "Default: prefix='mbtcp'" << endl;

extensions/ModbusMaster/MBTCPMaster.h

@@ -208,6 +208,7 @@ class MBTCPMaster:
     protected:
         virtual void sysCommand( const UniSetTypes::SystemMessage *sm ) override;
         virtual std::shared_ptr<ModbusClient> initMB( bool reopen=false ) override;
+        virtual void sigterm( int signo ) override;
 
         UniSetTypes::uniset_rwmutex mbMutex;
         std::string iaddr;

extensions/ModbusMaster/main.cc

@@ -78,9 +78,12 @@ int main( int argc, const char** argv )
     }
     catch(...)
     {
+        std::exception_ptr p = std::current_exception();
+        std::clog <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
+
         dcrit << "(mbtcpmaster): catch ..." << std::endl;
     }
 
-	on_sigchild(SIGTERM);
+    on_sigchild(SIGTERM);
     return 1;
 }

extensions/ModbusMaster/mtr-conv.cc

@@ -9,106 +9,106 @@ using namespace MTR;
 // --------------------------------------------------------------------------
 static void print_help()
 {
-	printf("Usage: mtrconv TYPE[T1...T12,T16,T17] hex1 hex2\n");
+    printf("Usage: mtrconv TYPE[T1...T12,T16,T17] hex1 hex2\n");
 }
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
 {   
-	unsigned short v1 = 0;
-	unsigned short v2 = 0;
-	const char* type="";
+    unsigned short v1 = 0;
+    unsigned short v2 = 0;
+    const char* type="";
 
-	if( argc<2 )
-	{
-		print_help();
-		return 1;
-	}
+    if( argc<2 )
+    {
+        print_help();
+        return 1;
+    }
 
-	type = argv[1];
-	v1 = UniSetTypes::uni_atoi(argv[2]);
+    type = argv[1];
+    v1 = UniSetTypes::uni_atoi(argv[2]);
 
-	if( argc>=4 )
-	{
-		v1 = UniSetTypes::uni_atoi(argv[3]);
-		v2 = UniSetTypes::uni_atoi(argv[2]);
-	}
+    if( argc>=4 )
+    {
+        v1 = UniSetTypes::uni_atoi(argv[3]);
+        v2 = UniSetTypes::uni_atoi(argv[2]);
+    }
 
 
-	if( !strcmp(type,"T1") )
-		cout << "(T1): v1=" << v1 << " --> (unsigned) " << v1 << endl;
-	else if( !strcmp(type,"T2") )
-		cout << "(T2): v1=" << v1 << " --> (signed) " << (signed short)v1 << endl;
-	else if( !strcmp(type,"T16") )
-	{
-		T16 t(v1);
-		cout << "(T16): v1=" << t.val << " float=" << t.fval << endl;
-	}
-	else if( !strcmp(type,"T17") )
-	{
-		T17 t(v1);
-		cout << "(T17): v1=" << t.val << " float=" << t.fval << endl;
-	}
-	else if( !strcmp(type,"T3") )
-	{
-		T3 t(v1,v2);
-		cout << "(T3): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-	}
-	else if( !strcmp(type,"T4") )
-	{
-		T4 t(v1);
-		cout << "(T4): v1=" << t.raw
-			<< " --> " << t << endl;
-	}
-	else if( !strcmp(type,"T5") )
-	{
-		T5 t(v1,v2);
-		cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-	}
-	else if( !strcmp(type,"T6") )
-	{
-		T6 t(v1,v2);
-		cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-	}
-	else if( !strcmp(type,"T7") )
-	{
-		T7 t(v1,v2);
-		cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-//			<< " --> " << T7.val << " * 10^-4"
-			<< " ===> " << t << endl;
-	}
-	else if( !strcmp(type,"T8") )
-	{
-		T8 t(v1,v2);
-		cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-	}
-	else if( !strcmp(type,"T9") )
-	{
-		T9 t(v1,v2);
-		cout << "(T9): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-	}
-	else if( !strcmp(type,"T10") )
-	{
-		T10 t(v1,v2);
-		cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-	}
-	else if( !strcmp(type,"F1") )
-	{
-		F1 f(v1,v2);
-		cout << "(F1): v1=" << f.raw.v[0] << " v2=" << f.raw.v[1]
-			<< " ===> " << f.raw.val << endl;
-	}
-	else
-	{
-		cout << " Unknown type: " << type << endl;
-		return 1;
-	}
+    if( !strcmp(type,"T1") )
+        cout << "(T1): v1=" << v1 << " --> (unsigned) " << v1 << endl;
+    else if( !strcmp(type,"T2") )
+        cout << "(T2): v1=" << v1 << " --> (signed) " << (signed short)v1 << endl;
+    else if( !strcmp(type,"T16") )
+    {
+        T16 t(v1);
+        cout << "(T16): v1=" << t.val << " float=" << t.fval << endl;
+    }
+    else if( !strcmp(type,"T17") )
+    {
+        T17 t(v1);
+        cout << "(T17): v1=" << t.val << " float=" << t.fval << endl;
+    }
+    else if( !strcmp(type,"T3") )
+    {
+        T3 t(v1,v2);
+        cout << "(T3): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+    }
+    else if( !strcmp(type,"T4") )
+    {
+        T4 t(v1);
+        cout << "(T4): v1=" << t.raw
+            << " --> " << t << endl;
+    }
+    else if( !strcmp(type,"T5") )
+    {
+        T5 t(v1,v2);
+        cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+    }
+    else if( !strcmp(type,"T6") )
+    {
+        T6 t(v1,v2);
+        cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+    }
+    else if( !strcmp(type,"T7") )
+    {
+        T7 t(v1,v2);
+        cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+//            << " --> " << T7.val << " * 10^-4"
+            << " ===> " << t << endl;
+    }
+    else if( !strcmp(type,"T8") )
+    {
+        T8 t(v1,v2);
+        cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+    }
+    else if( !strcmp(type,"T9") )
+    {
+        T9 t(v1,v2);
+        cout << "(T9): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+    }
+    else if( !strcmp(type,"T10") )
+    {
+        T10 t(v1,v2);
+        cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+    }
+    else if( !strcmp(type,"F1") )
+    {
+        F1 f(v1,v2);
+        cout << "(F1): v1=" << f.raw.v[0] << " v2=" << f.raw.v[1]
+            << " ===> " << f.raw.val << endl;
+    }
+    else
+    {
+        cout << " Unknown type: " << type << endl;
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 // --------------------------------------------------------------------------

extensions/ModbusMaster/mtr-read.cc

@@ -12,398 +12,398 @@ using namespace UniSetTypes;
 using namespace std;
 // --------------------------------------------------------------------------
 static struct option longopts[] = {
-	{ "help", no_argument, 0, 'h' },
-	{ "read03", required_argument, 0, 'r' },
-	{ "read04", required_argument, 0, 'x' },
-	{ "read-model", required_argument, 0, 'm' },
-	{ "read-serial", required_argument, 0, 'n' },
-	{ "device", required_argument, 0, 'd' },
-	{ "verbose", no_argument, 0, 'v' },
-	{ "speed", required_argument, 0, 's' },
-	{ "use485F", no_argument, 0, 'y' },
-	{ "num-cycles", required_argument, 0, 'l' },
-	{ "timeout", required_argument, 0, 't' },
-	{ NULL, 0, 0, 0 }
+    { "help", no_argument, 0, 'h' },
+    { "read03", required_argument, 0, 'r' },
+    { "read04", required_argument, 0, 'x' },
+    { "read-model", required_argument, 0, 'm' },
+    { "read-serial", required_argument, 0, 'n' },
+    { "device", required_argument, 0, 'd' },
+    { "verbose", no_argument, 0, 'v' },
+    { "speed", required_argument, 0, 's' },
+    { "use485F", no_argument, 0, 'y' },
+    { "num-cycles", required_argument, 0, 'l' },
+    { "timeout", required_argument, 0, 't' },
+    { NULL, 0, 0, 0 }
 };
 // --------------------------------------------------------------------------
 static void print_help()
 {
-	printf("-h|--help 		- this message\n");
-	printf("[--read03] slaveaddr reg mtrtype  - read from MTR (mtrtype: T1...T10,T16,T17,F1)\n");
-	printf("[--read04] slaveaddr reg mtrtype  - read from MTR (mtrtype: T1...T10,T16,T17,F1)\n");
-	printf("[-m|--read-model] slaveaddr     - read model name from MTR\n");
-	printf("[-n|--read-serial] slaveaddr    - read serial number from MTR\n");
-	printf("[-y|--use485F]                  - use RS485 Fastwel.\n");
-	printf("[-d|--device] dev               - use device dev. Default: /dev/ttyS0\n");
-	printf("[-s|--speed] speed              - 9600,14400,19200,38400,57600,115200. Default: 38400.\n");
-	printf("[-t|--timeout] msec             - Timeout. Default: 2000.\n");
-	printf("[-l|--num-cycles] num           - Number of cycles of exchange. Default: -1 infinitely.\n");
-	printf("[-v|--verbose]                  - Print all messages to stdout\n");
+    printf("-h|--help         - this message\n");
+    printf("[--read03] slaveaddr reg mtrtype  - read from MTR (mtrtype: T1...T10,T16,T17,F1)\n");
+    printf("[--read04] slaveaddr reg mtrtype  - read from MTR (mtrtype: T1...T10,T16,T17,F1)\n");
+    printf("[-m|--read-model] slaveaddr     - read model name from MTR\n");
+    printf("[-n|--read-serial] slaveaddr    - read serial number from MTR\n");
+    printf("[-y|--use485F]                  - use RS485 Fastwel.\n");
+    printf("[-d|--device] dev               - use device dev. Default: /dev/ttyS0\n");
+    printf("[-s|--speed] speed              - 9600,14400,19200,38400,57600,115200. Default: 38400.\n");
+    printf("[-t|--timeout] msec             - Timeout. Default: 2000.\n");
+    printf("[-l|--num-cycles] num           - Number of cycles of exchange. Default: -1 infinitely.\n");
+    printf("[-v|--verbose]                  - Print all messages to stdout\n");
 }
 // --------------------------------------------------------------------------
 enum Command
 {
-	cmdNOP,
-	cmdRead03,
-	cmdRead04,
-	cmdModel,
-	cmdSerial
+    cmdNOP,
+    cmdRead03,
+    cmdRead04,
+    cmdModel,
+    cmdSerial
 };
 // --------------------------------------------------------------------------
 static char* checkArg( int ind, int argc, char* argv[] );
 static void readMTR( ModbusRTUMaster* mb, ModbusRTU::ModbusAddr addr, 
-						ModbusRTU::ModbusData reg, MTR::MTRType t, Command cmd );
+                        ModbusRTU::ModbusData reg, MTR::MTRType t, Command cmd );
 // --------------------------------------------------------------------------
 
 int main( int argc, char **argv )
 {   
-	Command cmd = cmdNOP;
-	int optindex = 0;
-	int opt = 0;
-	int verb = 0;
-	string dev("/dev/ttyS0");
-	string speed("38400");
-	ModbusRTU::ModbusData reg = 0;
-	ModbusRTU::ModbusAddr slaveaddr = 0x00;
-	int tout = 2000;
-	DebugStream dlog;
-//	string tofile("");
-	int use485 = 0;
-	int ncycles = -1;
-	MTR::MTRType mtrtype = MTR::mtUnknown;
-
-	try
-	{
-		while( (opt = getopt_long(argc, argv, "hvyq:r:d:s:t:x:m:n:",longopts,&optindex)) != -1 )
-		{
-			switch (opt)
-			{
-				case 'h':
-					print_help();
-				return 0;
-
-				case 'r':
-				case 'x':
-				{
-					if( opt == 'r' )
-						cmd = cmdRead03;
-					else
-						cmd = cmdRead04;
-
-					slaveaddr = ModbusRTU::str2mbAddr( optarg );
-					if( !checkArg(optind,argc,argv) )
-					{
-						cerr << "no argument is given: 'reg'.." << endl;
-						return 1;
-					}
-					reg = ModbusRTU::str2mbData(argv[optind]);
-
-					if( !checkArg(optind+1,argc,argv) )
-					{
-						cerr << "no argument is given: 'mtrtype'.." << endl;
-						return 1;
-					}
-
-					mtrtype = MTR::str2type(argv[optind+1]);
-					if( mtrtype == MTR::mtUnknown )
-					{
-						cerr << "command error: Unknown mtr type: '" << string(argv[optind+1]) << "'" << endl;
-						return 1;
-					}
-				}
-				break;
-
-				case 'm':
-				{
-					cmd = cmdModel;
-					slaveaddr = ModbusRTU::str2mbAddr( optarg );
-				}
-				break;
-
-				case 'n':
-				{
-					cmd = cmdSerial;
-					slaveaddr = ModbusRTU::str2mbAddr( optarg );
-				}
-				break;
-
-				case 'y':
-					use485 = 1;
-				break;
-
-				case 'd':
-					dev = string(optarg);
-				break;
-
-				case 's':
-					speed = string(optarg);
-				break;
-
-				case 't':
-					tout = uni_atoi(optarg);
-				break;
-
-				case 'v':
-					verb = 1;
-				break;
-
-				case 'l':
-					ncycles = uni_atoi(optarg);
-				break;
-
-				case '?':
-				default:
-					printf("? argumnet\n");
-					return 0;
-			}
-		}
-
-		if( verb )
-		{
-			cout << "(init): dev=" << dev << " speed=" << speed
-					<< " timeout=" << tout << " msec "
-					<< endl;
-		}
-
-		ModbusRTUMaster mb(dev,use485);
-
-		if( verb )
-			dlog.addLevel(Debug::ANY);
-
-		mb.setTimeout(tout);
-		mb.setSpeed(speed);
-		mb.setLog(dlog);
-
-		int nc = 1;
-		if( ncycles > 0 )
-			nc = ncycles;
-
-		while( nc )
-		{
-			try
-			{
-
-			switch(cmd)
-			{
-				case cmdRead03:
-				case cmdRead04:
-				{
-					if( verb )
-					{
-						cout << " slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-							 << " reg=" << ModbusRTU::dat2str(reg) << "(" << (int)reg << ")"
-							 << " mtrType=" << MTR::type2str(mtrtype)
-							 << endl;
-					}
-
-					readMTR( &mb, slaveaddr, reg, mtrtype, cmd );
-				}
-				break;
-
-				case cmdModel:
-				{
-					if( verb )
-					{
-						cout << " read model name: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-							 << endl;
-					}
-
-					string s(MTR::getModelNumber(&mb, slaveaddr));
-					cout << (s.empty()? "Don`t read model name.":s) << endl;
-					return 0;
-				}
-				break;
-
-				case cmdSerial:
-				{
-					if( verb )
-					{
-						cout << " read serial number: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-							 << endl;
-					}
-
-					string s(MTR::getSerialNumber(&mb, slaveaddr));
-					cout << (s.empty()? "Don`t read serial number.":s) << endl;
-					return 0;
-				}
-				break;
-
-				case cmdNOP:
-				default:
-					cerr << "No command. Use -h for help." << endl;
-					return 1;
-			}
-			}
+    Command cmd = cmdNOP;
+    int optindex = 0;
+    int opt = 0;
+    int verb = 0;
+    string dev("/dev/ttyS0");
+    string speed("38400");
+    ModbusRTU::ModbusData reg = 0;
+    ModbusRTU::ModbusAddr slaveaddr = 0x00;
+    int tout = 2000;
+    DebugStream dlog;
+//    string tofile("");
+    int use485 = 0;
+    int ncycles = -1;
+    MTR::MTRType mtrtype = MTR::mtUnknown;
+
+    try
+    {
+        while( (opt = getopt_long(argc, argv, "hvyq:r:d:s:t:x:m:n:",longopts,&optindex)) != -1 )
+        {
+            switch (opt)
+            {
+                case 'h':
+                    print_help();
+                return 0;
+
+                case 'r':
+                case 'x':
+                {
+                    if( opt == 'r' )
+                        cmd = cmdRead03;
+                    else
+                        cmd = cmdRead04;
+
+                    slaveaddr = ModbusRTU::str2mbAddr( optarg );
+                    if( !checkArg(optind,argc,argv) )
+                    {
+                        cerr << "no argument is given: 'reg'.." << endl;
+                        return 1;
+                    }
+                    reg = ModbusRTU::str2mbData(argv[optind]);
+
+                    if( !checkArg(optind+1,argc,argv) )
+                    {
+                        cerr << "no argument is given: 'mtrtype'.." << endl;
+                        return 1;
+                    }
+
+                    mtrtype = MTR::str2type(argv[optind+1]);
+                    if( mtrtype == MTR::mtUnknown )
+                    {
+                        cerr << "command error: Unknown mtr type: '" << string(argv[optind+1]) << "'" << endl;
+                        return 1;
+                    }
+                }
+                break;
+
+                case 'm':
+                {
+                    cmd = cmdModel;
+                    slaveaddr = ModbusRTU::str2mbAddr( optarg );
+                }
+                break;
+
+                case 'n':
+                {
+                    cmd = cmdSerial;
+                    slaveaddr = ModbusRTU::str2mbAddr( optarg );
+                }
+                break;
+
+                case 'y':
+                    use485 = 1;
+                break;
+
+                case 'd':
+                    dev = string(optarg);
+                break;
+
+                case 's':
+                    speed = string(optarg);
+                break;
+
+                case 't':
+                    tout = uni_atoi(optarg);
+                break;
+
+                case 'v':
+                    verb = 1;
+                break;
+
+                case 'l':
+                    ncycles = uni_atoi(optarg);
+                break;
+
+                case '?':
+                default:
+                    printf("? argumnet\n");
+                    return 0;
+            }
+        }
+
+        if( verb )
+        {
+            cout << "(init): dev=" << dev << " speed=" << speed
+                    << " timeout=" << tout << " msec "
+                    << endl;
+        }
+
+        ModbusRTUMaster mb(dev,use485);
+
+        if( verb )
+            dlog.addLevel(Debug::ANY);
+
+        mb.setTimeout(tout);
+        mb.setSpeed(speed);
+        mb.setLog(dlog);
+
+        int nc = 1;
+        if( ncycles > 0 )
+            nc = ncycles;
+
+        while( nc )
+        {
+            try
+            {
+
+            switch(cmd)
+            {
+                case cmdRead03:
+                case cmdRead04:
+                {
+                    if( verb )
+                    {
+                        cout << " slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
+                             << " reg=" << ModbusRTU::dat2str(reg) << "(" << (int)reg << ")"
+                             << " mtrType=" << MTR::type2str(mtrtype)
+                             << endl;
+                    }
+
+                    readMTR( &mb, slaveaddr, reg, mtrtype, cmd );
+                }
+                break;
+
+                case cmdModel:
+                {
+                    if( verb )
+                    {
+                        cout << " read model name: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
+                             << endl;
+                    }
+
+                    string s(MTR::getModelNumber(&mb, slaveaddr));
+                    cout << (s.empty()? "Don`t read model name.":s) << endl;
+                    return 0;
+                }
+                break;
+
+                case cmdSerial:
+                {
+                    if( verb )
+                    {
+                        cout << " read serial number: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
+                             << endl;
+                    }
+
+                    string s(MTR::getSerialNumber(&mb, slaveaddr));
+                    cout << (s.empty()? "Don`t read serial number.":s) << endl;
+                    return 0;
+                }
+                break;
+
+                case cmdNOP:
+                default:
+                    cerr << "No command. Use -h for help." << endl;
+                    return 1;
+            }
+            }
             catch( ModbusRTU::mbException& ex )
-			{
-				if( ex.err != ModbusRTU::erTimeOut )
-			throw;
+            {
+                if( ex.err != ModbusRTU::erTimeOut )
+            throw;
 
-		cout << "timeout..." << endl;
+        cout << "timeout..." << endl;
             }
 
-			if( ncycles > 0 )
-			{
-				nc--;
-				if( nc <=0 )
-					break;
-			}
+            if( ncycles > 0 )
+            {
+                nc--;
+                if( nc <=0 )
+                    break;
+            }
 
-			msleep(500);
-		}
-	}
+            msleep(500);
+        }
+    }
     catch( ModbusRTU::mbException& ex )
-	{
-		cerr << "(mtr-read): " << ex << endl;
-	}
-	catch(SystemError& err)
-	{
-		cerr << "(mtr-read): " << err << endl;
-	}
-	catch(Exception& ex)
-	{
-		cerr << "(mtr-read): " << ex << endl;
-	}
-	catch(...)
-	{
-		cerr << "(mtr-read): catch(...)" << endl;
-	}
-
-	return 0;
+    {
+        cerr << "(mtr-read): " << ex << endl;
+    }
+    catch(SystemError& err)
+    {
+        cerr << "(mtr-read): " << err << endl;
+    }
+    catch(Exception& ex)
+    {
+        cerr << "(mtr-read): " << ex << endl;
+    }
+    catch(...)
+    {
+        cerr << "(mtr-read): catch(...)" << endl;
+    }
+
+    return 0;
 }
 // --------------------------------------------------------------------------
 char* checkArg( int i, int argc, char* argv[] )
 {
-	if( i<argc && (argv[i])[0]!='-' )
-		return argv[i];
+    if( i<argc && (argv[i])[0]!='-' )
+        return argv[i];
 
-	return 0;
+    return 0;
 }
 // --------------------------------------------------------------------------
 void readMTR( ModbusRTUMaster* mb, ModbusRTU::ModbusAddr addr, 
-				ModbusRTU::ModbusData reg, MTR::MTRType mtrType, Command cmd )
+                ModbusRTU::ModbusData reg, MTR::MTRType mtrType, Command cmd )
 {
-	int count = MTR::wsize(mtrType);
-	ModbusRTU::ModbusData dat[ModbusRTU::MAXLENPACKET/sizeof(ModbusRTU::ModbusData)];
-	memset(dat,0,sizeof(dat));
-
-	if( cmd == cmdRead03 )
-	{
-		ModbusRTU::ReadOutputRetMessage ret = mb->read03(addr,reg,count);
-		memcpy(dat,ret.data,sizeof(ModbusRTU::ModbusData)*ret.count);
-	}
-	else if( cmd == cmdRead04 )
-	{
-		ModbusRTU::ReadInputRetMessage ret = mb->read04(addr,reg,count);
-		memcpy(dat,ret.data,sizeof(ModbusRTU::ModbusData)*ret.count);
-	}
-	else
-	{
-		cerr << "Unknown command..." << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT1 )
-	{
-		MTR::T1 t(dat[0]);
-		cout << "(T1): v1=" << dat[0] << " --> (unsigned) " << t.val << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT2 )
-	{
-		MTR::T2 t(dat[0]);
-		cout << "(T2): v1=" << dat[0] << " --> (signed) " << t.val << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT3 )
-	{
-		MTR::T3 t(dat,MTR::T3::wsize());
-		cout << "(T3): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT4 )
-	{
-		MTR::T4 t(dat[0]);
-		cout << "(T4): v1=" << t.raw
-			<< " --> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT5 )
-	{
-		MTR::T5 t(dat,MTR::T5::wsize());
-		cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT6 )
-	{
-		MTR::T6 t(dat,MTR::T6::wsize());
-		cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " --> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT7 )
-	{
-		MTR::T7 t(dat,MTR::T7::wsize());
-		cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT16 )
-	{
-		MTR::T16 t(dat[0]);
-		cout << "(T16): v1=" << t.val << " float=" << t.fval << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT17 )
-	{
-		MTR::T17 t(dat[0]);
-		cout << "(T17): v1=" << t.val << " float=" << t.fval << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtF1 )
-	{
-		MTR::F1 f(dat,MTR::F1::wsize());
-		cout << "(F1): v1=" << f.raw.v[0] << " v2=" << f.raw.v[1]
-			<< " ===> " << f << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT8 )
-	{
-		MTR::T8 t(dat,MTR::T8::wsize());
-		cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-		return;
-	}
-
-	if( mtrType == MTR::mtT9 )
-	{
-		MTR::T9 t(dat,MTR::T9::wsize());
-		cout << "(T9): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-
-		return;
-	}
-
-	if( mtrType == MTR::mtT10 )
-	{
-		MTR::T10 t(dat,MTR::T10::wsize());
-		cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
-			<< " ===> " << t << endl;
-
-		return;
-	}
-
-	cerr << "Unsupported mtrtype='" << MTR::type2str(mtrType) << "'" << endl;
+    int count = MTR::wsize(mtrType);
+    ModbusRTU::ModbusData dat[ModbusRTU::MAXLENPACKET/sizeof(ModbusRTU::ModbusData)];
+    memset(dat,0,sizeof(dat));
+
+    if( cmd == cmdRead03 )
+    {
+        ModbusRTU::ReadOutputRetMessage ret = mb->read03(addr,reg,count);
+        memcpy(dat,ret.data,sizeof(ModbusRTU::ModbusData)*ret.count);
+    }
+    else if( cmd == cmdRead04 )
+    {
+        ModbusRTU::ReadInputRetMessage ret = mb->read04(addr,reg,count);
+        memcpy(dat,ret.data,sizeof(ModbusRTU::ModbusData)*ret.count);
+    }
+    else
+    {
+        cerr << "Unknown command..." << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT1 )
+    {
+        MTR::T1 t(dat[0]);
+        cout << "(T1): v1=" << dat[0] << " --> (unsigned) " << t.val << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT2 )
+    {
+        MTR::T2 t(dat[0]);
+        cout << "(T2): v1=" << dat[0] << " --> (signed) " << t.val << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT3 )
+    {
+        MTR::T3 t(dat,MTR::T3::wsize());
+        cout << "(T3): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT4 )
+    {
+        MTR::T4 t(dat[0]);
+        cout << "(T4): v1=" << t.raw
+            << " --> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT5 )
+    {
+        MTR::T5 t(dat,MTR::T5::wsize());
+        cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT6 )
+    {
+        MTR::T6 t(dat,MTR::T6::wsize());
+        cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " --> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT7 )
+    {
+        MTR::T7 t(dat,MTR::T7::wsize());
+        cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT16 )
+    {
+        MTR::T16 t(dat[0]);
+        cout << "(T16): v1=" << t.val << " float=" << t.fval << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT17 )
+    {
+        MTR::T17 t(dat[0]);
+        cout << "(T17): v1=" << t.val << " float=" << t.fval << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtF1 )
+    {
+        MTR::F1 f(dat,MTR::F1::wsize());
+        cout << "(F1): v1=" << f.raw.v[0] << " v2=" << f.raw.v[1]
+            << " ===> " << f << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT8 )
+    {
+        MTR::T8 t(dat,MTR::T8::wsize());
+        cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+        return;
+    }
+
+    if( mtrType == MTR::mtT9 )
+    {
+        MTR::T9 t(dat,MTR::T9::wsize());
+        cout << "(T9): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+
+        return;
+    }
+
+    if( mtrType == MTR::mtT10 )
+    {
+        MTR::T10 t(dat,MTR::T10::wsize());
+        cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+            << " ===> " << t << endl;
+
+        return;
+    }
+
+    cerr << "Unsupported mtrtype='" << MTR::type2str(mtrType) << "'" << endl;
 }

extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -4,7 +4,7 @@
 --confile test.xml \
 --mbtcp-name MBMaster1 \
 --smemory-id SharedMemory \
---dlog-add-levels info,crit,warn,level4,level3 \
+--dlog-add-levels system,info,crit,warn,level4,level3 \
 --mbtcp-set-prop-prefix \
 --mbtcp-filter-field rs \
 --mbtcp-filter-value 5 \

extensions/ModbusMaster/vtconv.cc

@@ -9,114 +9,114 @@ using namespace VTypes;
 // --------------------------------------------------------------------------
 static void print_help()
 {
-	printf("Usage: vtconv TYPE[F2|F4|I2|U2] hex1 hex2 [hex3 hex4]\n");
+    printf("Usage: vtconv TYPE[F2|F4|I2|U2] hex1 hex2 [hex3 hex4]\n");
 }
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
 {   
 /*
-	VTypes::F2 f2;
-	f2.raw.val = 2.345;
-
-	cout << "Example(F2): float=" << f2.raw.val
-		<< " regs:"
-		<< " v[0]=" << f2.raw.v[0]
-		<< " v[1]=" << f2.raw.v[1]
-		<< endl;
-
-	VTypes::F4 f4;
-	f4.raw.val = 2.345123123;
-
-	cout << "Example(F4): float=" << f4.raw.val
-		<< " regs:"
-		<< " v[0]=" << f4.raw.v[0]
-		<< " v[1]=" << f4.raw.v[1]
-		<< " v[2]=" << f4.raw.v[2]
-		<< " v[3]=" << f4.raw.v[3]
-		<< endl;
-
-	cout << "-------------" << endl << endl;
-
-	VTypes::I2 i2;
-	i2.raw.val = -6553004;
-	cout << "Example(I2): int=" << i2.raw.val
-		<< " regs:"
-		<< " v[0]=" << i2.raw.v[0]
-		<< " v[1]=" << i2.raw.v[1]
-		<< endl;
-
-	cout << "-------------" << endl << endl;
-
-	VTypes::U2 u2;
-	u2.raw.val = 655300400;
-	cout << "Example(U2): unsigned int=" << u2.raw.val
-		<< " regs:"
-		<< " v[0]=" << u2.raw.v[0]
-		<< " v[1]=" << u2.raw.v[1]
-		<< endl;
-
-	cout << "-------------" << endl << endl;
-
-//	return 0;
+    VTypes::F2 f2;
+    f2.raw.val = 2.345;
+
+    cout << "Example(F2): float=" << f2.raw.val
+        << " regs:"
+        << " v[0]=" << f2.raw.v[0]
+        << " v[1]=" << f2.raw.v[1]
+        << endl;
+
+    VTypes::F4 f4;
+    f4.raw.val = 2.345123123;
+
+    cout << "Example(F4): float=" << f4.raw.val
+        << " regs:"
+        << " v[0]=" << f4.raw.v[0]
+        << " v[1]=" << f4.raw.v[1]
+        << " v[2]=" << f4.raw.v[2]
+        << " v[3]=" << f4.raw.v[3]
+        << endl;
+
+    cout << "-------------" << endl << endl;
+
+    VTypes::I2 i2;
+    i2.raw.val = -6553004;
+    cout << "Example(I2): int=" << i2.raw.val
+        << " regs:"
+        << " v[0]=" << i2.raw.v[0]
+        << " v[1]=" << i2.raw.v[1]
+        << endl;
+
+    cout << "-------------" << endl << endl;
+
+    VTypes::U2 u2;
+    u2.raw.val = 655300400;
+    cout << "Example(U2): unsigned int=" << u2.raw.val
+        << " regs:"
+        << " v[0]=" << u2.raw.v[0]
+        << " v[1]=" << u2.raw.v[1]
+        << endl;
+
+    cout << "-------------" << endl << endl;
+
+//    return 0;
 */
-	unsigned short v[4];
-	memset(v,0,sizeof(v));
-
-	const char* type="";
-
-	if( argc<3 )
-	{
-		print_help();
-		return 1;
-	}
-
-	type = argv[1];
-	v[0] = UniSetTypes::uni_atoi(argv[2]);
-
-	if( argc>3 )
-		v[1] = UniSetTypes::uni_atoi(argv[3]);
-
-	if( argc>4 )
-		v[2] = UniSetTypes::uni_atoi(argv[4]);
-
-	if( argc>5 )
-		v[3] = UniSetTypes::uni_atoi(argv[5]);
-
-	if( !strcmp(type,"F2") )
-	{
-		VTypes::F2 f(v,sizeof(v));
-		cout << "(F2): v[0]=" << v[0]
-			 << " v[1]=" << v[1]
-			<< " --> (float) " << (float)f << endl;
-	}
-	else if( !strcmp(type,"F4") )
-	{
-		VTypes::F4 f(v,sizeof(v));
-		cout << "(F4): v[0]=" << v[0]
-			 << " v[1]=" << v[1]
-			 << " v[2]=" << v[2]
-			 << " v[3]=" << v[3]
-			<< " --> (float) " << (float)f << endl;
-	}
-	else if( !strcmp(type,"I2") )
-	{
-		VTypes::I2 i(v,sizeof(v));
-		cout << "(I2): v[0]=" << v[0]
-			 << " v[1]=" << v[1]
-			<< " --> (int) " << (int)i << endl;
-	}
-	else if( !strcmp(type,"U2") )
-	{
-		VTypes::U2 i(v,sizeof(v));
-		cout << "(U2): v[0]=" << v[0]
-			 << " v[1]=" << v[1]
-			<< " --> (unsigned int) " << (unsigned int)i << endl;
-	}
-	else
-	{
-		cout << " Unknown type: " << type << endl;
-	}
-
-	return 0;
+    unsigned short v[4];
+    memset(v,0,sizeof(v));
+
+    const char* type="";
+
+    if( argc<3 )
+    {
+        print_help();
+        return 1;
+    }
+
+    type = argv[1];
+    v[0] = UniSetTypes::uni_atoi(argv[2]);
+
+    if( argc>3 )
+        v[1] = UniSetTypes::uni_atoi(argv[3]);
+
+    if( argc>4 )
+        v[2] = UniSetTypes::uni_atoi(argv[4]);
+
+    if( argc>5 )
+        v[3] = UniSetTypes::uni_atoi(argv[5]);
+
+    if( !strcmp(type,"F2") )
+    {
+        VTypes::F2 f(v,sizeof(v));
+        cout << "(F2): v[0]=" << v[0]
+             << " v[1]=" << v[1]
+            << " --> (float) " << (float)f << endl;
+    }
+    else if( !strcmp(type,"F4") )
+    {
+        VTypes::F4 f(v,sizeof(v));
+        cout << "(F4): v[0]=" << v[0]
+             << " v[1]=" << v[1]
+             << " v[2]=" << v[2]
+             << " v[3]=" << v[3]
+            << " --> (float) " << (float)f << endl;
+    }
+    else if( !strcmp(type,"I2") )
+    {
+        VTypes::I2 i(v,sizeof(v));
+        cout << "(I2): v[0]=" << v[0]
+             << " v[1]=" << v[1]
+            << " --> (int) " << (int)i << endl;
+    }
+    else if( !strcmp(type,"U2") )
+    {
+        VTypes::U2 i(v,sizeof(v));
+        cout << "(U2): v[0]=" << v[0]
+             << " v[1]=" << v[1]
+            << " --> (unsigned int) " << (unsigned int)i << endl;
+    }
+    else
+    {
+        cout << " Unknown type: " << type << endl;
+    }
+
+    return 0;
 }
 // --------------------------------------------------------------------------

extensions/SharedMemoryPlus/smemory-plus.cc

@@ -33,16 +33,26 @@ std::list< ThreadCreator<IOControl>* > lst_iothr;
 #endif
 // --------------------------------------------------------------------------
 void activator_terminate( int signo )
-{
+{	
 	if( logserver )
 	{
-		delete logserver;
-		logserver = 0;
+		try
+		{
+			delete logserver;
+			logserver = 0;
+		}
+		catch(...){}
 	}
 
 #ifdef UNISET_IO_ENABLE
         for( auto& i: lst_iothr )
-            i->stop();
+        {
+        	try
+        	{
+	            i->stop();
+	        }
+	        catch(...){}
+        }
 #endif
 }
 // --------------------------------------------------------------------------
@@ -211,14 +221,13 @@ int main( int argc, const char **argv )
 		la.add(ulog);
 		la.add(dlog);
 
-#if 0		
 		logserver = run_logserver("smplus",la);
         if( logserver == 0 )
 		{
 			cerr << "(smemory-plus): run logserver for 'smplus' FAILED" << endl;
 			return 1;
 		}
-#endif
+
         act->run(false);
 
         on_sigchild(SIGTERM);

extensions/include/Extensions.h

@@ -26,7 +26,7 @@ namespace UniSetExtensions
     Calibration* buildCalibrationDiagram( const std::string& dname );
 
 
-	void on_sigchild( int sig );
+    void on_sigchild( int sig );
 
     extern DebugStream dlog;
 }

extensions/include/UObject_SK.h

@@ -21,24 +21,24 @@
 #include "DebugStream.h"
 // -----------------------------------------------------------------------------
 class UObject_SK:
-	public UniSetObject,
-	public LT_Object
+    public UniSetObject,
+    public LT_Object
 {
-	public:
-		UObject_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::conf->getNode("UObject"), const std::string& argprefix="" );
-		UObject_SK();
-		virtual ~UObject_SK();
-
-		
-		bool alarm( UniSetTypes::ObjectId sid, bool state );
-		long getValue( UniSetTypes::ObjectId sid );
-		void setValue( UniSetTypes::ObjectId sid, long value );
-		void askSensor( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::conf->getLocalNode() );
-		void updateValues();
-		void setMsg( UniSetTypes::ObjectId code, bool state );
-
-		DebugStream mylog;
-		void init_dlog( DebugStream& d );
+    public:
+        UObject_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::conf->getNode("UObject"), const std::string& argprefix="" );
+        UObject_SK();
+        virtual ~UObject_SK();
+
+        
+        bool alarm( UniSetTypes::ObjectId sid, bool state );
+        long getValue( UniSetTypes::ObjectId sid );
+        void setValue( UniSetTypes::ObjectId sid, long value );
+        void askSensor( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::conf->getLocalNode() );
+        void updateValues();
+        void setMsg( UniSetTypes::ObjectId code, bool state );
+
+        DebugStream mylog;
+        void init_dlog( DebugStream& d );
 
         // "синтаксический сахар"..для логов
         #define myinfo if( mylog.debugging(Debug::INFO) ) mylog
@@ -55,86 +55,86 @@ class UObject_SK:
         #define mylog9 if( mylog.debugging(Debug::LEVEL9) ) mylog
 
 
-		// Используемые идентификаторы
-		
-
-		// Используемые идентификаторы сообщений
-		
-
-		// Текущее значение и предыдущее значение
-		
-
-		// --- public variables ---
-		
-		
-		// --- end of public variables ---
-
-	protected:
-		// --- protected variables ---
-		
-		
-		// ---- end of protected variables ----
-
-		
-		virtual void callback();
-		virtual void processingMessage( UniSetTypes::VoidMessage* msg );
-		virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
-		virtual void askSensors( UniversalIO::UIOCommand cmd ){}
-		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ){}
-		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ){}
-		virtual void sigterm( int signo );
-		virtual bool activateObject();
-		virtual void testMode( bool state );
-		void updatePreviousValues();
-		void checkSensors();
-		void updateOutputs( bool force );
-
-		void preAskSensors( UniversalIO::UIOCommand cmd );
-		void preSensorInfo( const UniSetTypes::SensorMessage* sm );
-		void preTimerInfo( const UniSetTypes::TimerMessage* tm );
-		void waitSM( int wait_msec, UniSetTypes::ObjectId testID = UniSetTypes::DefaultObjectId );
-
-		void resetMsg();
-		Trigger trResetMsg;
-		PassiveTimer ptResetMsg;
-		int resetMsgTime;
-
-		// Выполнение очередного шага программы
-		virtual void step()=0;
-
-		int sleep_msec; /*!< пауза между итерациями */
-		bool active;
-
-		UniSetTypes::ObjectId smTestID; /*!< идентификатор датчика для тестирования готовности SM */
-
-		// управление датчиком "сердцебиения"
-		PassiveTimer ptHeartBeat;				/*! < период "сердцебиения" */
-		UniSetTypes::ObjectId idHeartBeat;		/*! < идентификатор датчика (AI) "сердцебиения" */
-		int maxHeartBeat;						/*! < сохраняемое значение */
-		
-		xmlNode* confnode;
-		/*! получить числовое свойство из конф. файла по привязанной confnode */
-		int getIntProp(const std::string& name) { return UniSetTypes::conf->getIntProp(confnode, name); }
-		/*! получить текстовое свойство из конф. файла по привязанной confnode */
-		inline const std::string getProp(const std::string& name) { return UniSetTypes::conf->getProp(confnode, name); }
-
-		int smReadyTimeout; 	/*!< время ожидания готовности SM */
-		std::atomic_bool activated;
-		int activateTimeout;	/*!< время ожидания готовности UniSetObject к работе */
-		PassiveTimer ptStartUpTimeout;	/*!< время на блокировку обработки WatchDog, если недавно был StartUp */
-		int askPause; /*!< пауза между неудачными попытками заказать датчики */
-		
-		IOController_i::SensorInfo si;
-
-
-	private:
-		
-		// --- private variables ---
-		// --- end of private variables ---
-
-		
-
-		bool end_private; // вспомогательное поле (для внутреннего использования при генерировании кода)
+        // Используемые идентификаторы
+        
+
+        // Используемые идентификаторы сообщений
+        
+
+        // Текущее значение и предыдущее значение
+        
+
+        // --- public variables ---
+        
+        
+        // --- end of public variables ---
+
+    protected:
+        // --- protected variables ---
+        
+        
+        // ---- end of protected variables ----
+
+        
+        virtual void callback();
+        virtual void processingMessage( UniSetTypes::VoidMessage* msg );
+        virtual void sysCommand( const UniSetTypes::SystemMessage* sm );
+        virtual void askSensors( UniversalIO::UIOCommand cmd ){}
+        virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ){}
+        virtual void timerInfo( const UniSetTypes::TimerMessage* tm ){}
+        virtual void sigterm( int signo );
+        virtual bool activateObject();
+        virtual void testMode( bool state );
+        void updatePreviousValues();
+        void checkSensors();
+        void updateOutputs( bool force );
+
+        void preAskSensors( UniversalIO::UIOCommand cmd );
+        void preSensorInfo( const UniSetTypes::SensorMessage* sm );
+        void preTimerInfo( const UniSetTypes::TimerMessage* tm );
+        void waitSM( int wait_msec, UniSetTypes::ObjectId testID = UniSetTypes::DefaultObjectId );
+
+        void resetMsg();
+        Trigger trResetMsg;
+        PassiveTimer ptResetMsg;
+        int resetMsgTime;
+
+        // Выполнение очередного шага программы
+        virtual void step()=0;
+
+        int sleep_msec; /*!< пауза между итерациями */
+        bool active;
+
+        UniSetTypes::ObjectId smTestID; /*!< идентификатор датчика для тестирования готовности SM */
+
+        // управление датчиком "сердцебиения"
+        PassiveTimer ptHeartBeat;                /*! < период "сердцебиения" */
+        UniSetTypes::ObjectId idHeartBeat;        /*! < идентификатор датчика (AI) "сердцебиения" */
+        int maxHeartBeat;                        /*! < сохраняемое значение */
+        
+        xmlNode* confnode;
+        /*! получить числовое свойство из конф. файла по привязанной confnode */
+        int getIntProp(const std::string& name) { return UniSetTypes::conf->getIntProp(confnode, name); }
+        /*! получить текстовое свойство из конф. файла по привязанной confnode */
+        inline const std::string getProp(const std::string& name) { return UniSetTypes::conf->getProp(confnode, name); }
+
+        int smReadyTimeout;     /*!< время ожидания готовности SM */
+        std::atomic_bool activated;
+        int activateTimeout;    /*!< время ожидания готовности UniSetObject к работе */
+        PassiveTimer ptStartUpTimeout;    /*!< время на блокировку обработки WatchDog, если недавно был StartUp */
+        int askPause; /*!< пауза между неудачными попытками заказать датчики */
+        
+        IOController_i::SensorInfo si;
+
+
+    private:
+        
+        // --- private variables ---
+        // --- end of private variables ---
+
+        
+
+        bool end_private; // вспомогательное поле (для внутреннего использования при генерировании кода)
 };
 
 // -----------------------------------------------------------------------------

include/LogAgregator.h

@@ -7,12 +7,12 @@
 #include "LogServerTypes.h"
 // -------------------------------------------------------------------------
 class LogAgregator:
-	public DebugStream
+    public DebugStream
 {
     public:
 
-		explicit LogAgregator( Debug::type t = Debug::NONE );
-    	explicit LogAgregator( char const * f, Debug::type t = Debug::NONE );
+        explicit LogAgregator( Debug::type t = Debug::NONE );
+        explicit LogAgregator( char const * f, Debug::type t = Debug::NONE );
 
         virtual ~LogAgregator();
 
@@ -25,7 +25,7 @@ class LogAgregator:
         void delLevel( const std::string& logname, Debug::type t );
         void level( const std::string& logname, Debug::type t );
 
-		DebugStream* getLog( const std::string& logname );
+        DebugStream* getLog( const std::string& logname );
 
     protected:
         void logOnEvent( const std::string& s );

include/ThreadCreator.h

@@ -177,9 +177,8 @@ template <class ThreadMaster>
 void ThreadCreator<ThreadMaster>::run()
 {
     pid = getpid();
-    if(m)
-        (m->*act)();
-//    PosixThread::stop()
+    if( m )
+           (m->*act)();
 }
 //----------------------------------------------------------------------------------------
 template <class ThreadMaster>

src/Log/DebugStream.cc

@@ -50,7 +50,7 @@ DebugStream::DebugStream(Debug::type t)
       logname("")
 {
     delete rdbuf(new teebuf(cerr.rdbuf(),&internal->sbuf));
-	internal->sbuf.signal_overflow().connect(sigc::mem_fun(*this, &DebugStream::sbuf_overflow));
+    internal->sbuf.signal_overflow().connect(sigc::mem_fun(*this, &DebugStream::sbuf_overflow));
 }
 
 //--------------------------------------------------------------------------
@@ -67,12 +67,12 @@ DebugStream::DebugStream(char const * f, Debug::type t)
     delete rdbuf(new threebuf(cerr.rdbuf(),
                 &internal->fbuf,&internal->sbuf));
 
-	internal->sbuf.signal_overflow().connect(sigc::mem_fun(*this, &DebugStream::sbuf_overflow));
+    internal->sbuf.signal_overflow().connect(sigc::mem_fun(*this, &DebugStream::sbuf_overflow));
 }
 //--------------------------------------------------------------------------
 void DebugStream::sbuf_overflow( const std::string& s )
 {
-	s_stream.emit(s);
+    s_stream.emit(s);
 }
 //--------------------------------------------------------------------------
 DebugStream::~DebugStream()
@@ -195,7 +195,7 @@ std::ostream& DebugStream::pos(int x, int y)
 //--------------------------------------------------------------------------
 DebugStream::StreamEvent_Signal DebugStream::signal_stream_event()
 {
-	return s_stream;
+    return s_stream;
 }
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------

src/Log/LogAgregator.cc

@@ -2,24 +2,24 @@
 #include "LogAgregator.h"
 // -------------------------------------------------------------------------
 LogAgregator::LogAgregator( char const * f, Debug::type t ):
-	DebugStream(f,t)
+    DebugStream(f,t)
 {
     delete rdbuf(new teebuf(&internal->fbuf,&internal->sbuf));
 }
 // -------------------------------------------------------------------------
 LogAgregator::LogAgregator( Debug::type t ):
-	DebugStream(t)
+    DebugStream(t)
 {
-	delete rdbuf(new teebuf(&internal->nbuf,&internal->sbuf));
+    delete rdbuf(new teebuf(&internal->nbuf,&internal->sbuf));
 }
 // -------------------------------------------------------------------------
 void LogAgregator::logFile( const std::string& f )
 {
-	DebugStream::logFile(f);
-	if( f.empty() )
-    	delete rdbuf(new teebuf(&internal->fbuf,&internal->sbuf));
-	else
-		delete rdbuf(new teebuf(&internal->nbuf,&internal->sbuf));
+    DebugStream::logFile(f);
+    if( f.empty() )
+        delete rdbuf(new teebuf(&internal->fbuf,&internal->sbuf));
+    else
+        delete rdbuf(new teebuf(&internal->nbuf,&internal->sbuf));
 }
 // -------------------------------------------------------------------------
 LogAgregator::~LogAgregator()
@@ -45,51 +45,51 @@ void LogAgregator::add( DebugStream& l )
 // -------------------------------------------------------------------------
 void LogAgregator::addLevel( const std::string& logname, Debug::type t )
 {
-	for( auto& i: llst )
-	{	
-		if( i->getLogName() == logname )
-		{
-			i->addLevel(t);
-			break;
-		}
-	}
+    for( auto& i: llst )
+    {    
+        if( i->getLogName() == logname )
+        {
+            i->addLevel(t);
+            break;
+        }
+    }
 }
 // -------------------------------------------------------------------------
 void LogAgregator::delLevel( const std::string& logname, Debug::type t )
 {
-	for( auto& i: llst )
-	{	
-		if( i->getLogName() == logname )
-		{
-			i->delLevel(t);
-			break;
-		}
-	}
+    for( auto& i: llst )
+    {    
+        if( i->getLogName() == logname )
+        {
+            i->delLevel(t);
+            break;
+        }
+    }
 }
 // -------------------------------------------------------------------------
 void LogAgregator::level( const std::string& logname, Debug::type t )
 {
-	for( auto& i: llst )
-	{	
-		if( i->getLogName() == logname )
-		{
-			i->level(t);
-			break;
-		}
-	}
+    for( auto& i: llst )
+    {    
+        if( i->getLogName() == logname )
+        {
+            i->level(t);
+            break;
+        }
+    }
 }
 // -------------------------------------------------------------------------
 DebugStream* LogAgregator::getLog( const std::string& logname )
 {
-	if( logname.empty() )
-		return 0;
+    if( logname.empty() )
+        return 0;
 
-	for( auto& i: llst )
-	{	
-		if( i->getLogName() == logname )
-			return i;
-	}
+    for( auto& i: llst )
+    {    
+        if( i->getLogName() == logname )
+            return i;
+    }
 
-	return 0;
+    return 0;
 }
 // -------------------------------------------------------------------------
\ No newline at end of file

src/ObjectRepository/UniSetActivator.cc

@@ -191,8 +191,6 @@ void UniSetActivator::oaDestroy(int signo)
 
             try
             {
-
-
                 stop();
             }
             catch(...){}
@@ -210,13 +208,17 @@ void UniSetActivator::oaDestroy(int signo)
             ulogsys << myname << "(oaDestroy): orbthr=" << orbthr << endl;
             if( orbthr )
             {
-                ulogsys << myname << "(oaDestroy): orb thread stop... " << endl;
+                try
+                {
+                    ulogsys << myname << "(oaDestroy): orb thread stop... " << endl;
 
-                orbthr->stop();
-                if( orbthr->isRunning() )
-                      orbthr->join();
+                    orbthr->stop();
+                    if( orbthr->isRunning() )
+                          orbthr->join();
 
-                ulogsys << myname << "(oaDestroy): orb thread stop ok. " << endl;
+                    ulogsys << myname << "(oaDestroy): orb thread stop ok. " << endl;
+                }
+                catch(...){}
             }
 
         try
@@ -520,6 +522,9 @@ void UniSetActivator::normalexit()
 {
     if( gActivator )
         ulogsys << gActivator->getName() << "(default exit): good bye."<< endl << flush;
+
+//     std::exception_ptr p = std::current_exception();
+//     std::clog <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
 }
 
 void UniSetActivator::normalterminate()
@@ -527,6 +532,9 @@ void UniSetActivator::normalterminate()
     if( gActivator )
         ucrit << gActivator->getName() << "(default exception terminate): Никто не выловил исключение!!! Good bye."<< endl<< flush;
 //    abort();
+
+//     std::exception_ptr p = std::current_exception();
+//     std::clog <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
 }
 // ------------------------------------------------------------------------------------------
 void UniSetActivator::term( int signo )

src/ObjectRepository/UniSetManager.cc

@@ -120,10 +120,22 @@ UniSetManager::~UniSetManager()
     catch(...){}
 
     for( auto& i: olist )
-        delete i;
+    {
+        try
+        {
+            delete i;
+        }
+        catch(...){}
+    }
 
     for( auto& i: mlist )
-        delete i;
+    {
+        try
+        {
+            delete i;
+        }
+        catch(...){}
+    }
 
     olist.clear();
     mlist.clear();
@@ -357,8 +369,18 @@ bool UniSetManager::deactivateObject()
 void UniSetManager::sigterm( int signo )
 {
     sig=signo;
-    objects(term);
-    managers(term);
+    try
+    {
+        objects(term);
+    }
+    catch(...){}
+    
+    try
+    {
+        managers(term);
+    }
+    catch(...){}
+
     UniSetObject::sigterm(signo);
 }
 // ------------------------------------------------------------------------------------------

src/ObjectRepository/UniSetObject.cc

@@ -134,16 +134,27 @@ stCountOfQueueFull(0)
 // ------------------------------------------------------------------------------------------
 UniSetObject::~UniSetObject() 
 {
-    deactivate();
+    try
+    {
+        deactivate();
+    }
+    catch(...){}
 
-    tmr->terminate();
+    try
+    {
+        tmr->terminate();
+    }
+    catch(...){}
 
     if( thr )
     {
-        thr->stop();
-
-        if( thr->isRunning() )
-            thr->join();
+        try
+        {
+            thr->stop();
+            if( thr->isRunning() )
+                thr->join();
+        }
+        catch(...){}
 
         delete thr;
     }
@@ -757,8 +768,8 @@ void UniSetObject::work()
     if( thr )
         msgpid = thr->getTID();
 
-    while( isActive() )
-        callback();
+       while( isActive() )
+           callback();
 
     uinfo << myname << ": thread processing messages stopped..." << endl;
 }
@@ -817,10 +828,17 @@ void UniSetObject::processingMessage( UniSetTypes::VoidMessage *msg )
                 << " mesg: " << fe.errmsg() << endl;
         }
     }
-    catch(...)
+    catch( const std::exception& ex )
+    {
+        ucrit << myname << "(processingMessage): " << ex.what() << endl;
+    }
+/*
+    catch( ... )
     {
-        ucrit << myname << "(processingMessage): catch..." << endl;
+        std::exception_ptr p = std::current_exception();
+        ucrit <<(p ? p.__cxa_exception_type()->name() : "null") << std::endl;
     }
+*/
 }
 // ------------------------------------------------------------------------------------------
 

src/Processes/IOController.cc

@@ -719,7 +719,7 @@ IOController_i::ShortIOInfo IOController::getChangedTime( UniSetTypes::ObjectId
     err << myname << "(getChangedTime): вход(выход) с именем " 
         << conf->oind->getNameById(sid) << " не найден";
 
-	uinfo << err.str() << endl;
+    uinfo << err.str() << endl;
     throw IOController_i::NameNotFound(err.str().c_str());
 }
 // -----------------------------------------------------------------------------

src/Processes/NCRestorer.cc

@@ -161,6 +161,6 @@ void NCRestorer::init_depends_signals( IONotifyController* ic )
 
         IOController::ChangeSignal s = ic->signal_change_value(it->second.d_si.id);
         s.connect( sigc::mem_fun( &it->second, &IOController::USensorInfo::checkDepend) );
-	}
+    }
 }
 // -----------------------------------------------------------------------------

src/Various/Configuration.cc

@@ -504,16 +504,16 @@ void Configuration::initParameters()
             if( confDir.empty() )
                 confDir = getRootDir();
         }
-	}
+    }
 
-	// Heartbeat init...
-	xmlNode* cnode = getNode("HeartBeatTime");
-	if( cnode )
+    // Heartbeat init...
+    xmlNode* cnode = getNode("HeartBeatTime");
+    if( cnode )
         {
-		UniXML_iterator hit(cnode);
-		heartbeat_msec = hit.getIntProp("msec");
-		if( heartbeat_msec <= 0 )
-			heartbeat_msec = 5000;
+        UniXML_iterator hit(cnode);
+        heartbeat_msec = hit.getIntProp("msec");
+        if( heartbeat_msec <= 0 )
+            heartbeat_msec = 5000;
     }
 }
 // -------------------------------------------------------------------------