mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-20 22:05:12 +00:00
Logging system rework
* use one central unified log with channels/priorities ad-hoc listener registration and de-registration * disable buffering by default * add multi-threaded ringbuffer implementation * use buffered listener for the gui (using the ringbuffer)
This commit is contained in:
Peter Tissen
Bigpet
parent
394b698e92
commit
21da317453
165 changed files with 1731 additions and 1519 deletions
|
|
@ -212,10 +212,10 @@ bool DynamicMemoryBlockBase<PT>::Free(u64 addr)
|
|||
}
|
||||
}
|
||||
|
||||
ConLog.Error("DynamicMemoryBlock::Free(addr=0x%llx): failed", addr);
|
||||
LOGF_ERROR(MEMORY, "DynamicMemoryBlock::Free(addr=0x%llx): failed", addr);
|
||||
for (u32 i = 0; i < m_allocated.size(); i++)
|
||||
{
|
||||
ConLog.Write("*** Memory Block: addr = 0x%llx, size = 0x%x", m_allocated[i].addr, m_allocated[i].size);
|
||||
LOGF_NOTICE(MEMORY, "*** Memory Block: addr = 0x%llx, size = 0x%x", m_allocated[i].addr, m_allocated[i].size);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -233,7 +233,7 @@ u8* DynamicMemoryBlockBase<PT>::GetMem(u64 addr) const // lock-free, addr is fix
|
|||
}
|
||||
}
|
||||
|
||||
ConLog.Error("GetMem(%llx) from not allocated address.", addr);
|
||||
LOGF_ERROR(MEMORY, "GetMem(%llx) from not allocated address.", addr);
|
||||
assert(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "stdafx.h"
|
||||
#include <atomic>
|
||||
|
||||
#include "Emu/ConLog.h"
|
||||
#include "Utilities/Log.h"
|
||||
#include "Memory.h"
|
||||
#include "MemoryBlock.h"
|
||||
#include "Emu/System.h"
|
||||
|
|
@ -331,7 +331,7 @@ bool MemoryBlockLE::Write128(const u64 addr, const u128 value)
|
|||
//NullMemoryBlock
|
||||
bool NullMemoryBlock::Read8(const u64 addr, u8* )
|
||||
{
|
||||
ConLog.Error("Read8 from null block: [%08llx]", addr);
|
||||
LOGF_ERROR(MEMORY, "Read8 from null block: [%08llx]", addr);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -339,7 +339,7 @@ bool NullMemoryBlock::Read8(const u64 addr, u8* )
|
|||
|
||||
bool NullMemoryBlock::Read16(const u64 addr, u16* )
|
||||
{
|
||||
ConLog.Error("Read16 from null block: [%08llx]", addr);
|
||||
LOGF_ERROR(MEMORY, "Read16 from null block: [%08llx]", addr);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -347,7 +347,7 @@ bool NullMemoryBlock::Read16(const u64 addr, u16* )
|
|||
|
||||
bool NullMemoryBlock::Read32(const u64 addr, u32* )
|
||||
{
|
||||
ConLog.Error("Read32 from null block: [%08llx]", addr);
|
||||
LOGF_ERROR(MEMORY, "Read32 from null block: [%08llx]", addr);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -355,7 +355,7 @@ bool NullMemoryBlock::Read32(const u64 addr, u32* )
|
|||
|
||||
bool NullMemoryBlock::Read64(const u64 addr, u64* )
|
||||
{
|
||||
ConLog.Error("Read64 from null block: [%08llx]", addr);
|
||||
LOGF_ERROR(MEMORY, "Read64 from null block: [%08llx]", addr);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -363,7 +363,7 @@ bool NullMemoryBlock::Read64(const u64 addr, u64* )
|
|||
|
||||
bool NullMemoryBlock::Read128(const u64 addr, u128* )
|
||||
{
|
||||
ConLog.Error("Read128 from null block: [%08llx]", addr);
|
||||
LOGF_ERROR(MEMORY, "Read128 from null block: [%08llx]", addr);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -371,7 +371,7 @@ bool NullMemoryBlock::Read128(const u64 addr, u128* )
|
|||
|
||||
bool NullMemoryBlock::Write8(const u64 addr, const u8 value)
|
||||
{
|
||||
ConLog.Error("Write8 to null block: [%08llx]: %x", addr, value);
|
||||
LOGF_ERROR(MEMORY, "Write8 to null block: [%08llx]: %x", addr, value);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -379,7 +379,7 @@ bool NullMemoryBlock::Write8(const u64 addr, const u8 value)
|
|||
|
||||
bool NullMemoryBlock::Write16(const u64 addr, const u16 value)
|
||||
{
|
||||
ConLog.Error("Write16 to null block: [%08llx]: %x", addr, value);
|
||||
LOGF_ERROR(MEMORY, "Write16 to null block: [%08llx]: %x", addr, value);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -387,7 +387,7 @@ bool NullMemoryBlock::Write16(const u64 addr, const u16 value)
|
|||
|
||||
bool NullMemoryBlock::Write32(const u64 addr, const u32 value)
|
||||
{
|
||||
ConLog.Error("Write32 to null block: [%08llx]: %x", addr, value);
|
||||
LOGF_ERROR(MEMORY, "Write32 to null block: [%08llx]: %x", addr, value);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -395,7 +395,7 @@ bool NullMemoryBlock::Write32(const u64 addr, const u32 value)
|
|||
|
||||
bool NullMemoryBlock::Write64(const u64 addr, const u64 value)
|
||||
{
|
||||
ConLog.Error("Write64 to null block: [%08llx]: %llx", addr, value);
|
||||
LOGF_ERROR(MEMORY, "Write64 to null block: [%08llx]: %llx", addr, value);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
@ -403,7 +403,7 @@ bool NullMemoryBlock::Write64(const u64 addr, const u64 value)
|
|||
|
||||
bool NullMemoryBlock::Write128(const u64 addr, const u128 value)
|
||||
{
|
||||
ConLog.Error("Write128 to null block: [%08llx]: %llx_%llx", addr, value.hi, value.lo);
|
||||
LOGF_ERROR(MEMORY, "Write128 to null block: [%08llx]: %llx_%llx", addr, value.hi, value.lo);
|
||||
if (!Ini.CPUIgnoreRWErrors.GetValue())
|
||||
Emu.Pause();
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ public:
|
|||
if(m_inited) return;
|
||||
m_inited = true;
|
||||
|
||||
ConLog.Write("Initing memory...");
|
||||
LOG_NOTICE(MEMORY, "Initing memory...");
|
||||
|
||||
switch(type)
|
||||
{
|
||||
|
|
@ -240,7 +240,7 @@ public:
|
|||
break;
|
||||
}
|
||||
|
||||
ConLog.Write("Memory initialized.");
|
||||
LOG_NOTICE(MEMORY, "Memory initialized.");
|
||||
}
|
||||
|
||||
bool IsGoodAddr(const u64 addr)
|
||||
|
|
@ -271,7 +271,7 @@ public:
|
|||
if(!m_inited) return;
|
||||
m_inited = false;
|
||||
|
||||
ConLog.Write("Closing memory...");
|
||||
LOG_NOTICE(MEMORY, "Closing memory...");
|
||||
|
||||
for (auto block : MemoryBlocks)
|
||||
{
|
||||
|
|
@ -405,7 +405,7 @@ public:
|
|||
|
||||
if(mem.IsNULL())
|
||||
{
|
||||
ConLog.Error("ReadLeft[%d] from null block (0x%llx)", size, addr);
|
||||
LOGF_ERROR(MEMORY, "ReadLeft[%d] from null block (0x%llx)", size, addr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -418,7 +418,7 @@ public:
|
|||
|
||||
if(mem.IsNULL())
|
||||
{
|
||||
ConLog.Error("WriteLeft[%d] to null block (0x%llx)", size, addr);
|
||||
LOGF_ERROR(MEMORY, "WriteLeft[%d] to null block (0x%llx)", size, addr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -431,7 +431,7 @@ public:
|
|||
|
||||
if(mem.IsNULL())
|
||||
{
|
||||
ConLog.Error("ReadRight[%d] from null block (0x%llx)", size, addr);
|
||||
LOGF_ERROR(MEMORY, "ReadRight[%d] from null block (0x%llx)", size, addr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -444,7 +444,7 @@ public:
|
|||
|
||||
if(mem.IsNULL())
|
||||
{
|
||||
ConLog.Error("WriteRight[%d] to null block (0x%llx)", size, addr);
|
||||
LOGF_ERROR(MEMORY, "WriteRight[%d] to null block (0x%llx)", size, addr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -477,7 +477,7 @@ public:
|
|||
{
|
||||
if(!IsGoodAddr(addr, str.length()))
|
||||
{
|
||||
ConLog.Error("Memory::WriteString error: bad address (0x%llx)", addr);
|
||||
LOGF_ERROR(MEMORY,"Memory::WriteString error: bad address (0x%llx)", addr);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -527,7 +527,7 @@ public:
|
|||
}
|
||||
|
||||
MemoryBlocks.push_back((new MemoryMirror())->SetRange(GetMemFromAddr(src_addr), dst_addr, size));
|
||||
ConLog.Warning("memory mapped 0x%llx to 0x%llx size=0x%x", src_addr, dst_addr, size);
|
||||
LOGF_WARNING(MEMORY, "memory mapped 0x%llx to 0x%llx size=0x%x", src_addr, dst_addr, size);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ struct MemBlockInfo : public MemInfo
|
|||
{
|
||||
if(!mem)
|
||||
{
|
||||
ConLog.Error("Not enough free memory.");
|
||||
LOG_ERROR(MEMORY, "Not enough free memory.");
|
||||
assert(0);
|
||||
}
|
||||
memset(mem, 0, size);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue