adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-10 19:02:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Csocket

Browse Source 
This fixes a problem where Csocket detected socket timeouts (as configured with
SetTimeout()) too late if there was few activity. See csocket's git commit
message for more info, I'm lazy. :-P

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-04-30 12:29:12 +02:00
parent 5ece00f168
commit 6e48f3535c
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.h
+21 -11
View File
@@ -918,6 +918,23 @@ public:
}
time_t GetLastCheckTimeout() { return( m_iLastCheckTimeoutTime ); }
//! Returns the time when CheckTimeout() should be called next
time_t GetNextCheckTimeout( time_t iNow = 0 )
{
if( iNow == 0 )
iNow = time( NULL );
time_t itimeout = m_itimeout;
time_t iDiff = iNow - m_iLastCheckTimeoutTime;
/* CheckTimeout() wants to be called after half the timeout */
if( m_iTcount == 0 )
itimeout /= 2;
if( iDiff > itimeout )
itimeout = 0;
else
itimeout -= iDiff;
return( iNow + itimeout );
}
//! return the data imediatly ready for read
virtual int GetPending();
@@ -2279,7 +2296,6 @@ private:
time_t GetDynamicSleepTime( time_t iNow, time_t iMaxResolution = 3600 ) const
{
time_t iNextRunTime = iNow + iMaxResolution;
time_t iMinTimeout = iMaxResolution;
typename std::vector<T *>::const_iterator it;
// This is safe, because we don't modify the vector.
typename std::vector<T *>::const_iterator it_end = this->end();
@@ -2289,19 +2305,13 @@ private:
T* pSock = *it;
if( pSock->GetConState() != T::CST_OK )
iMinTimeout = 0; // this is in a nebulous state, need to let it proceed like normal
iNextRunTime = iNow; // this is in a nebulous state, need to let it proceed like normal
time_t iTimeoutInSeconds = pSock->GetTimeout();
if( iTimeoutInSeconds > 0 )
{
time_t iLastTimeData = pSock->GetLastCheckTimeout();
time_t iDiff = iNow - iLastTimeData;
if( iDiff > iTimeoutInSeconds )
iTimeoutInSeconds = 0;
else
iTimeoutInSeconds -= iDiff;
iMinTimeout = std::min( iMinTimeout, iTimeoutInSeconds );
time_t iNextTimeout = pSock->GetNextCheckTimeout( iNow );
iNextRunTime = std::min( iNextRunTime, iNextTimeout );
}
const std::vector<CCron *> & vCrons = pSock->GetCrons();
@@ -2317,7 +2327,7 @@ private:
if( iNextRunTime < iNow )
return( 0 ); // smallest unit possible
return( std::min( iNextRunTime - iNow, iMinTimeout ) );
return( std::min( iNextRunTime - iNow, iMaxResolution ) );
}
//! internal use only