Move rate limiting / queued packet sending logic from Com_Frame() to sv_main.c

6 files changed, 121 insertions, 87 deletions

diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index e9000aec..6b61e98a 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -77,7 +77,6 @@ cvar_t	*cl_paused;
 cvar_t	*sv_paused;
 cvar_t  *cl_packetdelay;
 cvar_t  *sv_packetdelay;
-cvar_t  *sv_dlRate;
 cvar_t	*com_cameraMode;
 cvar_t	*com_ansiColor;
 cvar_t	*com_unfocused;
@@ -2650,7 +2649,6 @@ void Com_Init( char *commandLine ) {
 	sv_paused = Cvar_Get ("sv_paused", "0", CVAR_ROM);
 	cl_packetdelay = Cvar_Get ("cl_packetdelay", "0", CVAR_CHEAT);
 	sv_packetdelay = Cvar_Get ("sv_packetdelay", "0", CVAR_CHEAT);
-	sv_dlRate = Cvar_Get ("sv_dlRate", "100", CVAR_ARCHIVE);
 	com_sv_running = Cvar_Get ("sv_running", "0", CVAR_ROM);
 	com_cl_running = Cvar_Get ("cl_running", "0", CVAR_ROM);
 	com_buildScript = Cvar_Get( "com_buildScript", "0", 0 );
@@ -2868,16 +2866,33 @@ int Com_ModifyMsec( int msec ) {
 
 /*
 =================
+Com_TimeVal
+=================
+*/
+
+int Com_TimeVal(int minMsec)
+{
+	int timeVal;
+
+	timeVal = Sys_Milliseconds() - com_frameTime;
+
+	if(timeVal >= minMsec)
+		timeVal = 0;
+	else
+		timeVal = minMsec - timeVal;
+
+	return timeVal;
+}
+
+/*
+=================
 Com_Frame
 =================
 */
 void Com_Frame( void ) {
 
 	int		msec, minMsec;
-	int		timeVal;
-	int		numBlocks = 1;
-	int		dlStart, deltaT, delayT;
-	static int	dlNextRound = 0;
+	int		timeVal, timeValSV;
 	static int	lastTime = 0, bias = 0;
  
 	int		timeBeforeFirstEvents;
@@ -2937,94 +2952,26 @@ void Com_Frame( void ) {
 	else
 		minMsec = 1;
 
-	msec = Sys_Milliseconds() - com_frameTime;
-
-	if(msec >= minMsec)
-		timeVal = 0;
-	else
-		timeVal = minMsec - msec;
-
+	timeVal = 0;
 	do
 	{
 		if(com_sv_running->integer)
 		{
-			// Send out fragmented packets now that we're idle
-			delayT = SV_SendQueuedMessages();
-			if(delayT >= 0 && delayT < timeVal)
-				timeVal = delayT;
-
-			if(sv_dlRate->integer)
-			{
-				// Rate limiting. This is very imprecise for high
-				// download rates due to millisecond timedelta resolution
-				dlStart = Sys_Milliseconds();
-				deltaT = dlNextRound - dlStart;
+			timeValSV = SV_SendQueuedPackets();
+			
+			timeVal = Com_TimeVal(minMsec);
 
-				if(deltaT > 0)
-				{
-					if(deltaT < timeVal)
-						timeVal = deltaT + 1;
-				}
-				else
-				{
-					numBlocks = SV_SendDownloadMessages();
-
-					if(numBlocks)
-					{
-						// There are active downloads
-						deltaT = Sys_Milliseconds() - dlStart;
-
-						delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
-						delayT /= sv_dlRate->integer * 1024;
-
-						if(delayT <= deltaT + 1)
-						{
-							// Sending the last round of download messages
-							// took too long for given rate, don't wait for
-							// next round, but always enforce a 1ms delay
-							// between DL message rounds so we don't hog
-							// all of the bandwidth. This will result in an
-							// effective maximum rate of 1MB/s per user, but the
-							// low download window size limits this anyways.
-							if(timeVal > 2)
-								timeVal = 2;
-
-							dlNextRound = dlStart + deltaT + 1;
-						}
-						else
-						{
-							dlNextRound = dlStart + delayT;
-							delayT -= deltaT;
-
-							if(delayT < timeVal)
-								timeVal = delayT;
-						}
-					}
-				}
-			}
-			else
-			{
-				if(SV_SendDownloadMessages())
-					timeVal = 1;
-			}
+			if(timeValSV < timeVal)
+				timeVal = timeValSV;
 		}
-
-		if(timeVal == 0)
-			timeVal = 1;
-
-		if(com_busyWait->integer)
-			NET_Sleep(0);
 		else
-			NET_Sleep(timeVal - 1);
-
-		msec = Sys_Milliseconds() - com_frameTime;
+			timeVal = Com_TimeVal(minMsec);
 		
-		if(msec >= minMsec)
-			timeVal = 0;
+		if(com_busyWait->integer || timeVal < 1)
+			NET_Sleep(0);
 		else
-			timeVal = minMsec - msec;
-
-	} while(timeVal > 0);
+			NET_Sleep(timeVal - 1);
+	} while(Com_TimeVal(minMsec));
 	
 	lastTime = com_frameTime;
 	com_frameTime = Com_EventLoop();
diff --git a/src/qcommon/net_ip.c b/src/qcommon/net_ip.c
index b6a158ce..2a93b0c4 100644
--- a/src/qcommon/net_ip.c
+++ b/src/qcommon/net_ip.c
@@ -1672,6 +1672,9 @@ void NET_Sleep(int msec)
 	fd_set fdr;
 	int highestfd = -1, retval;
 
+	if(msec < 0)
+		msec = 0;
+
 	FD_ZERO(&fdr);
 
 	if(ip_socket != INVALID_SOCKET)
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index 49501d52..a436641e 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -1010,8 +1010,7 @@ void SV_Frame( int msec );
 void SV_PacketEvent( netadr_t from, msg_t *msg );
 int SV_FrameMsec(void);
 qboolean SV_GameCommand( void );
-int SV_SendDownloadMessages(void);
-int SV_SendQueuedMessages(void);
+int SV_SendQueuedPackets(void);
 
 //
 // UI interface
diff --git a/src/server/server.h b/src/server/server.h
index 9fcce725..3f3c2a3b 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -272,6 +272,7 @@ extern	cvar_t	*sv_mapChecksum;
 extern	cvar_t	*sv_serverid;
 extern	cvar_t	*sv_minRate;
 extern	cvar_t	*sv_maxRate;
+extern	cvar_t	*sv_dlRate;
 extern	cvar_t	*sv_minPing;
 extern	cvar_t	*sv_maxPing;
 extern	cvar_t	*sv_pure;
@@ -338,6 +339,8 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK );
 void SV_ClientThink (client_t *cl, usercmd_t *cmd);
 
 int SV_WriteDownloadToClient(client_t *cl , msg_t *msg);
+int SV_SendDownloadMessages(void);
+int SV_SendQueuedMessages(void);
 
 #ifdef USE_VOIP
 void SV_WriteVoipToClient( client_t *cl, msg_t *msg );
diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 4c0ae128..c5d11e74 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -634,6 +634,7 @@ void SV_Init (void)
 
 	sv_minRate = Cvar_Get ("sv_minRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maxRate = Cvar_Get ("sv_maxRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
+	sv_dlRate = Cvar_Get("sv_dlRate", "100", CVAR_ARCHIVE | CVAR_SERVERINFO);
 	sv_minPing = Cvar_Get ("sv_minPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maxPing = Cvar_Get ("sv_maxPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index 166e2241..fdd7127b 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -51,6 +51,7 @@ cvar_t	*sv_mapChecksum;
 cvar_t	*sv_serverid;
 cvar_t	*sv_minRate;
 cvar_t	*sv_maxRate;
+cvar_t	*sv_dlRate;
 cvar_t	*sv_minPing;
 cvar_t	*sv_maxPing;
 cvar_t	*sv_pure;
@@ -1188,3 +1189,83 @@ int SV_RateMsec(client_t *client)
 	else
 		return rateMsec - rate;
 }
+
+/*
+====================
+SV_SendQueuedPackets
+
+Send download messages and queued packets in the time that we're idle, i.e.
+not computing a server frame or sending client snapshots.
+Return the time in msec until we expect to be called next
+====================
+*/
+
+int SV_SendQueuedPackets()
+{
+	int numBlocks;
+	int dlStart, deltaT, delayT;
+	static int dlNextRound = 0;
+	int timeVal = INT_MAX;
+
+	// Send out fragmented packets now that we're idle
+	delayT = SV_SendQueuedMessages();
+	if(delayT >= 0)
+		timeVal = delayT;
+
+	if(sv_dlRate->integer)
+	{
+		// Rate limiting. This is very imprecise for high
+		// download rates due to millisecond timedelta resolution
+		dlStart = Sys_Milliseconds();
+		deltaT = dlNextRound - dlStart;
+
+		if(deltaT > 0)
+		{
+			if(deltaT < timeVal)
+				timeVal = deltaT + 1;
+		}
+		else
+		{
+			numBlocks = SV_SendDownloadMessages();
+
+			if(numBlocks)
+			{
+				// There are active downloads
+				deltaT = Sys_Milliseconds() - dlStart;
+
+				delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
+				delayT /= sv_dlRate->integer * 1024;
+
+				if(delayT <= deltaT + 1)
+				{
+					// Sending the last round of download messages
+					// took too long for given rate, don't wait for
+					// next round, but always enforce a 1ms delay
+					// between DL message rounds so we don't hog
+					// all of the bandwidth. This will result in an
+					// effective maximum rate of 1MB/s per user, but the
+					// low download window size limits this anyways.
+					if(timeVal > 2)
+						timeVal = 2;
+
+					dlNextRound = dlStart + deltaT + 1;
+				}
+				else
+				{
+					dlNextRound = dlStart + delayT;
+					delayT -= deltaT;
+
+					if(delayT < timeVal)
+						timeVal = delayT;
+				}
+			}
+		}
+	}
+	else
+	{
+		if(SV_SendDownloadMessages())
+			timeVal = 0;
+	}
+
+	return timeVal;
+}