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

- additional socket thread protection to fix latest crash reported by titi

Browse Source
This commit is contained in:
Mark Vejvoda
2013-03-11 03:27:20 +00:00
parent 21d38b6231
commit 6152b6b7bb
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/include/platform/posix/socket.h
View File

@@ -168,8 +168,8 @@ public:
static void setBlock(bool block, PLATFORM_SOCKET socket); static void setBlock(bool block, PLATFORM_SOCKET socket);
bool getBlock(); bool getBlock();
bool isReadable(); bool isReadable(bool lockMutex=false);
bool isWritable(struct timeval *timeVal=NULL); bool isWritable(struct timeval *timeVal=NULL,bool lockMutex=false);
bool isConnected(); bool isConnected();
static string getHostName(); static string getHostName();

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

@@ -1396,7 +1396,7 @@ int Socket::receive(void *data, int dataSize, bool tryReceiveUntilDataSizeMet) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s Line: %d] DISCONNECTED SOCKET error while receiving socket data, bytesSent = %d, error = %s\n",__FILE__,__FUNCTION__,__LINE__,bytesReceived,getLastSocketErrorFormattedText(&iErr).c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s Line: %d] DISCONNECTED SOCKET error while receiving socket data, bytesSent = %d, error = %s\n",__FILE__,__FUNCTION__,__LINE__,bytesReceived,getLastSocketErrorFormattedText(&iErr).c_str());
break; break;
} }
else if(Socket::isReadable() == true) { else if(Socket::isReadable(true) == true) {
// MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE); // MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE);
// if(this->inSocketDestructor == true) { // if(this->inSocketDestructor == true) {
// SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] this->inSocketDestructor == true\n",__FILE__,__FUNCTION__,__LINE__); // SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] this->inSocketDestructor == true\n",__FILE__,__FUNCTION__,__LINE__);
@@ -1544,7 +1544,7 @@ int Socket::peek(void *data, int dataSize,bool mustGetData,int *pLastSocketError
break; break;
} }
*/ */
if(Socket::isReadable() == true) { if(Socket::isReadable(true) == true) {
// MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE); // MutexSafeWrapper safeMutexSocketDestructorFlag(&inSocketDestructorSynchAccessor,CODE_AT_LINE);
// if(this->inSocketDestructor == true) { // if(this->inSocketDestructor == true) {
@@ -1661,7 +1661,7 @@ void Socket::setBlock(bool block, PLATFORM_SOCKET socket) {
} }
} }
bool Socket::isReadable() { bool Socket::isReadable(bool lockMutex) {
if(isSocketValid() == false) return false; if(isSocketValid() == false) return false;
struct timeval tv; struct timeval tv;
@@ -1670,6 +1670,12 @@ bool Socket::isReadable() {
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) {
safeMutex.setMutex(dataSynchAccessorRead,CODE_AT_LINE);
}
FD_SET(sock, &set); FD_SET(sock, &set);
int i = 0; int i = 0;
@@ -1697,7 +1703,7 @@ bool Socket::isReadable() {
return result; return result;
} }
bool Socket::isWritable(struct timeval *timeVal) { bool Socket::isWritable(struct timeval *timeVal, bool lockMutex) {
if(isSocketValid() == false) return false; if(isSocketValid() == false) return false;
struct timeval tv; struct timeval tv;
@@ -1712,6 +1718,11 @@ bool Socket::isWritable(struct timeval *timeVal) {
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
MutexSafeWrapper safeMutex(NULL,CODE_AT_LINE);
if(lockMutex == true) {
safeMutex.setMutex(dataSynchAccessorWrite,CODE_AT_LINE);
}
FD_SET(sock, &set); FD_SET(sock, &set);
int i = 0; int i = 0;
@@ -1757,12 +1768,12 @@ bool Socket::isConnected() {
// inSocketDestructorSynchAccessor->setOwnerId(CODE_AT_LINE); // inSocketDestructorSynchAccessor->setOwnerId(CODE_AT_LINE);
//if the socket is not writable then it is not conencted //if the socket is not writable then it is not conencted
if(isWritable() == false) { if(isWritable(NULL,true) == false) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s Line: %d] ERROR isWritable failed.\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"[%s::%s Line: %d] ERROR isWritable failed.\n",__FILE__,__FUNCTION__,__LINE__);
return false; return false;
} }
//if the socket is readable it is connected if we can read a byte from it //if the socket is readable it is connected if we can read a byte from it
if(isReadable()) { if(isReadable(true)) {
char tmp=0; char tmp=0;
int peekDataBytes=1; int peekDataBytes=1;
int lastSocketError=0; int lastSocketError=0;