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

- attempt better socket disconnect checking

Browse Source
This commit is contained in:
SoftCoder
2015-12-31 18:28:43 -08:00
parent 61f77a88f5
commit 706113580d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1571,6 +1571,7 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
//printf("Peek #2 err = %d\n",err); //printf("Peek #2 err = %d\n",err);
Chrono chronoElapsed(true);
const int MAX_PEEK_WAIT_SECONDS = 3; const int MAX_PEEK_WAIT_SECONDS = 3;
time_t tStartTimer = time(NULL); time_t tStartTimer = time(NULL);
while((err < 0 && lastSocketError == PLATFORM_SOCKET_TRY_AGAIN) && while((err < 0 && lastSocketError == PLATFORM_SOCKET_TRY_AGAIN) &&
@@ -1583,7 +1584,7 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
break; break;
} }
*/ */
if(Socket::isReadable(true) == true) { if(Socket::isReadable(true) == true || chronoElapsed.getMillis() % 100 == 0) {
// MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE); // MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE);
// if(this->inSocketDestructor == true) { // if(this->inSocketDestructor == true) {
@@ -1614,7 +1615,7 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();
if(err <= 0) { if(err == 0 || err == PLATFORM_SOCKET_TRY_AGAIN) {
sleep(0); sleep(0);
} }
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) if(chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] action running for msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,(long long int)chrono.getMillis()); if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) if(chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] action running for msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,(long long int)chrono.getMillis());