From eee0d0ab2e53597c67cdc589cc46855299d3b1ad Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 6 Jul 2012 21:28:54 +0000 Subject: [PATCH] - more logging to track down cold's issue --- source/glest_game/network/network_message.cpp | 3 +++ source/shared_lib/sources/util/checksum.cpp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp index 59cba080d..482b7d98f 100644 --- a/source/glest_game/network/network_message.cpp +++ b/source/glest_game/network/network_message.cpp @@ -41,6 +41,9 @@ bool NetworkMessage::receive(Socket* socket, void* data, int dataSize, bool tryR if(socket != NULL) { int dataReceived = socket->receive(data, dataSize, tryReceiveUntilDataSizeMet); if(dataReceived != dataSize) { + if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] WARNING, dataReceived = %d dataSize = %d\n",__FILE__,__FUNCTION__,__LINE__,dataReceived,dataSize); + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nIn [%s::%s Line: %d] WARNING, dataReceived = %d dataSize = %d\n",__FILE__,__FUNCTION__,__LINE__,dataReceived,dataSize); + if(socket != NULL && socket->getSocketId() > 0) { throw megaglest_runtime_error("Error receiving NetworkMessage, dataReceived = " + intToStr(dataReceived) + ", dataSize = " + intToStr(dataSize)); } diff --git a/source/shared_lib/sources/util/checksum.cpp b/source/shared_lib/sources/util/checksum.cpp index d4b6cd71f..a271487c2 100644 --- a/source/shared_lib/sources/util/checksum.cpp +++ b/source/shared_lib/sources/util/checksum.cpp @@ -265,10 +265,11 @@ int32 Checksum::getSum() { Checksum newResult; { - MutexSafeWrapper safeMutexSocketDestructorFlag(&Checksum::fileListCacheSynchAccessor,string(__FILE__) + "_" + intToStr(__LINE__)); + for(std::map::iterator iterMap = fileList.begin(); iterMap != fileList.end(); ++iterMap) { + MutexSafeWrapper safeMutexSocketDestructorFlag(&Checksum::fileListCacheSynchAccessor,string(__FILE__) + "_" + intToStr(__LINE__)); if(Checksum::fileListCache.find(iterMap->first) == Checksum::fileListCache.end()) { Checksum fileResult; bool fileAddedOk = fileResult.addFileToSum(iterMap->first); @@ -281,6 +282,9 @@ int32 Checksum::getSum() { newResult.addSum(Checksum::fileListCache[iterMap->first]); } } + + if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileList.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,fileList.size()); + return newResult.getSum(); } return sum;