(UNet2): новая версия (реализована посылка)

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.0
-Release: alt23
+Release: alt24
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -191,6 +191,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Sun May 01 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt24
+- build for new uniset-unet2 version
+
 * Sun May 01 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt23
 - (uniset-unet2): fixed bug (SEGFAULT with a large number of items)
 

extensions/UNet2/UNetReceiver.cc

@@ -209,8 +209,6 @@ void UNetReceiver::real_update()
 					shm->initDIterator(ii.dit);
 				}
 
-//				if( d.id == 121 )
-//					cerr << "****** save id=" << d.id << " val=" << d.val << endl;
 				if( ii.iotype == UniversalIO::DigitalInput )
 					shm->localSaveState(ii.dit,d.id,d.val,shm->ID());
 				else if( ii.iotype == UniversalIO::AnalogInput )
@@ -245,7 +243,7 @@ void UNetReceiver::stop()
 // -----------------------------------------------------------------------------
 void UNetReceiver::receive()
 {
-	cout << myname << ": ******************* receive start" << endl;
+	dlog[Debug::INFO] << myname << ": ******************* receive start" << endl;
 	ptRecvTimeout.setTiming(recvTimeout);
 	while( activated )
 	{
@@ -256,21 +254,21 @@ void UNetReceiver::receive()
 		}
 		catch( ost::SockException& e )
 		{
-			cerr  << myname << "(receive): " << e.getString() << endl;
+			dlog[Debug::WARN] << myname << "(receive): " << e.getString() << endl;
 		}
 		catch( UniSetTypes::Exception& ex)
 		{
-			cerr << myname << "(receive): " << ex << std::endl;
+			dlog[Debug::WARN] << myname << "(receive): " << ex << std::endl;
 		}
 		catch(...)
 		{
-			cerr << myname << "(receive): catch ..." << std::endl;
+			dlog[Debug::WARN] << myname << "(receive): catch ..." << std::endl;
 		}	
 
 		msleep(recvpause);
 	}
 
-	cout << myname << ": ************* receive FINISH **********" << endl;
+	dlog[Debug::INFO] << myname << ": ************* receive FINISH **********" << endl;
 }
 // -----------------------------------------------------------------------------
 bool UNetReceiver::recv()