Попытка решить проблемму WaitUpTime --> Poco::TimeStamp.

Utilities/ULog/log.cc

@@ -4,6 +4,7 @@
 #include <getopt.h>
 #include "Debug.h"
 #include "UniSetTypes.h"
+#include "PassiveTimer.h"
 #include "Exceptions.h"
 #include "LogReader.h"
 #include "LogServerTypes.h"
@@ -44,7 +45,7 @@ static void print_help()
 	printf("[-i|--iaddr] addr           - LogServer ip or hostname.\n");
 	printf("[-p|--port] port            - LogServer port.\n");
 	printf("[-c|--command-only]         - Send command and break. (No read logs).\n");
-	printf("[-t|--timeout] msec         - Timeout for wait data. Default: 0 - endless waiting\n");
+	printf("[-t|--timeout] msec         - Timeout for wait data. Default: WaitUpTime - endless waiting\n");
 	printf("[-x|--reconnect-delay] msec - Pause for repeat connect to LogServer. Default: 5000 msec.\n");
 	printf("[-w|--logfile] logfile      - Save log to 'logfile'.\n");
 	printf("[-z|--logfile-truncate]     - Truncate log file before write. Use with -w|--logfile \n");
@@ -85,7 +86,7 @@ int main( int argc, char** argv )
 	string logfilter("");
 	LogServerTypes::Command cmd = LogServerTypes::cmdNOP;
 	int cmdonly = 0;
-	timeout_t tout = 5000;
+	timeout_t tout = UniSetTimer::WaitUpTime;
 	timeout_t rdelay = 5000;
 	string logfile("");
 	bool logtruncate = false;

conf/libuniset2.spec

@@ -14,7 +14,7 @@
 
 Name: libuniset2
 Version: 2.5
-Release: alt1.2
+Release: alt2
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL
@@ -484,6 +484,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 # ..
 
 %changelog
+* Fri Aug 26 2016 Pavel Vainerman <pv@altlinux.ru> 2.5-alt2
+- Fixed converting timeout_t to Poco::TimeSpan
+
 * Thu Aug 25 2016 Pavel Vainerman <pv@altlinux.ru> 2.5-alt1.2
 - (UNetUDP): add debug information (getInfo)
 - minor fixes

extensions/UNetUDP/UNetSender.cc

@@ -115,7 +115,7 @@ bool UNetSender::createConnection( bool throwEx )
 		//udp = make_shared<UDPSocketU>(addr, port);
 		udp = make_shared<UDPSocketU>();
 		udp->setBroadcast(true);
-		udp->setSendTimeout(writeTimeout * 1000);
+		udp->setSendTimeout(UniSetTimer::timeoutToPoco(writeTimeout * 1000));
 		//		udp->setNoDelay(true);
 	}
 	catch( const std::exception& e )

include/PassiveTimer.h

@@ -68,6 +68,10 @@ class UniSetTimer
 		 */
 		static const timeout_t WaitUpTime = std::numeric_limits<timeout_t>::max();
 
+		// преобразование WaitUpTime в Poco waitpuTime у которого он = 0 :(
+		static const Poco::Timespan timeoutToPoco( const timeout_t );
+
+
 		/*! Минимальное время срабатывания. Задается в мсек. */
 		static const timeout_t MinQuantityTime = 10;
 };

src/Communications/Modbus/ModbusTCPMaster.cc

@@ -58,15 +58,13 @@ void ModbusTCPMaster::setChannelTimeout( timeout_t msec )
 	if( !tcp )
 		return;
 
+	Poco::Timespan tm = UniSetTimer::timeoutToPoco(msec*1000);
 	Poco::Timespan old = tcp->getReceiveTimeout();;
-	//timeout_t old = tcp->getReceiveTimeout();
 
-	Poco::Timespan tmsec(msec * 1000);
-
-	if( old == msec )
+	if( old.microseconds() == tm.microseconds() )
 		return;
 
-	tcp->setReceiveTimeout(tmsec);
+	tcp->setReceiveTimeout(tm);
 
 	int oldKeepAlive = keepAliveTimeout;
 	keepAliveTimeout = (msec > 1000 ? msec / 1000 : 1);
@@ -114,7 +112,10 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
 		assert(timeout);
 		ptTimeout.setTiming(timeout);
 
-		tcp->setReceiveTimeout(timeout * 1000);
+		if( timeout == UniSetTimer::WaitUpTime )
+			tcp->setReceiveTimeout(0);
+		else
+			tcp->setReceiveTimeout(timeout * 1000);
 
 		msg.makeHead(++nTransaction, crcNoCheckit);
 
@@ -379,7 +380,7 @@ void ModbusTCPMaster::reconnect()
 	{
 		tcp = make_shared<UTCPStream>();
 		tcp->create(iaddr, port, 500);
-		tcp->setReceiveTimeout(replyTimeOut_ms * 1000);
+		tcp->setReceiveTimeout(UniSetTimer::timeoutToPoco(replyTimeOut_ms * 1000));
 		tcp->setKeepAliveParams((replyTimeOut_ms > 1000 ? replyTimeOut_ms / 1000 : 1));
 		tcp->setNoDelay(true);
 	}

src/Log/LogReader.cc

@@ -78,8 +78,8 @@ void LogReader::connect( const std::string& _addr, int _port, timeout_t msec )
 	{
 		tcp = make_shared<UTCPStream>();
 		tcp->create(iaddr, port, msec );
-		tcp->setReceiveTimeout(inTimeout * 1000);
-		tcp->setSendTimeout(outTimeout * 1000);
+		tcp->setReceiveTimeout( UniSetTimer::timeoutToPoco(inTimeout * 1000) );
+		tcp->setSendTimeout( UniSetTimer::timeoutToPoco(outTimeout * 1000) );
 		tcp->setKeepAlive(true);
 		tcp->setBlocking(true);
 	}

src/Timers/PassiveTimer.cc

@@ -101,3 +101,11 @@ bool UniSetTimer::wait( timeout_t timeMS )
 	return false;
 }
 //------------------------------------------------------------------------------
+const Poco::Timespan UniSetTimer::timeoutToPoco( const timeout_t msec )
+{
+	if( msec == WaitUpTime )
+		return Poco::Timespan(0,0);
+
+	return Poco::Timespan(msec/100, msec%1000);
+}
+//------------------------------------------------------------------------------