GitHub/GameNetworkingSockets
1
0
Fork 0
mirror of https://github.com/ValveSoftware/GameNetworkingSockets.git synced 2026-05-29 16:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "deadline < usecNow" to "deadline <= useNow" in several places.

Browse Source 
We often schedule a wakeup *exactly* at the deadline.  The OS almost never
wakes us up at *exactly* the right time.  But when it does, we can get
confused, setting a deadline for the current time, and then not taking
action on the thing we requested the wakeup call for, and setting the
deadline again.

P4:6653641
This commit is contained in:
Fletcher Dunn
2021-07-06 15:35:36 -07:00
parent e5e8052485
commit 0ed517279b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_p2p.cpp
+1 -1
View File
@@ -2295,7 +2295,7 @@ void CConnectionTransportP2PBase::P2PTransportThink( SteamNetworkingMicroseconds
// Check for reply timeout
if ( m_usecEndToEndInFlightReplyTimeout )
{
if ( m_usecEndToEndInFlightReplyTimeout < usecNow )
if ( m_usecEndToEndInFlightReplyTimeout <= usecNow )
{
m_usecEndToEndInFlightReplyTimeout = 0;
++m_nReplyTimeoutsSinceLastRecv;
src/steamnetworkingsockets/steamnetworking_statsutils.h
+3 -3
View File
@@ -771,13 +771,13 @@ protected:
inline static void ThinkInternal( TLinkStatsTracker *pThis, SteamNetworkingMicroseconds usecNow )
{
// Check for ending the current QoS interval
if ( !pThis->m_bPassive && pThis->m_usecIntervalStart + k_usecSteamDatagramLinkStatsDefaultInterval < usecNow )
if ( !pThis->m_bPassive && pThis->m_usecIntervalStart + k_usecSteamDatagramLinkStatsDefaultInterval <= usecNow )
{
pThis->UpdateInterval( usecNow );
}
// Check for reply timeout.
if ( pThis->m_usecInFlightReplyTimeout > 0 && pThis->m_usecInFlightReplyTimeout < usecNow )
if ( pThis->m_usecInFlightReplyTimeout > 0 && pThis->m_usecInFlightReplyTimeout <= usecNow )
{
pThis->InFlightReplyTimeout( usecNow );
}
@@ -1027,7 +1027,7 @@ protected:
{
LinkStatsTrackerBase::ThinkInternal( pThis, usecNow );
if ( pThis->m_usecSpeedIntervalStart + k_usecSteamDatagramSpeedStatsDefaultInterval < usecNow )
if ( pThis->m_usecSpeedIntervalStart + k_usecSteamDatagramSpeedStatsDefaultInterval <= usecNow )
{
pThis->UpdateSpeedInterval( usecNow );
}
src/steamnetworkingsockets/steamnetworkingsockets_stats.cpp
+6 -6
View File
@@ -422,17 +422,17 @@ int LinkStatsTrackerBase::GetStatsSendNeed( SteamNetworkingMicroseconds usecNow
// Message already in flight?
if ( m_pktNumInFlight == 0 && !m_bPassive )
{
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportInterval < usecNow && BCheckHaveDataToSendInstantaneous( usecNow ) )
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportInterval <= usecNow && BCheckHaveDataToSendInstantaneous( usecNow ) )
{
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportMaxInterval < usecNow )
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportMaxInterval <= usecNow )
nResult |= k_nSendStats_Instantanous_Due;
else
nResult |= k_nSendStats_Instantanous_Ready;
}
if ( m_usecPeerAckedLifetime + k_usecLinkStatsLifetimeReportInterval < usecNow && BCheckHaveDataToSendLifetime( usecNow ) )
if ( m_usecPeerAckedLifetime + k_usecLinkStatsLifetimeReportInterval <= usecNow && BCheckHaveDataToSendLifetime( usecNow ) )
{
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsLifetimeReportMaxInterval < usecNow )
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsLifetimeReportMaxInterval <= usecNow )
nResult |= k_nSendStats_Lifetime_Due;
else
nResult |= k_nSendStats_Lifetime_Ready;
@@ -454,7 +454,7 @@ const char *LinkStatsTrackerBase::InternalGetSendStatsReasonOrUpdateNextThinkTim
return nullptr;
int n = 0;
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportMaxInterval < usecNow && BCheckHaveDataToSendInstantaneous( usecNow ) )
if ( m_usecPeerAckedInstaneous + k_usecLinkStatsInstantaneousReportMaxInterval <= usecNow && BCheckHaveDataToSendInstantaneous( usecNow ) )
{
n |= 1;
}
@@ -464,7 +464,7 @@ const char *LinkStatsTrackerBase::InternalGetSendStatsReasonOrUpdateNextThinkTim
if ( usecNextCheck < inOutNextThinkTime )
inOutNextThinkTime = usecNextCheck;
}
if ( m_usecPeerAckedLifetime + k_usecLinkStatsLifetimeReportMaxInterval < usecNow && BCheckHaveDataToSendLifetime( usecNow ) )
if ( m_usecPeerAckedLifetime + k_usecLinkStatsLifetimeReportMaxInterval <= usecNow && BCheckHaveDataToSendLifetime( usecNow ) )
{
n |= 2;
}