mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 07:01:21 +02:00
Code Issues Projects Releases Wiki Activity

- attempt safe socket code to avoid hangs

Browse Source
This commit is contained in:
SoftCoder
2015-12-23 21:37:35 -08:00
parent 9f55e9235a
commit ff2fb03c78
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1922,8 +1922,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() % 4 == 0) { else if(chrono.getMillis() % 10 == 0) {
sleep(2); sleep(3);
} }
} }

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

@@ -1700,12 +1700,12 @@ bool Socket::isReadable(bool lockMutex) {
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(sock, &set);
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE); MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) { if(lockMutex == true) {
safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE); safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
} }
FD_SET(sock, &set);
int i = select((int)sock + 1, &set, NULL, NULL, &tv); int i = select((int)sock + 1, &set, NULL, NULL, &tv);
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();
@@ -1735,12 +1735,12 @@ bool Socket::isWritable(struct timeval *timeVal, bool lockMutex) {
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(sock, &set);
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE); MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) { if(lockMutex == true) {
safeMutex.setMutex(dataSynchAccessorWrite,CODE_AT_LINE); safeMutex.setMutex(dataSynchAccessorWrite,CODE_AT_LINE);
} }
FD_SET(sock, &set);
int i = select((int)sock + 1, NULL, &set, NULL, &tv); int i = select((int)sock + 1, NULL, &set, NULL, &tv);
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();