(PassiveTimer): исправление ошибки в функции millisecToPoco()

conf/libuniset2.spec

@@ -14,7 +14,7 @@
 
 Name: libuniset2
 Version: 2.5
-Release: alt9
+Release: alt10
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL
@@ -486,6 +486,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Wed Sep 07 2016 Pavel Vainerman <pv@altlinux.ru> 2.5-alt10
+- fixed bug in millisecToPoco() function
+
 * Tue Sep 06 2016 Pavel Vainerman <pv@altlinux.ru> 2.5-alt9
 - (UNetUDP): optimization use mutex
 - (unet-udp-tester): add new command line agruments

include/PassiveTimer.h

@@ -65,7 +65,7 @@ class UniSetTimer
 		 */
 		static const timeout_t WaitUpTime = std::numeric_limits<timeout_t>::max();
 
-		// преобразование с учётом WaitUpTime, т.к. в Poco::Timespan вечное ожидание это "0" :(
+		// преобразование в Poco::Timespan с учётом WaitUpTime
 		static const Poco::Timespan millisecToPoco( const timeout_t msec );
 		static const Poco::Timespan microsecToPoco( const timeout_t usec );
 

src/Timers/PassiveTimer.cc

@@ -114,16 +114,16 @@ void UniSetTimer::stop()
 const Poco::Timespan UniSetTimer::millisecToPoco( const timeout_t msec )
 {
 	if( msec == WaitUpTime )
-		return Poco::Timespan(0,0);
+		return Poco::Timespan(Poco::Timestamp::TIMEVAL_MAX,0);
 
 	// msec --> usec
-	return Poco::Timespan( long(msec/1000), long((msec%1000)*1000) );
+	return Poco::Timespan( long(msec/1000), long((msec*1000)%1000000) );
 }
 //------------------------------------------------------------------------------
 const Poco::Timespan UniSetTimer::microsecToPoco( const timeout_t usec )
 {
 	if( usec == WaitUpTime )
-		return Poco::Timespan(0,0);
+		return Poco::Timespan(Poco::Timestamp::TIMEVAL_MAX,0);
 
 	return Poco::Timespan( long(usec/1000000), long(usec%1000000) );
 }

tests/test_passivetimer.cc

@@ -107,15 +107,14 @@ TEST_CASE("UniSetTimer: conv to Poco", "[PassiveTimer][poco]" )
 
 	{
 		Poco::Timespan tm = UniSetTimer::millisecToPoco(UniSetTimer::WaitUpTime);
-		REQUIRE( tm.seconds() == 0 );
+		REQUIRE( tm.seconds() == -1 );
 		REQUIRE( tm.microseconds() == 0 );
 	}
 
 	{
 		Poco::Timespan tm = UniSetTimer::millisecToPoco(20);
 		REQUIRE( tm.seconds() == 0 );
-		REQUIRE( tm.milliseconds() == 20 );
-		REQUIRE( tm.microseconds() == 0 );
+		REQUIRE( tm.totalMilliseconds() == 20 );
 		REQUIRE( tm.totalMicroseconds() == 20000 );
 	}
 
@@ -123,7 +122,7 @@ TEST_CASE("UniSetTimer: conv to Poco", "[PassiveTimer][poco]" )
 	// usec --> Poco::Timespan
 	{
 		Poco::Timespan tm = UniSetTimer::microsecToPoco(UniSetTimer::WaitUpTime);
-		REQUIRE( tm.seconds() == 0 );
+		REQUIRE( tm.seconds() == -1 );
 		REQUIRE( tm.microseconds() == 0 );
 	}
 	{