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

revert network code back

This commit is contained in:
Mark Vejvoda 2013-11-15 20:04:12 +00:00
parent 98bc4b190e
commit c9a6078689
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/network/connection_slot.cpp
View File

@ -291,7 +291,7 @@ void ConnectionSlotThread::execute() {
//bool socketHasReadData = socket->hasDataToRead();;
// Avoid mutex locking
//bool socketHasReadData = Socket::hasDataToRead(socket->getSocketId());
bool socketHasReadData = Socket::hasDataToReadWithWait(socket->getSocketId(),10000);
bool socketHasReadData = Socket::hasDataToReadWithWait(socket->getSocketId(),150000);
ConnectionSlotEvent eventCopy;
eventCopy.eventType = eReceiveSocketData;

2
source/glest_game/network/server_interface.cpp
View File

@ -915,7 +915,6 @@ void ServerInterface::signalClientsToRecieveData(std::map<PLATFORM_SOCKET,bool>
}
}
}
sleep(0);
}
}
@ -1020,7 +1019,6 @@ void ServerInterface::checkForCompletedClients(std::map<int,bool> & mapSlotSigna
//printf("===> END slot %d - About to checkForCompletedClients\n",i);
}
sleep(0);
}
}
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);