archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 14:01:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixup for LOG system.

Browse source 
Register all channels at program initialization and allow duplicates.
This commit is contained in:
Nekotekina 2020-01-31 12:01:17 +03:00
parent 59a0f810b9
commit 007a7a5859
27 changed files with 63 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Utilities/Log.h
View file

@ -17,8 +17,6 @@ namespace logs
warning,
notice,
trace, // Lowest severity (usually disabled)
_uninit = UINT_MAX, // Special value for delayed initialization
};
struct channel;
@ -63,12 +61,8 @@ namespace logs
// The lowest logging level enabled for this channel (used for early filtering)
atomic_t<level> enabled;
// Constant initialization: channel name
constexpr channel(const char* name)
: name(name)
, enabled(level::_uninit)
{
}
// Initialize and register channel
channel(const char* name);
#define GEN_LOG_METHOD(_sev)\
const message msg_##_sev{this, level::_sev};\
@ -93,16 +87,6 @@ namespace logs
#undef GEN_LOG_METHOD
};
/* Small set of predefined channels */
extern channel GENERAL;
extern channel LOADER;
extern channel MEMORY;
extern channel RSX;
extern channel HLE;
extern channel PPU;
extern channel SPU;
// Log level control: set all channels to level::notice
void reset();
@ -110,10 +94,23 @@ namespace logs
void set_level(const std::string&, level);
}
#define LOG_CHANNEL(ch, ...) ::logs::channel ch(#ch, ##__VA_ARGS__)
#define LOG_CHANNEL(ch, ...) inline ::logs::channel ch(#ch, ##__VA_ARGS__)
// Legacy:
namespace logs
{
/* Small set of predefined channels */
inline channel GENERAL("");
inline channel LOADER("LDR");
inline channel MEMORY("MEM");
LOG_CHANNEL(RSX);
LOG_CHANNEL(HLE);
LOG_CHANNEL(PPU);
LOG_CHANNEL(SPU);
}
#define LOG_SUCCESS(ch, fmt, ...) logs::ch.success("" fmt, ##__VA_ARGS__)
#define LOG_NOTICE(ch, fmt, ...) logs::ch.notice ("" fmt, ##__VA_ARGS__)
#define LOG_WARNING(ch, fmt, ...) logs::ch.warning("" fmt, ##__VA_ARGS__)