Skip to content

U
uniset2
Commit 1d54da60 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(MBTCPMaster): ещё немного оптимизации в select()

parent 4f355923
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
src/Communications/Modbus/ModbusTCPMaster.cc
View file @ 1d54da60
......@@ -325,8 +325,8 @@ bool ModbusTCPMaster::waitInput( int msec )
if( !tcp )
return false;
FD_ZERO (&s_set);
FD_SET (tcp->getSocket(), &s_set);
// FD_ZERO (&s_set);
// FD_SET (tcp->getSocket(), &s_set);
s_timeout.tv_sec = 0;
s_timeout.tv_usec = 1000*msec;
......@@ -339,8 +339,8 @@ bool ModbusTCPMaster::waitOutput( int timeout_msec )
if( !tcp )
return false;
FD_ZERO (&s_set);
FD_SET (tcp->getSocket(), &s_set);
// FD_ZERO (&s_set);
// FD_SET (tcp->getSocket(), &s_set);
s_timeout.tv_sec = 0;
s_timeout.tv_usec = 1000*timeout_msec;
......@@ -401,6 +401,9 @@ void ModbusTCPMaster::reconnect()
tcp->setTimeout(replyTimeOut_ms);
tcp->setKeepAliveParams((replyTimeOut_ms > 1000 ? replyTimeOut_ms / 1000 : 1));
tcp->setNoDelay(true);
FD_ZERO (&s_set);
FD_SET (tcp->getSocket(), &s_set);
}
catch( const std::exception& e )
{
......@@ -456,6 +459,9 @@ void ModbusTCPMaster::connect( ost::InetAddress addr, int _port )
tcp->setTimeout(replyTimeOut_ms);
tcp->setKeepAliveParams((replyTimeOut_ms > 1000 ? replyTimeOut_ms / 1000 : 1));
tcp->setNoDelay(true);
FD_ZERO (&s_set);
FD_SET (tcp->getSocket(), &s_set);
}
catch( const std::exception& e )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment