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

bugfixes for thread shutdown

This commit is contained in:
Mark Vejvoda 2013-05-17 00:40:54 +00:00
parent 910bb8bc56
commit a17fcdb5b4
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/main/main.cpp
View File

@ -209,6 +209,7 @@ static void cleanupProcessObjects() {
ircClient->disconnect();
ircClient->signalQuit();
ircClient = NULL;
sleep(0);
/*
ircClient->setCallbackObj(NULL);
@ -288,6 +289,8 @@ static void cleanupProcessObjects() {
}
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("end running threads = " MG_SIZE_T_SPECIFIER "\n",Thread::getThreadList().size());
Thread::shutdownThreads();
std::map<int,Texture2D *> &crcPlayerTextureCache = CacheManager::getCachedItem< std::map<int,Texture2D *> >(GameConstants::playerTextureCacheLookupKey);
//deleteMapValues(crcPlayerTextureCache.begin(),crcPlayerTextureCache.end());
crcPlayerTextureCache.clear();

1
source/shared_lib/include/platform/sdl/thread.h
View File

@ -65,6 +65,7 @@ private:
protected:
void addThreadToList();
void removeThreadFromList();
void queueAutoCleanThread();
public:
Thread();

23
source/shared_lib/sources/platform/sdl/thread.cpp
View File

@ -52,6 +52,7 @@ public:
removeThreadFromList();
}
virtual ~ThreadAutoCleanup() {
//printf("In ~ThreadAutoCleanup Line: %d\n",__LINE__);
}
virtual void execute() {
RunningStatusSafeWrapper runningStatus(this);
@ -110,16 +111,22 @@ void Thread::shutdownThreads() {
}
safeMutex.ReleaseLock();
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
if(cleanupThread.get() != 0) {
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
sleep(0);
cleanupThread->signalQuit();
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
time_t elapsed = time(NULL);
for(;cleanupThread->getRunningStatus() == true &&
difftime((long int)time(NULL),elapsed) <= 5;) {
sleep(100);
}
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
//sleep(100);
cleanupThread.reset(0);
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
}
}
@ -176,14 +183,24 @@ int Thread::beginExecution(void* data) {
//printf("In Thread::execute Line: %d thread = %p\n",__LINE__,thread);
if(thread->deleteAfterExecute == true) {
thread->queueAutoCleanThread();
return 0;
}
void Thread::queueAutoCleanThread() {
if(this->deleteAfterExecute == true) {
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
if(cleanupThread.get() == NULL) {
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
cleanupThread.reset(new ThreadAutoCleanup());
cleanupThread->start();
sleep(0);
}
cleanupThread->addThread(thread);
cleanupThread->addThread(this);
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
}
return 0;
}
void Thread::kill() {