Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- try to improve network performance

Browse Source
This commit is contained in:
Mark Vejvoda 2013-03-23 23:13:33 +00:00
parent 97aadb6a44
commit 01b757a743
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/network/client_interface.cpp
View File

@ -1782,8 +1782,8 @@ NetworkMessageType ClientInterface::waitForMessage(int waitMicroseconds)
return msg; return msg;
} }
// Sleep every x milli-seconds we wait to let other threads work // Sleep every x milli-seconds we wait to let other threads work
else if(chrono.getMillis() % 5 == 0) { else if(chrono.getMillis() % 50 == 0) {
sleep(1); sleep(5);
} }
//sleep(waitSleepTime); //sleep(waitSleepTime);

8
source/shared_lib/sources/platform/posix/socket.cpp
View File

@ -1500,14 +1500,14 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
//if(chrono.getMillis() > 1) printf("In [%s::%s Line: %d] action running for msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,(long long int)chrono.getMillis()); //if(chrono.getMillis() > 1) printf("In [%s::%s Line: %d] action running for msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,(long long int)chrono.getMillis());
if(isSocketValid() == true) { if(isSocketValid() == true) {
// Chrono recvTimer(true); // Chrono recvTimer(true);
SafeSocketBlockToggleWrapper safeUnblock(this, false); //SafeSocketBlockToggleWrapper safeUnblock(this, false);
errno = 0; errno = 0;
err = recv(sock, reinterpret_cast<char*>(data), dataSize, MSG_PEEK); err = recv(sock, reinterpret_cast<char*>(data), dataSize, MSG_PEEK);
lastSocketError = getLastSocketError(); lastSocketError = getLastSocketError();
if(pLastSocketError != NULL) { if(pLastSocketError != NULL) {
*pLastSocketError = lastSocketError; *pLastSocketError = lastSocketError;
} }
safeUnblock.Restore(); //safeUnblock.Restore();
// if(recvTimer.getMillis() > 1000 || (err <= 0 && lastSocketError != 0 && lastSocketError != PLATFORM_SOCKET_TRY_AGAIN)) { // if(recvTimer.getMillis() > 1000 || (err <= 0 && lastSocketError != 0 && lastSocketError != PLATFORM_SOCKET_TRY_AGAIN)) {
// printf("#1 PEEK err = %d lastSocketError = %d ms: %lld\n",err,lastSocketError,(long long int)recvTimer.getMillis()); // printf("#1 PEEK err = %d lastSocketError = %d ms: %lld\n",err,lastSocketError,(long long int)recvTimer.getMillis());
@ -1563,14 +1563,14 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
MutexSafeWrapper safeMutex(dataSynchAccessorRead,CODE_AT_LINE); MutexSafeWrapper safeMutex(dataSynchAccessorRead,CODE_AT_LINE);
// Chrono recvTimer(true); // Chrono recvTimer(true);
SafeSocketBlockToggleWrapper safeUnblock(this, false); //SafeSocketBlockToggleWrapper safeUnblock(this, false);
errno = 0; errno = 0;
err = recv(sock, reinterpret_cast<char*>(data), dataSize, MSG_PEEK); err = recv(sock, reinterpret_cast<char*>(data), dataSize, MSG_PEEK);
lastSocketError = getLastSocketError(); lastSocketError = getLastSocketError();
if(pLastSocketError != NULL) { if(pLastSocketError != NULL) {
*pLastSocketError = lastSocketError; *pLastSocketError = lastSocketError;
} }
safeUnblock.Restore(); //safeUnblock.Restore();
// if(recvTimer.getMillis() > 1000 || (err <= 0 && lastSocketError != 0 && lastSocketError != PLATFORM_SOCKET_TRY_AGAIN)) { // if(recvTimer.getMillis() > 1000 || (err <= 0 && lastSocketError != 0 && lastSocketError != PLATFORM_SOCKET_TRY_AGAIN)) {
// printf("#2 PEEK err = %d lastSocketError = %d ms: %lld\n",err,lastSocketError,(long long int)recvTimer.getMillis()); // printf("#2 PEEK err = %d lastSocketError = %d ms: %lld\n",err,lastSocketError,(long long int)recvTimer.getMillis());