epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7238 from Mailaender/server-cpu-fix

Browse Source 
Fixed high CPU usage due to Socket.Select not blocking the thread properly when the game started
This commit is contained in:
Matthias Mailänder
2015-01-01 10:53:40 +01:00
parent df425b29b3 d2a14842d8
commit f093de98b6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -26,6 +26,7 @@ Also thanks to:
* Andrew Perkins * Andrew Perkins
* Andrew Riedi * Andrew Riedi
* Andreas Beck (baxtor) * Andreas Beck (baxtor)
* Ang Soon Li (asl97)
* Arik Lirette (Angusm3) * Arik Lirette (Angusm3)
* Barnaby Smith (mvi) * Barnaby Smith (mvi)
* Bellator * Bellator

4
OpenRA.Game/Server/Server.cs
View File

@@ -156,11 +156,11 @@ namespace OpenRA.Server
for (;;) for (;;)
{ {
var checkRead = new List<Socket>(); var checkRead = new List<Socket>();
checkRead.Add(listener.Server); if (State == ServerState.WaitingPlayers) checkRead.Add(listener.Server);
foreach (var c in Conns) checkRead.Add(c.socket); foreach (var c in Conns) checkRead.Add(c.socket);
foreach (var c in PreConns) checkRead.Add(c.socket); foreach (var c in PreConns) checkRead.Add(c.socket);
Socket.Select(checkRead, null, null, timeout); if (checkRead.Count > 0) Socket.Select(checkRead, null, null, timeout);
if (State == ServerState.ShuttingDown) if (State == ServerState.ShuttingDown)
{ {
EndGame(); EndGame();