Change cvar sv_showAverageBPS to logger

Log cvar is logs.level.server.bandwidth

Author: slipher

src/engine/server/server.h

@@ -310,8 +310,6 @@ extern Cvar::Cvar<int> sv_maxRate;
 
 extern Cvar::Cvar<bool> sv_lanForceRate;
 
-extern cvar_t *sv_showAverageBPS; // NERVE - SMF - net debugging
-
 // TTimo - autodl
 extern Cvar::Cvar<int> sv_dl_maxRate;
 

src/engine/server/sv_init.cpp

@@ -618,8 +618,6 @@ void SV_Init()
 
 	sv_killserver = Cvar_Get( "sv_killserver", "0", 0 );
 
-	sv_showAverageBPS = Cvar_Get( "sv_showAverageBPS", "0", 0 );  // NERVE - SMF - net debugging
-
 	// fretn - note: redirecting of clients to other servers relies on this,
 	// ET://someserver.com
 	sv_fullmsg = Cvar_Get( "sv_fullmsg", "Server is full.", 0 );

src/engine/server/sv_main.cpp

@@ -80,8 +80,6 @@ Cvar::Cvar<bool> sv_lanForceRate("sv_lanForceRate", "make LAN clients use max ne
 
 Cvar::Cvar<int> sv_dl_maxRate("sv_dl_maxRate", "max bytes/sec for UDP pak download", Cvar::NONE, 42000);
 
-cvar_t *sv_showAverageBPS; // NERVE - SMF - net debugging
-
 // fretn
 cvar_t *sv_fullmsg;
 

src/engine/server/sv_snapshot.cpp

@@ -59,6 +59,8 @@ A server packet will look something like:
 
 static Cvar::Cvar<bool> sv_novis("sv_novis", "skip PVS check when transmitting entities", 0, false);
 
+static Log::Logger bandwidthLog("server.bandwidth");
+
 /*
 =============
 SV_EmitPacketEntities
@@ -993,7 +995,6 @@ SV_SendClientMessages
 
 void SV_SendClientMessages()
 {
-	int      i;
 	client_t *c;
 	int      numclients = 0; // NERVE - SMF - net debugging
 
@@ -1004,7 +1005,7 @@ void SV_SendClientMessages()
 	SV_UpdateConfigStrings();
 
 	// send a message to each connected client
-	for ( i = 0; i < sv_maxClients.Get(); i++ )
+	for ( int i = 0; i < sv_maxClients.Get(); i++ )
 	{
 		c = &svs.clients[ i ];
 
@@ -1043,11 +1044,15 @@ void SV_SendClientMessages()
 	}
 
 	// NERVE - SMF - net debugging
-	if ( sv_showAverageBPS->integer && numclients > 0 )
-	{
+	bandwidthLog.DoDebugCode( [numclients] {
+		if ( numclients <= 0 )
+		{
+			return;
+		}
+
 		float ave = 0, uave = 0;
 
-		for ( i = 0; i < MAX_BPS_WINDOW - 1; i++ )
+		for ( int i = 0; i < MAX_BPS_WINDOW - 1; i++ )
 		{
 			sv.bpsWindow[ i ] = sv.bpsWindow[ i + 1 ];
 			ave += sv.bpsWindow[ i ];
@@ -1087,11 +1092,11 @@ void SV_SendClientMessages()
 			sv.ucompAve += comp_ratio;
 			sv.ucompNum++;
 
-			Log::Debug( "bpspc(%2.0f) bps(%2.0f) pk(%i) ubps(%2.0f) upk(%i) cr(%2.2f) acr(%2.2f)",
+			bandwidthLog.Debug( "bpspc(%2.0f) bps(%2.0f) pk(%i) ubps(%2.0f) upk(%i) cr(%2.2f) acr(%2.2f)",
 			             ave / ( float ) numclients, ave, sv.bpsMaxBytes, uave, sv.ubpsMaxBytes, comp_ratio,
 			             sv.ucompAve / sv.ucompNum );
 		}
-	}
+	});
 
 	// -NERVE - SMF
 }