dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-09 00:53:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Addressed problem with map file compatibility. When a game used a map file the symbol lookup would make the game crawl to a halt right after booting. This was exaggerated because m_bEnable was true by default, I changed that to off by default so that only selected logging is picked up. I'm guessing the symbol map was disabled earlier because it was slow. I have still kept it enabled but only for the lowest verbosity levels. I also turned off the collected write to the master file, that's not very important however because it doesn't slow the program down very much unless there's thousands of rows per second written. I could probably be on most of the time without much of a speed difference. I'll add an option for it later.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@913 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-10-19 00:48:20 +00:00
parent 1b76bd3863
commit 290966a4f8
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Source/Core/Core/Src/LogManager.cpp
View File

@ -47,8 +47,8 @@ void __Log(int log, const char *format, ...)
CDebugger_Log::CDebugger_Log(const char* _szShortName, const char* _szName, int a) :
m_bLogToFile(true),
m_bShowInLog(true),
m_bEnable(true),
m_bShowInLog(false),
m_bEnable(false),
m_pFile(NULL)
{
strcpy((char*)m_szName, _szName);
@ -172,6 +172,11 @@ void LogManager::Shutdown()
}
// ==========================================================================================
// The function that finally writes the log.
// ---------------
u32 lastPC;
std::string lastSymbol;
void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
{
// declarations
@ -186,7 +191,7 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
vv = atoi(svv.substr(0, 1).c_str());
// security checks
if (m_Log[_type] == NULL
if (m_Log[_type] == NULL || !m_Log[_type]->m_bEnable || PC == 0
|| _type > (LogTypes::NUMBER_OF_LOGS + LogManager::VERBOSITY_LEVELS * 100)
|| _type < 0)
return;
@ -208,25 +213,39 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
// const Debugger::Symbol& symbol = Debugger::GetSymbol(Index);
//symbol.GetName().c_str(),
// Warning: Getting the function name this often is very demanding on the CPU.
// I have limited it to the two lowest verbosity levels because of that. I've also
// added a simple caching function so that we don't search again if we get the same
// question again.
std::string symbol;
if ((vv == 0 || vv == 1) && lastPC != PC)
{
symbol = g_symbolDB.GetDescription(PC);
lastSymbol = symbol;
lastPC = PC;
}
else if(lastPC == PC)
{
symbol = lastSymbol;
}
else
{
symbol = "---";
}
int Index = 1;
const char *eol = "\n";
if (Index > 0)
{
{
sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s",
++count,
datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(),
PowerPC::ppcState.DebugCount,
m_Log[_type]->m_szShortName_,
g_symbolDB.GetDescription(PC),
PC,
m_Log[_type]->m_szShortName_, // (CONSOLE etc)
symbol.c_str(), PC, // (name, 0xaddress)
Msg, eol);
}
else
{
sprintf(Msg2, "%i: %x %s ( %08x ) : %s%s", ++count, PowerPC::ppcState.DebugCount,
m_Log[_type]->m_szShortName_, PC, Msg, eol);
}
// ==========================================================================================
// Level 0 verbosity logs will be written to all verbosity levels. Given that logging is enabled
@ -235,10 +254,6 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
int type = _type;
for (int i = LogManager::VERBOSITY_LEVELS; i >= vv ; i--)
{
// safety checks again
if (m_Log[_type] == NULL || !m_Log[_type]->m_bEnable)
continue;
// write to memory
m_Messages[i][m_nextMessages[i]].Set(_type, Msg2);