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

- attempt to bugfix threaded logger

Browse Source
This commit is contained in:
Mark Vejvoda 2010-12-26 01:27:49 +00:00
parent 409c15d3f0
commit e4e7a456f5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/platform/common/simple_threads.h
View File

@ -100,7 +100,7 @@ protected:
vector<LogFileEntry> logList;
time_t lastSaveToDisk;
void saveToDisk(bool forceSaveAll);
void saveToDisk(bool forceSaveAll,bool logListAlreadyLocked);
bool checkSaveCurrentLogBufferToDisk();
public:

14
source/shared_lib/sources/platform/common/simple_threads.cpp
View File

@ -208,7 +208,7 @@ void LogFileThread::addLogEntry(SystemFlags::DebugType type, string logEntry) {
logList.push_back(entry);
if(logList.size() >= 100000) {
saveToDisk(false);
saveToDisk(false,true);
}
}
@ -235,7 +235,7 @@ void LogFileThread::execute() {
try {
for(;this->getQuitStatus() == false;) {
if(checkSaveCurrentLogBufferToDisk() == true) {
saveToDisk(false);
saveToDisk(false,false);
}
if(this->getQuitStatus() == false) {
sleep(50);
@ -243,7 +243,7 @@ void LogFileThread::execute() {
}
// Ensure remaining entryies are logged to disk on shutdown
saveToDisk(true);
saveToDisk(true,false);
}
catch(const exception &ex) {
//SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
@ -267,8 +267,12 @@ std::size_t LogFileThread::getLogEntryBufferCount() {
return logCount;
}
void LogFileThread::saveToDisk(bool forceSaveAll) {
MutexSafeWrapper safeMutex(&mutexLogList);
void LogFileThread::saveToDisk(bool forceSaveAll,bool logListAlreadyLocked) {
MutexSafeWrapper safeMutex(NULL);
if(logListAlreadyLocked == false) {
safeMutex.setMutex(&mutexLogList);
}
std::size_t logCount = logList.size();
if(logCount > 0) {
vector<LogFileEntry> tempLogList = logList;