mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-03 02:41:50 +02:00
Code Issues Projects Releases Wiki Activity

Added mutex guards around logging

Browse Source
This commit is contained in:
Mark Vejvoda
2010-05-01 09:10:52 +00:00
parent a911088d39
commit e379905942
7 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
#include "ImageReaders.h"
#include "renderer.h"
#include "simple_threads.h"
#include <memory>
#include "leak_dumper.h"
@@ -264,6 +265,11 @@ void MainWindow::setProgram(Program *program) {
SystemFlags debugger;
int glestMain(int argc, char** argv){
#ifdef SL_LEAK_DUMP
AllocRegistry memoryLeaks = AllocRegistry::getInstance();
#endif
#ifdef STREFLOP_H
streflop_init<streflop::Simple>();
printf("%s, STREFLOP enabled.\n",getNetworkVersionString().c_str());
@@ -280,9 +286,8 @@ int glestMain(int argc, char** argv){
ExceptionHandler exceptionHandler;
exceptionHandler.install( getCrashDumpFileName() );
FileCRCPreCacheThread preCacheThread;
try{
std::auto_ptr<FileCRCPreCacheThread> preCacheThread;
Config &config = Config::getInstance();
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
@@ -344,8 +349,9 @@ int glestMain(int argc, char** argv){
if(config.getBool("AllowGameDataSynchCheck","false") == true) {
vector<string> techDataPaths = config.getPathListForType(ptTechs);
preCacheThread.setTechDataPaths(techDataPaths);
preCacheThread.start();
preCacheThread.reset(new FileCRCPreCacheThread());
preCacheThread->setTechDataPaths(techDataPaths);
preCacheThread->start();
}
// test
@@ -357,35 +363,31 @@ int glestMain(int argc, char** argv){
while(Window::handleEvent()){
program->loop();
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
catch(const exception &e){
preCacheThread.shutdownAndWait();
//exceptionMessage(e);
ExceptionHandler::handleRuntimeError(e.what());
}
catch(const char *e){
//exceptionMessage(e);
preCacheThread.shutdownAndWait();
ExceptionHandler::handleRuntimeError(e);
}
catch(const string &ex){
//exceptionMessage(e);
preCacheThread.shutdownAndWait();
ExceptionHandler::handleRuntimeError(ex.c_str());
}
catch(...){
//exceptionMessage(e);
preCacheThread.shutdownAndWait();
ExceptionHandler::handleRuntimeError("Unknown error!");
}
preCacheThread.shutdownAndWait();
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
//SoundRenderer &soundRenderer= SoundRenderer::getInstance();
//soundRenderer.stopAllSounds();
delete mainWindow;
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
//SystemFlags::Close();
return 0;