ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LogManager: Added milliseconds timestamp 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1749 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-03 19:16:26 +00:00
parent 5f0939dfd9
commit 41e474d534
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,21 +15,37 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <stdio.h>
#include "Common.h" //////////////////////////////////////////////////////////////////////////////////////////
// Include
// ¯¯¯¯¯¯¯¯¯¯¯¯¯
#include <stdio.h> // System
#include "Common.h" // Common
#include "StringUtil.h" #include "StringUtil.h"
#include "LogManager.h" #include "LogManager.h"
#include "PowerPC/PowerPC.h"
#include "PowerPC/SymbolDB.h" // for g_symbolDB
#include "Debugger/Debugger_SymbolMap.h"
#include "Timer.h" #include "Timer.h"
#include "PowerPC/PowerPC.h" // Core
#include "PowerPC/SymbolDB.h" // for g_symbolDB
#include "Debugger/Debugger_SymbolMap.h"
#if defined(HAVE_WX) && HAVE_WX // wxWidgets
#include <wx/datetime.h> // for the timestamps
#endif
/////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////
// Declarations and definitions
// ¯¯¯¯¯¯¯¯¯¯¯¯¯
LogManager::SMessage (*LogManager::m_Messages)[MAX_MESSAGES]; LogManager::SMessage (*LogManager::m_Messages)[MAX_MESSAGES];
int LogManager::m_nextMessages[LogManager::VERBOSITY_LEVELS + 1]; int LogManager::m_nextMessages[LogManager::VERBOSITY_LEVELS + 1];
CDebugger_Log* LogManager::m_Log[LogTypes::NUMBER_OF_LOGS + (LogManager::VERBOSITY_LEVELS * 100)]; CDebugger_Log* LogManager::m_Log[LogTypes::NUMBER_OF_LOGS + (LogManager::VERBOSITY_LEVELS * 100)];
int LogManager::m_activeLog = LogTypes::MASTER_LOG; int LogManager::m_activeLog = LogTypes::MASTER_LOG;
bool LogManager::m_bDirty = true; bool LogManager::m_bDirty = true;
bool LogManager::m_bInitialized = false; bool LogManager::m_bInitialized = false;
/////////////////////////
void __Log(int log, const char *format, ...) void __Log(int log, const char *format, ...)
@ -222,6 +238,10 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
static u32 count = 0; static u32 count = 0;
char* Msg2 = (char*)alloca(strlen(_fmt)+512); char* Msg2 = (char*)alloca(strlen(_fmt)+512);
#if defined(HAVE_WX) && HAVE_WX
wxDateTime datetime = wxDateTime::UNow(); // get timestamp
#endif
// Here's the old symbol request // Here's the old symbol request
//Debugger::FindSymbol(PC); //Debugger::FindSymbol(PC);
// const Debugger::Symbol& symbol = Debugger::GetSymbol(Index); // const Debugger::Symbol& symbol = Debugger::GetSymbol(Index);
@ -252,11 +272,17 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
const char *eol = "\n"; const char *eol = "\n";
if (Index > 0) if (Index > 0)
{ {
//sprintf(Msg2, "%i | %i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s", #if defined(HAVE_WX) && HAVE_WX
sprintf(Msg2, "%i %llu: %x %s (%s, %08x) : %s%s", sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s",
//v, #else
sprintf(Msg2, "%i %llu: %x %s (%s, %08x) : %s%s",
#endif
++count, ++count,
Common::Timer::GetTimeSinceJan1970(), #if defined(HAVE_WX) && HAVE_WX
datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(),
#else
Common::Timer::GetTimeSinceJan1970(),
#endif
PowerPC::ppcState.DebugCount, PowerPC::ppcState.DebugCount,
m_Log[_type]->m_szShortName_, // (CONSOLE etc) m_Log[_type]->m_szShortName_, // (CONSOLE etc)
symbol.c_str(), PC, // current PC location (name, address) symbol.c_str(), PC, // current PC location (name, address)