From f720c434626c9fe0860112e111793b1979eb59bb Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 22 Jun 2010 14:12:57 +0000 Subject: [PATCH] - commented out ping thread as it was unused and possibly caused crashing --- source/shared_lib/sources/platform/posix/socket.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index 8ac3d769d..cc3e22475 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -703,13 +703,14 @@ Socket::Socket() } float Socket::getThreadedPingMS(std::string host) { + float result = -1; +/* if(pingThread == NULL) { lastThreadedPing = 0; pingThread = new SimpleTaskThread(this,0,50); pingThread->start(); } - float result = -1; if(pingCache.find(host) == pingCache.end()) { MutexSafeWrapper safeMutex(&pingThreadAccessor); safeMutex.ReleaseLock(); @@ -721,6 +722,7 @@ float Socket::getThreadedPingMS(std::string host) { result = pingCache[host]; safeMutex.ReleaseLock(); } +*/ return result; } @@ -750,7 +752,6 @@ Socket::~Socket() SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] END closing socket = %d...\n",__FILE__,__FUNCTION__,sock); - BaseThread::shutdownAndWait(pingThread); delete pingThread; pingThread = NULL; }