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

- check to see if this corrects the current windows client hang in network games

This commit is contained in:
SoftCoder 2015-12-23 12:42:39 -08:00
parent 2f52e01a76
commit a8b735ffcc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1701,12 +1701,12 @@ bool Socket::isReadable(bool lockMutex) {
fd_set set;
FD_ZERO(&set);
if(isSocketValid() == false) return false;
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) {
//safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
}
if(isSocketValid() == false) return false;
FD_SET(sock, &set);
int i = 0;
@ -1722,6 +1722,8 @@ bool Socket::isReadable(bool lockMutex) {
//MutexSafeWrapper safeMutex(&dataSynchAccessorRead,CODE_AT_LINE);
i= select((int)sock + 1, &set, NULL, NULL, &tv);
}
safeMutex.ReleaseLock();
if(i < 0) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s] error while selecting socket data, err = %d, error = %s\n",__FILE__,__FUNCTION__,i,getLastSocketErrorFormattedText().c_str());
printf("In [%s::%s] Line: %d, ERROR SELECTING SOCKET DATA retval = %d error = %s\n",__FILE__,__FUNCTION__,__LINE__,i,getLastSocketErrorFormattedText().c_str());
@ -1751,11 +1753,12 @@ bool Socket::isWritable(struct timeval *timeVal, bool lockMutex) {
fd_set set;
FD_ZERO(&set);
if(isSocketValid() == false) return false;
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) {
safeMutex.setMutex(dataSynchAccessorWrite,CODE_AT_LINE);
}
if(isSocketValid() == false) return false;
FD_SET(sock, &set);
int i = 0;
@ -1771,6 +1774,7 @@ bool Socket::isWritable(struct timeval *timeVal, bool lockMutex) {
//MutexSafeWrapper safeMutex(&dataSynchAccessorWrite,CODE_AT_LINE);
i = select((int)sock + 1, NULL, &set, NULL, &tv);
}
safeMutex.ReleaseLock();
bool result = false;
if(i < 0 ) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s Line: %d] error while selecting socket data, err = %d, error = %s\n",__FILE__,__FUNCTION__,__LINE__,i,getLastSocketErrorFormattedText().c_str());