jackpoz
1b3575ba77
Fix race condition in Log by using atomic operators. Helgrind log: Possible data race during read of size 8 at 0x7379D98 by thread #1 Locks held: none at 0x15AE9C7: AppenderFile::_write(LogMessage const&) (AppenderFile.cpp:59) by 0x15ADFF8: Appender::write(LogMessage&) (Appender.cpp:106) by 0x159F14E: Logger::write(LogMessage&) (Logger.cpp:83) by 0x15A215B: Log::write(LogMessage*) (Log.cpp:290) by 0x15A200F: Log::vlog(LogFilterType, LogLevel, char const*, __va_list_tag*) (Log.cpp:272) by 0x15A2682: Log::outInfo(LogFilterType, char const*, ...) (Log.cpp:364) by 0xF7DA28: Master::Run() (Master.cpp:296) by 0xF835E8: main (Main.cpp:142) This conflicts with a previous write of size 8 by thread #10 Locks held: none at 0x15AE9D7: AppenderFile::_write(LogMessage const&) (AppenderFile.cpp:59) by 0x15ADFF8: Appender::write(LogMessage&) (Appender.cpp:106) by 0x159F14E: Logger::write(LogMessage&) (Logger.cpp:83) by 0x15A215B: Log::write(LogMessage*) (Log.cpp:290) by 0x15A200F: Log::vlog(LogFilterType, LogLevel, char const*, __va_list_tag*) (Log.cpp:272) by 0x15A2682: Log::outInfo(LogFilterType, char const*, ...) (Log.cpp:364) by 0xF7EC1F: FreezeDetectorRunnable::run() (Master.cpp:98) by 0x15A5B3E: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186) Address 0x7379D98 is 88 bytes inside a block of size 96 alloc'd at 0x4C2C857: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) by 0x15A0FE3: Log::CreateAppenderFromConfig(char const*) (Log.cpp:150) by 0x15A1AED: Log::ReadAppendersFromConfig() (Log.cpp:244) by 0x15A31B4: Log::LoadFromConfig() (Log.cpp:469) by 0x15A053B: Log::Log() (Log.cpp:35) by 0xF75CD1: ACE_Singleton<Log, ACE_Thread_Mutex>::ACE_Singleton() (Singleton.inl:13) by 0xF754A4: ACE_Singleton<Log, ACE_Thread_Mutex>::instance() (Singleton.cpp:91) by 0xF8351A: main (Main.cpp:135)
94 lines
2.7 KiB
C++
94 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "AppenderFile.h"
|
|
#include "Common.h"
|
|
|
|
AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, const char* _filename, const char* _logDir, const char* _mode, AppenderFlags _flags, uint64 fileSize):
|
|
Appender(id, name, APPENDER_FILE, level, _flags),
|
|
logfile(NULL),
|
|
filename(_filename),
|
|
logDir(_logDir),
|
|
mode(_mode),
|
|
maxFileSize(fileSize),
|
|
fileSize(0)
|
|
{
|
|
dynamicName = std::string::npos != filename.find("%s");
|
|
backup = _flags & APPENDER_FLAGS_MAKE_FILE_BACKUP;
|
|
|
|
logfile = !dynamicName ? OpenFile(_filename, _mode, mode == "w" && backup) : NULL;
|
|
}
|
|
|
|
AppenderFile::~AppenderFile()
|
|
{
|
|
CloseFile();
|
|
}
|
|
|
|
void AppenderFile::_write(LogMessage const& message)
|
|
{
|
|
bool exceedMaxSize = maxFileSize > 0 && (fileSize.value() + message.Size()) > maxFileSize;
|
|
|
|
if (dynamicName)
|
|
{
|
|
char namebuf[TRINITY_PATH_MAX];
|
|
snprintf(namebuf, TRINITY_PATH_MAX, filename.c_str(), message.param1.c_str());
|
|
logfile = OpenFile(namebuf, mode, backup || exceedMaxSize);
|
|
}
|
|
else if (exceedMaxSize)
|
|
logfile = OpenFile(filename, "w", true);
|
|
|
|
if (!logfile)
|
|
return;
|
|
|
|
fprintf(logfile, "%s%s", message.prefix.c_str(), message.text.c_str());
|
|
fflush(logfile);
|
|
fileSize += uint64(message.Size());
|
|
|
|
if (dynamicName)
|
|
CloseFile();
|
|
}
|
|
|
|
FILE* AppenderFile::OpenFile(std::string const &filename, std::string const &mode, bool backup)
|
|
{
|
|
std::string fullName(logDir + filename);
|
|
if (backup)
|
|
{
|
|
CloseFile();
|
|
std::string newName(fullName);
|
|
newName.push_back('.');
|
|
newName.append(LogMessage::getTimeStr(time(NULL)));
|
|
rename(fullName.c_str(), newName.c_str()); // no error handling... if we couldn't make a backup, just ignore
|
|
}
|
|
|
|
if (FILE* ret = fopen(fullName.c_str(), mode.c_str()))
|
|
{
|
|
fileSize = ftell(ret);
|
|
return ret;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void AppenderFile::CloseFile()
|
|
{
|
|
if (logfile)
|
|
{
|
|
fclose(logfile);
|
|
logfile = NULL;
|
|
}
|
|
}
|