1) DBServer: сделал вывод лога в LEVEL9

Utilities/MBTester/Makefile.am

@@ -6,7 +6,8 @@ uniset_mbrtutest_SOURCES 	= mbrtutester.cc
 uniset_mbrtutest_LDADD 	= $(top_builddir)/lib/libUniSet.la
 
 uniset_mbtcptest_SOURCES 	= mbtcptester.cc
-uniset_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet.la
+uniset_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet.la $(COMCPP_LIBS)
+uniset_mbtcptest_CPPFLAGS = $(COMCPP_CFLAGS)
 
 uniset_mbrtuslave_echo_SOURCES 	= MBSlave.cc mbrtuslave.cc
 uniset_mbrtuslave_echo_LDADD 		= $(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.3
-Release: alt18
+Release: alt19
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -213,6 +213,10 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Thu May 31 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt19
+- DBServer: set log info level - LEVEL9
+- minor fixies for linker errors (new gcc)
+
 * Tue Apr 10 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt18
 - fixed bug in ComPort485F (reinit function)
 

extensions/DBServer-MySQL/DBServer_MySQL.cc

@@ -240,11 +240,13 @@ void DBServer_MySQL::parse( UniSetTypes::ConfirmMessage* am )
 //--------------------------------------------------------------------------------------------
 bool DBServer_MySQL::writeToBase( const string& query )
 {
-	unideb[Debug::INFO] << "DBServer_MySQL: " << query << endl;
+	if( unideb.debugging(DBLogInfoLevel) )
+		unideb[DBLogInfoLevel] << "DBServer_MySQL: " << query << endl;
 //	cout << "DBServer_MySQL: " << query << endl;
 	if( !db || !connect_ok )
 	{
-		unideb[Debug::CRIT] << myname << "(writeToBase): соединение с БД не установлено\n"
+		if( unideb.debugging(Debug::CRIT) )
+			unideb[Debug::CRIT] << myname << "(writeToBase): соединение с БД не установлено\n"
 					<< myname << "(writeToBase): lost query: " 
 					<< query << endl;
 		return false;
@@ -315,17 +317,20 @@ void DBServer_MySQL::parse( UniSetTypes::SensorMessage *si )
 
 		if( !writeToBase("INSERT INTO "+table+data.str()) )
 		{
-			unideb[Debug::CRIT] << myname <<  "(insert) sensor msg error: "<< db->error() << endl;
+			if( unideb.debugging(Debug::CRIT) )
+				unideb[Debug::CRIT] << myname <<  "(insert) sensor msg error: "<< db->error() << endl;
 			db->freeResult();			
 		}
 	}
 	catch( Exception& ex )
 	{	
-		unideb[Debug::CRIT] << myname << "(parse SensorMessage): " << ex << endl;
+		if( unideb.debugging(Debug::CRIT) )
+			unideb[Debug::CRIT] << myname << "(parse SensorMessage): " << ex << endl;
 	}
 	catch( ...  )
 	{	
-		unideb[Debug::CRIT] << myname << "(parse SensorMessage): неизвестное исключние..." << endl;
+		if( unideb.debugging(Debug::CRIT) )
+			unideb[Debug::CRIT] << myname << "(parse SensorMessage): неизвестное исключние..." << endl;
 	}
 		
 }
@@ -333,7 +338,8 @@ void DBServer_MySQL::parse( UniSetTypes::SensorMessage *si )
 void DBServer_MySQL::init_dbserver()
 {
 	DBServer::init_dbserver();
-	unideb[Debug::INFO] << myname << "(init): ..." << endl;
+	if( unideb.debugging(DBLogInfoLevel) )
+		unideb[DBLogInfoLevel] << myname << "(init): ..." << endl;
 
 	if( connect_ok )
 	{
@@ -355,7 +361,7 @@ void DBServer_MySQL::init_dbserver()
 	if( !node )
 		throw NameNotFound(string(myname+"(init): в конфигурационном файле не найден раздел LocalDBServer"));
 
-	unideb[Debug::INFO] << myname << "(init): инициализируем соединение" << endl;
+	unideb[DBLogInfoLevel] << myname << "(init): инициализируем соединение" << endl;
 	string dbname(conf->getProp(node,"dbname"));
 	string dbnode(conf->getProp(node,"dbnode"));
 	string user(conf->getProp(node,"dbuser"));
@@ -371,7 +377,8 @@ void DBServer_MySQL::init_dbserver()
 	if( dbnode.empty() )
 		dbnode = "localhost";
 
-	unideb[Debug::INFO] << myname << "(init): connect dbnode=" << dbnode 
+	if( unideb.debugging(DBLogInfoLevel) )
+		unideb[DBLogInfoLevel] << myname << "(init): connect dbnode=" << dbnode 
 		<< "\tdbname=" << dbname
 		<< " pingTime=" << PingTime 
 		<< " ReconnectTime=" << ReconnectTime << endl;
@@ -379,7 +386,8 @@ void DBServer_MySQL::init_dbserver()
 	if( !db->connect(dbnode, user, password, dbname) )
 	{
 //		ostringstream err;
-		unideb[Debug::CRIT] << myname 
+		if( unideb.debugging(Debug::CRIT) )
+			unideb[Debug::CRIT] << myname 
 			<< "(init): не смог создать соединение с БД err:\n"
 			<< db->error() << endl;
 //		throw Exception( string(myname+"(init): не смогли создать соединение с БД "+db->error()) );
@@ -387,7 +395,8 @@ void DBServer_MySQL::init_dbserver()
 	}
 	else
 	{
-		unideb[Debug::INFO] << myname << "(init): connect ok\n";
+		if( unideb.debugging(DBLogInfoLevel) )
+			unideb[DBLogInfoLevel] << myname << "(init): connect ok\n";
 		connect_ok = true;
 		askTimer(DBServer_MySQL::ReconnectTimer,0);
 		askTimer(DBServer_MySQL::PingTimer,PingTime);
@@ -402,7 +411,8 @@ void DBServer_MySQL::createTables( DBInterface *db )
 	UniXML_iterator it( conf->getNode("Tables") );
 	if(!it)
 	{
-		unideb[Debug::CRIT] << myname << ": не найден раздел Tables...."<< endl;
+		if( unideb.debugging(Debug::CRIT) )
+			unideb[Debug::CRIT] << myname << ": не найден раздел Tables...."<< endl;
 		throw Exception();
 	}
 
@@ -410,10 +420,11 @@ void DBServer_MySQL::createTables( DBInterface *db )
 	{
 		if( it.getName() != "comment" )
 		{
-			unideb[Debug::INFO] << myname  << "(createTables): создаем " << it.getName() << endl;
+			if( unideb.debugging(DBLogInfoLevel) )
+				unideb[DBLogInfoLevel] << myname  << "(createTables): создаем " << it.getName() << endl;
 			ostringstream query;
 			query << "CREATE TABLE " << conf->getProp(it,"name") << "(" << conf->getProp(it,"create") << ")";
-			if( !db->query(query.str()) )
+			if( !db->query(query.str()) && unideb.debugging(Debug::CRIT) )
 				unideb[Debug::CRIT] << myname << "(createTables): error: \t\t" << db->error() << endl;
 		}
 	}	
@@ -427,7 +438,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
 		{
 			if( !db->ping() )
 			{
-				unideb[Debug::WARN] << myname << "(timerInfo): потеряно соединение с сервером БД" << endl;
+				if( unideb.debugging(Debug::WARN) )
+					unideb[Debug::WARN] << myname << "(timerInfo): потеряно соединение с сервером БД" << endl;
 				connect_ok = false;
 				askTimer(DBServer_MySQL::PingTimer,0);
 				askTimer(DBServer_MySQL::ReconnectTimer,ReconnectTime);
@@ -435,14 +447,16 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
 			else
 			{
 				connect_ok = true;
-				unideb[Debug::INFO] << myname << "(timerInfo): DB ping ok\n";
+				if( unideb.debugging(DBLogInfoLevel) )
+					unideb[DBLogInfoLevel] << myname << "(timerInfo): DB ping ok\n";
 			}
 		}
 		break;
 	
 		case DBServer_MySQL::ReconnectTimer:
 		{
-			unideb[Debug::INFO] << myname << "(timerInfo): reconnect timer" << endl;
+			if( unideb.debugging(DBLogInfoLevel) )
+				unideb[DBLogInfoLevel] << myname << "(timerInfo): reconnect timer" << endl;
 			if( db->isConnection() )
 			{
 				if( db->ping() )
@@ -452,7 +466,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
 					askTimer(DBServer_MySQL::PingTimer,PingTime);
 				}
 				connect_ok = false;
-				unideb[Debug::WARN] << myname << "(timerInfo): нет связи с БД" << endl;
+				if( unideb.debugging(Debug::WARN) )
+					unideb[Debug::WARN] << myname << "(timerInfo): нет связи с БД" << endl;
 			}
 			else
 				init_dbserver();
@@ -460,7 +475,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
 		break;
 
 		default:
-			unideb[Debug::WARN] << myname << "(timerInfo): неизвестный таймер tid=" << tm->id << endl;
+			if( unideb.debugging(Debug::WARN) )
+				unideb[Debug::WARN] << myname << "(timerInfo): неизвестный таймер tid=" << tm->id << endl;
 		break;
 	}
 }

extensions/DBServer-MySQL/DBServer_MySQL.h

@@ -138,6 +138,8 @@ class DBServer_MySQL:
 		DBServer_MySQL();
 		~DBServer_MySQL();
 
+		static const Debug::type DBLogInfoLevel = Debug::LEVEL9;
+
 	protected:
 		typedef std::map<int, std::string> DBTableMap;
 

extensions/IOControl/Makefile.am

@@ -6,9 +6,9 @@ UIO_VER=@LIBVER@
 lib_LTLIBRARIES 	= libUniSetIOControl.la
 libUniSetIOControl_la_LDFLAGS  = -version-info $(UIO_VER) 
 libUniSetIOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
-		$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-		$(top_builddir)/lib/libUniSet.la \
-		$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
 
 libUniSetIOControl_la_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
@@ -16,7 +16,9 @@ libUniSetIOControl_la_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 
 libUniSetIOControl_la_SOURCES 	= ComediInterface.cc IOControl.cc
 
-@PACKAGE@_iocontrol_LDADD 	= libUniSetIOControl.la $(COMEDI_LIBS)
+@PACKAGE@_iocontrol_LDADD 	= libUniSetIOControl.la \
+	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS)
 @PACKAGE@_iocontrol_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory

extensions/SharedMemory/Makefile.am

@@ -12,7 +12,8 @@ libUniSetSharedMemory_la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/
 libUniSetSharedMemory_la_SOURCES 	= SharedMemory.cc 
 
 
-@PACKAGE@_smemory_LDADD 	= libUniSetSharedMemory.la
+@PACKAGE@_smemory_LDADD 	= libUniSetSharedMemory.la $(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la
 @PACKAGE@_smemory_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_smemory_SOURCES 	= smemory.cc
 

extensions/UniNetwork/Makefile.am

@@ -5,7 +5,7 @@ UNET_VER=@LIBVER@
 
 lib_LTLIBRARIES 	= libUniSetNetwork.la
 libUniSetNetwork_la_LDFLAGS  = -version-info $(UNET_VER) 
-libUniSetNetwork_la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
+libUniSetNetwork_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
 	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
 libUniSetNetwork_la_CPPFLAGS	= $(SIGC_CFLAGS) \
@@ -13,7 +13,9 @@ libUniSetNetwork_la_CPPFLAGS	= $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/SharedMemory
 libUniSetNetwork_la_SOURCES 	= UniExchange.cc 
 
-@PACKAGE@_network_LDADD 	= libUniSetNetwork.la 
+@PACKAGE@_network_LDADD 	= libUniSetNetwork.la \
+	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la
 @PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_network_SOURCES 	= uninet.cc