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

Make sure send rate gets clamped.

Browse Source 
We basically need to constantly apply the clamps, since the effective config values can change at any time, since they are inherited.

Had to touch a few more files than structly necessary, to remove const from some functions.  I could declare the send rate mutable to fix this, but probably not worth it right now.  Can revisit when when we implement legit bandwidth estimation.
This commit is contained in:
Fletcher Dunn
2019-01-30 12:07:05 -08:00
parent ca91bb89f4
commit aa1fb5ee41
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_connections.cpp
+1 -1
View File
@@ -1147,7 +1147,7 @@ void CSteamNetworkConnectionBase::APIGetQuickConnectionStatus( SteamNetworkingQu
SNP_PopulateQuickStats( stats, usecNow );
}
void CSteamNetworkConnectionBase::APIGetDetailedConnectionStatus( SteamNetworkingDetailedConnectionStatus &stats, SteamNetworkingMicroseconds usecNow ) const
void CSteamNetworkConnectionBase::APIGetDetailedConnectionStatus( SteamNetworkingDetailedConnectionStatus &stats, SteamNetworkingMicroseconds usecNow )
{
stats.Clear();
PopulateConnectionInfo( stats.m_info );
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_connections.h
+3 -2
View File
@@ -235,7 +235,7 @@ public:
void APIGetQuickConnectionStatus( SteamNetworkingQuickConnectionStatus &stats );
/// Fill in detailed connection stats
virtual void APIGetDetailedConnectionStatus( SteamNetworkingDetailedConnectionStatus &stats, SteamNetworkingMicroseconds usecNow ) const;
virtual void APIGetDetailedConnectionStatus( SteamNetworkingDetailedConnectionStatus &stats, SteamNetworkingMicroseconds usecNow );
//
// Accessor
@@ -561,8 +561,9 @@ protected:
//void SNP_MoveSentToSend( SteamNetworkingMicroseconds usecNow );
//void SNP_CheckForReliable( SteamNetworkingMicroseconds usecNow );
void SNP_UpdateX( SteamNetworkingMicroseconds usecNow );
int SNP_ClampSendRate();
std::string SNP_GetDebugText();
void SNP_PopulateDetailedStats( SteamDatagramLinkStats &info ) const;
void SNP_PopulateDetailedStats( SteamDatagramLinkStats &info );
void SNP_PopulateQuickStats( SteamNetworkingQuickConnectionStatus &info, SteamNetworkingMicroseconds usecNow );
//bool SNP_UpdateIMean( uint16 unSeqNum, SteamNetworkingMicroseconds usecNow );
//bool SNP_AddLossEvent( uint16 unSeqNum, SteamNetworkingMicroseconds usecNow );
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_snp.cpp
+24 -8
View File
@@ -211,9 +211,7 @@ void CSteamNetworkConnectionBase::SNP_InitializeConnection( SteamNetworkingMicro
*/
Assert( usecPing > 0 );
int64 w_init = Clamp( 4380, 2 * k_cbSteamNetworkingSocketsMaxEncryptedPayloadSend, 4 * k_cbSteamNetworkingSocketsMaxEncryptedPayloadSend );
int rate = int( k_nMillion * w_init / usecPing );
m_senderState.m_n_x = Max( m_connectionConfig.m_SendRateMin.Get(), rate );
m_senderState.m_n_x = int( k_nMillion * w_init / usecPing );
// if ( steamdatagram_snp_log_x )
// SpewMsg( "%12llu %s: INITIAL X=%d rtt=%dms tx_s=%d\n",
@@ -255,6 +253,7 @@ EResult CSteamNetworkConnectionBase::SNP_SendMessage( SteamNetworkingMicrosecond
// First, accumulate tokens, and also limit to reasonable burst
// if we weren't already waiting to send
SNP_ClampSendRate();
m_senderState.TokenBucket_Accumulate( usecNow );
// Add to the send queue
@@ -386,6 +385,7 @@ EResult CSteamNetworkConnectionBase::SNP_FlushMessage( SteamNetworkingMicrosecon
// if we weren't already waiting to send before this.
// (Clearing the Nagle timers might very well make us want to
// send so we want to do this first.)
SNP_ClampSendRate();
m_senderState.TokenBucket_Accumulate( usecNow );
// Clear all Nagle timers
@@ -2708,13 +2708,29 @@ void CSteamNetworkConnectionBase::SNP_UpdateX( SteamNetworkingMicroseconds usecN
//
// UpdateSpeeds( m_senderState.m_n_x, m_senderState.m_n_x_recv );
m_senderState.m_n_x = Clamp( m_senderState.m_n_x, m_connectionConfig.m_SendRateMin.Get(), m_connectionConfig.m_SendRateMax.Get() );
// Go ahead and clamp it now
SNP_ClampSendRate();
}
int CSteamNetworkConnectionBase::SNP_ClampSendRate()
{
// Get effective clamp limits. We clamp the limits themselves to be safe
// and make sure they are sane
int nMin = Clamp( m_connectionConfig.m_SendRateMin.Get(), 1024, 100*1024*1024 );
int nMax = Clamp( m_connectionConfig.m_SendRateMax.Get(), nMin, 100*1024*1024 );
// Clamp it, adjusting the value if it's out of range
m_senderState.m_n_x = Clamp( m_senderState.m_n_x, nMin, nMax );
// Return value
return m_senderState.m_n_x;
}
// Returns next think time
SteamNetworkingMicroseconds CSteamNetworkConnectionBase::SNP_ThinkSendState( SteamNetworkingMicroseconds usecNow )
{
// Accumulate tokens based on how long it's been since last time
SNP_ClampSendRate();
m_senderState.TokenBucket_Accumulate( usecNow );
// Calculate next time we want to take action. If it isn't right now, then we're either idle or throttled.
@@ -2847,9 +2863,9 @@ SteamNetworkingMicroseconds CSteamNetworkConnectionBase::SNP_GetNextThinkTime( S
return usecNextThink;
}
void CSteamNetworkConnectionBase::SNP_PopulateDetailedStats( SteamDatagramLinkStats &info ) const
void CSteamNetworkConnectionBase::SNP_PopulateDetailedStats( SteamDatagramLinkStats &info )
{
info.m_latest.m_nSendRate = m_senderState.m_n_x;
info.m_latest.m_nSendRate = SNP_ClampSendRate();
info.m_latest.m_nPendingBytes = m_senderState.m_cbPendingUnreliable + m_senderState.m_cbPendingReliable;
info.m_lifetime.m_nMessagesSentReliable = m_senderState.m_nMessagesSentReliable;
info.m_lifetime.m_nMessagesSentUnreliable = m_senderState.m_nMessagesSentUnreliable;
@@ -2859,7 +2875,7 @@ void CSteamNetworkConnectionBase::SNP_PopulateDetailedStats( SteamDatagramLinkSt
void CSteamNetworkConnectionBase::SNP_PopulateQuickStats( SteamNetworkingQuickConnectionStatus &info, SteamNetworkingMicroseconds usecNow )
{
info.m_nSendRateBytesPerSecond = m_senderState.m_n_x;
info.m_nSendRateBytesPerSecond = SNP_ClampSendRate();
info.m_cbPendingUnreliable = m_senderState.m_cbPendingUnreliable;
info.m_cbPendingReliable = m_senderState.m_cbPendingReliable;
info.m_cbSentUnackedReliable = m_senderState.m_cbSentUnackedReliable;
@@ -2889,7 +2905,7 @@ void CSteamNetworkConnectionBase::SNP_PopulateQuickStats( SteamNetworkingQuickCo
else
{
info.m_usecQueueTime = (int64)cbPendingTotal * k_nMillion / m_senderState.m_n_x;
info.m_usecQueueTime = (int64)cbPendingTotal * k_nMillion / SNP_ClampSendRate();
}
}