RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

config.yml: Log section optimized

Browse Source
This commit is contained in:
Nekotekina 2017-05-13 21:30:37 +03:00
parent 299f627321
commit 88fef183a3
191 changed files with 377 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Utilities/Config.cpp
View File

@ -5,7 +5,7 @@
namespace cfg
{
logs::channel cfg("CFG", logs::level::notice);
logs::channel cfg("CFG");
entry_base::entry_base(type _type)
: m_type(_type)
@ -161,7 +161,8 @@ void cfg::encode(YAML::Emitter& out, const cfg::entry_base& rhs)
for (const auto& np : static_cast<const node&>(rhs).get_nodes())
{
out << YAML::Key << np.first;
out << YAML::Value; encode(out, *np.second);
out << YAML::Value;
encode(out, *np.second);
}
out << YAML::EndMap;
@ -178,6 +179,19 @@ void cfg::encode(YAML::Emitter& out, const cfg::entry_base& rhs)
out << YAML::EndSeq;
return;
}
case type::log:
{
out << YAML::BeginMap;
for (const auto& np : static_cast<const log_entry&>(rhs).get_map())
{
if (np.second == logs::level::notice) continue;
out << YAML::Key << np.first;
out << YAML::Value << fmt::format("%s", np.second);
}
out << YAML::EndMap;
return;
}
}
out << rhs.to_string();
@ -199,8 +213,7 @@ void cfg::decode(const YAML::Node& data, cfg::entry_base& rhs)
if (!pair.first.IsScalar()) continue;
// Find the key among existing nodes
const auto name = pair.first.Scalar();
const auto found = static_cast<node&>(rhs).get_nodes().find(name);
const auto found = static_cast<node&>(rhs).get_nodes().find(pair.first.Scalar());
if (found != static_cast<node&>(rhs).get_nodes().cend())
{
@ -225,6 +238,29 @@ void cfg::decode(const YAML::Node& data, cfg::entry_base& rhs)
break;
}
case type::log:
{
if (data.IsScalar() || data.IsSequence())
{
return; // ???
}
std::map<std::string, logs::level> values;
for (const auto& pair : data)
{
if (!pair.first.IsScalar() || !pair.second.IsScalar()) continue;
u64 value;
if (cfg::try_to_enum_value(&value, &fmt_class_string<logs::level>::format, pair.second.Scalar()))
{
values.emplace(pair.first.Scalar(), static_cast<logs::level>(static_cast<int>(value)));
}
}
static_cast<log_entry&>(rhs).set_map(std::move(values));
break;
}
default:
{
std::string value;
@ -277,6 +313,21 @@ void cfg::set_entry::from_default()
m_set = {};
}
void cfg::log_entry::set_map(std::map<std::string, logs::level>&& map)
{
logs::reset();
for (auto&& pair : (m_map = std::move(map)))
{
logs::set_level(pair.first, pair.second);
}
}
void cfg::log_entry::from_default()
{
set_map({});
}
cfg::root_node& cfg::get_root()
{
// Magic static

44
Utilities/Config.h
View File

@ -3,6 +3,7 @@
#include "Utilities/types.h"
#include "Utilities/Atomic.h"
#include "Utilities/StrFmt.h"
#include "Utilities/Log.h"
#include <initializer_list>
#include <exception>
@ -35,6 +36,7 @@ namespace cfg
integer, // cfg::int_entry type
string, // cfg::string_entry type
set, // cfg::set_entry type
log,
};
// Config tree entry abstract base class
@ -485,18 +487,39 @@ namespace cfg
}
};
class log_entry final : public entry_base
{
std::map<std::string, logs::level> m_map;
public:
log_entry(node& owner, const std::string& name)
: entry_base(type::log, owner, name)
{
}
std::map<std::string, logs::level> get_map() const
{
return m_map;
}
void set_map(std::map<std::string, logs::level>&& map);
void from_default() override;
};
// Root type with some predefined nodes. Don't change it, this is not mandatory for adding nodes.
struct root_node : node
{
node core { *this, "Core" };
node vfs { *this, "VFS" };
node log { *this, "Log" };
node video { *this, "Video" };
node audio { *this, "Audio" };
node io { *this, "Input/Output" };
node sys { *this, "System" };
node net { *this, "Net" };
node misc { *this, "Miscellaneous" };
node core {*this, "Core"};
node vfs {*this, "VFS"};
node video {*this, "Video"};
node audio {*this, "Audio"};
node io {*this, "Input/Output"};
node sys {*this, "System"};
node net {*this, "Net"};
node misc {*this, "Miscellaneous"};
log_entry log{*this, "Log"};
};
// Get global configuration root instance
@ -505,6 +528,3 @@ namespace cfg
// Global configuration root instance (cached reference)
static root_node& root = get_root();
}
// Registered log channel
#define LOG_CHANNEL(name) extern logs::channel name; namespace logs { static cfg::enum_entry<logs::level, true> name(cfg::root.log, #name, ::name.enabled); }

2
Utilities/GDBDebugServer.cpp
View File

@ -20,7 +20,7 @@
extern void ppu_set_breakpoint(u32 addr);
extern void ppu_remove_breakpoint(u32 addr);
logs::channel gdbDebugServer("gdbDebugServer", logs::level::notice);
logs::channel gdbDebugServer("gdbDebugServer");
int sock_init(void)
{

94
Utilities/Log.cpp
View File

@ -1,9 +1,11 @@
#include "Log.h"
#include "File.h"
#include "StrFmt.h"
#include "sema.h"
#include "rpcs3_version.h"
#include <string>
#include <unordered_map>
#ifdef _WIN32
#include <Windows.h>
@ -11,8 +13,13 @@
#include <chrono>
#endif
static std::string empty_string()
{
return {};
}
// Thread-specific log prefix provider
thread_local std::string(*g_tls_log_prefix)() = nullptr;
thread_local std::string(*g_tls_log_prefix)() = &empty_string;
template<>
void fmt_class_string<logs::level>::format(std::string& out, u64 arg)
@ -105,14 +112,53 @@ namespace logs
return timebase.get();
}
channel GENERAL(nullptr, level::notice);
channel LOADER("LDR", level::notice);
channel MEMORY("MEM", level::notice);
channel RSX("RSX", level::notice);
channel HLE("HLE", level::notice);
channel PPU("PPU", level::notice);
channel SPU("SPU", level::notice);
channel GENERAL("");
channel LOADER("LDR");
channel MEMORY("MEM");
channel RSX("RSX");
channel HLE("HLE");
channel PPU("PPU");
channel SPU("SPU");
channel ARMv7("ARMv7");
struct channel_info
{
channel* pointer = nullptr;
level enabled = level::notice;
void set_level(level value)
{
enabled = value;
if (pointer)
{
pointer->enabled = value;
}
}
};
// Channel registry mutex
semaphore<> g_mutex;
// Channel registry
std::unordered_map<std::string, channel_info> g_channels;
void reset()
{
semaphore_lock lock(g_mutex);
for (auto&& pair : g_channels)
{
pair.second.set_level(level::notice);
}
}
void set_level(const std::string& ch_name, level value)
{
semaphore_lock lock(g_mutex);
g_channels[ch_name].set_level(value);
}
}
logs::listener::~listener()
@ -136,8 +182,34 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u
// Get timestamp
const u64 stamp = get_stamp();
std::string text; fmt::raw_append(text, fmt, sup, args);
std::string prefix(g_tls_log_prefix ? g_tls_log_prefix() : "");
// Register channel
if (ch->enabled == level::_uninit)
{
semaphore_lock lock(g_mutex);
auto& info = g_channels[ch->name];
if (info.pointer && info.pointer != ch)
{
fmt::throw_exception("logs::channel repetition: %s", ch->name);
}
else if (!info.pointer)
{
info.pointer = ch;
ch->enabled = info.enabled;
// Check level again
if (info.enabled < sev)
{
return;
}
}
}
// Get text
std::string text;
fmt::raw_append(text, fmt, sup, args);
std::string prefix = g_tls_log_prefix();
// Get first (main) listener
listener* lis = get_logger();
@ -203,7 +275,7 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st
text += "} ";
}
if (msg.ch->name)
if ('\0' != *msg.ch->name)
{
text += msg.ch->name;
text += msg.sev == level::todo ? " TODO: " : ": ";

25
Utilities/Log.h
View File

@ -3,19 +3,22 @@
#include "types.h"
#include "Atomic.h"
#include "StrFmt.h"
#include <climits>
namespace logs
{
enum class level : uint
{
always, // highest level (unused, cannot be disabled)
always, // Highest log severity (unused, cannot be disabled)
fatal,
error,
todo,
success,
warning,
notice,
trace, // lowest level (usually disabled)
trace, // Lowest severity (usually disabled)
_uninit = UINT_MAX, // Special value for delayed initialization
};
struct channel;
@ -23,7 +26,7 @@ namespace logs
// Message information (temporary data)
struct message
{
const channel* ch;
channel* ch;
level sev;
// Send log message to global logger instance
@ -57,16 +60,16 @@ namespace logs
// The lowest logging level enabled for this channel (used for early filtering)
atomic_t<level> enabled;
// Constant initialization: name and initial log level
constexpr channel(const char* name, level enabled = level::trace)
// Constant initialization: channel name
constexpr channel(const char* name)
: name(name)
, enabled(enabled)
, enabled(level::_uninit)
{
}
// Formatting function
template<typename... Args>
SAFE_BUFFERS FORCE_INLINE void format(level sev, const char* fmt, const Args&... args) const
SAFE_BUFFERS FORCE_INLINE void format(level sev, const char* fmt, const Args&... args)
{
if (UNLIKELY(sev <= enabled))
{
@ -76,7 +79,7 @@ namespace logs
#define GEN_LOG_METHOD(_sev)\
template<typename... Args>\
SAFE_BUFFERS void _sev(const char* fmt, const Args&... args) const\
SAFE_BUFFERS void _sev(const char* fmt, const Args&... args)\
{\
return format<Args...>(level::_sev, fmt, args...);\
}
@ -102,6 +105,12 @@ namespace logs
extern channel PPU;
extern channel SPU;
extern channel ARMv7;
// Log level control: set all channels to level::notice
void reset();
// Log level control: register channel if necessary, set channel level
void set_level(const std::string&, level);
}
// Legacy:

2
rpcs3/Emu/Cell/Modules/cellAdec.cpp
View File

@ -19,7 +19,7 @@ extern "C"
extern std::mutex g_mutex_avcodec_open2;
logs::channel cellAdec("cellAdec", logs::level::notice);
logs::channel cellAdec("cellAdec");
class AudioDecoder : public ppu_thread
{

2
rpcs3/Emu/Cell/Modules/cellAtrac.cpp
View File

@ -4,7 +4,7 @@
#include "cellAtrac.h"
logs::channel cellAtrac("cellAtrac", logs::level::notice);
logs::channel cellAtrac("cellAtrac");
s32 cellAtracSetDataAndGetMemSize(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr<u32> puiWorkMemByte)
{

2
rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp
View File

@ -4,7 +4,7 @@
#include "cellAtracMulti.h"
logs::channel cellAtracMulti("cellAtracMulti", logs::level::notice);
logs::channel cellAtracMulti("cellAtracMulti");
s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr<CellAtracMultiHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, u32 uiOutputChNum, vm::ptr<s32> piTrackArray, vm::ptr<u32> puiWorkMemByte)
{

2
rpcs3/Emu/Cell/Modules/cellAudio.cpp
View File

@ -11,7 +11,7 @@
#include <thread>
logs::channel cellAudio("cellAudio", logs::level::notice);
logs::channel cellAudio("cellAudio");
cfg::bool_entry g_cfg_audio_dump_to_file(cfg::root.audio, "Dump to file");
cfg::bool_entry g_cfg_audio_convert_to_u16(cfg::root.audio, "Convert to 16 bit");

2
rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
View File

@ -7,7 +7,7 @@
#include "cellVideoOut.h"
#include "cellSysutil.h"
logs::channel cellAvconfExt("cellAvconfExt", logs::level::notice);
logs::channel cellAvconfExt("cellAvconfExt");
vm::gvar<f32> g_gamma; // TODO

2
rpcs3/Emu/Cell/Modules/cellBgdl.cpp
View File

@ -4,7 +4,7 @@
#include "cellBgdl.h"
logs::channel cellBGDL("cellBGDL", logs::level::notice);
logs::channel cellBGDL("cellBGDL");
s32 cellBGDLGetInfo(vm::cptr<char> content_id, vm::ptr<CellBGDLInfo> info, s32 num)
{

2
rpcs3/Emu/Cell/Modules/cellCamera.cpp
View File

@ -6,7 +6,7 @@
#include "cellCamera.h"
logs::channel cellCamera("cellCamera", logs::level::notice);
logs::channel cellCamera("cellCamera");
cfg::map_entry<bool> g_cfg_camera(cfg::root.io, "Camera",
{

2
rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp
View File

@ -4,7 +4,7 @@
#include "cellCelp8Enc.h"
logs::channel cellCelp8Enc("cellCelp8Enc", logs::level::notice);
logs::channel cellCelp8Enc("cellCelp8Enc");
s32 cellCelp8EncQueryAttr()

2
rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp
View File

@ -4,7 +4,7 @@
#include "cellCelpEnc.h"
logs::channel cellCelpEnc("cellCelpEnc", logs::level::notice);
logs::channel cellCelpEnc("cellCelpEnc");
s32 cellCelpEncQueryAttr()

2
rpcs3/Emu/Cell/Modules/cellCrossController.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellCrossController("cellCrossController", logs::level::notice);
logs::channel cellCrossController("cellCrossController");
s32 cellCrossController_37E1F502() // LittleBigPlanet 2 and 3
{

2
rpcs3/Emu/Cell/Modules/cellDaisy.cpp
View File

@ -3,7 +3,7 @@
#include "cellDaisy.h"
logs::channel cellDaisy("cellDaisy", logs::level::notice);
logs::channel cellDaisy("cellDaisy");
using LFQueue2 = struct CellDaisyLFQueue2;
using Lock = struct CellDaisyLock;

2
rpcs3/Emu/Cell/Modules/cellDmux.cpp
View File

@ -9,7 +9,7 @@
#include <thread>
logs::channel cellDmux("cellDmux", logs::level::notice);
logs::channel cellDmux("cellDmux");
/* Demuxer Thread Classes */

2
rpcs3/Emu/Cell/Modules/cellFiber.cpp
View File

@ -4,7 +4,7 @@
#include "cellFiber.h"
logs::channel cellFiber("cellFiber", logs::level::notice);
logs::channel cellFiber("cellFiber");
template <>
void fmt_class_string<CellFiberError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellFont.cpp
View File

@ -8,7 +8,7 @@
#include "cellFont.h"
logs::channel cellFont("cellFont", logs::level::notice);
logs::channel cellFont("cellFont");
// Functions
s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontConfig> config)

2
rpcs3/Emu/Cell/Modules/cellFontFT.cpp
View File

@ -3,7 +3,7 @@
#include "cellFontFT.h"
logs::channel cellFontFT("cellFontFT", logs::level::notice);
logs::channel cellFontFT("cellFontFT");
s32 cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr<CellFontLibraryConfigFT> config, vm::pptr<CellFontLibrary> lib)
{

2
rpcs3/Emu/Cell/Modules/cellFs.cpp
View File

@ -13,7 +13,7 @@
namespace vm { using namespace ps3; }
logs::channel cellFs("cellFs", logs::level::notice);
logs::channel cellFs("cellFs");
error_code cellFsGetPath(u32 fd, vm::ptr<char> out_path)
{

2
rpcs3/Emu/Cell/Modules/cellGame.cpp
View File

@ -12,7 +12,7 @@
#include <thread>
logs::channel cellGame("cellGame", logs::level::notice);
logs::channel cellGame("cellGame");
template<>
void fmt_class_string<CellGameError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellGameExec.cpp
View File

@ -3,7 +3,7 @@
#include "cellGame.h"
logs::channel cellGameExec("cellGameExec", logs::level::notice);
logs::channel cellGameExec("cellGameExec");
s32 cellGameSetExitParam()
{

2
rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
View File

@ -10,7 +10,7 @@
#include <thread>
logs::channel cellGcmSys("cellGcmSys", logs::level::notice);
logs::channel cellGcmSys("cellGcmSys");
extern s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 count);

2
rpcs3/Emu/Cell/Modules/cellGem.cpp
View File

@ -4,7 +4,7 @@
#include "cellGem.h"
logs::channel cellGem("cellGem", logs::level::notice);
logs::channel cellGem("cellGem");
struct gem_t
{

2
rpcs3/Emu/Cell/Modules/cellGifDec.cpp
View File

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_fs.h"
#include "cellGifDec.h"
logs::channel cellGifDec("cellGifDec", logs::level::notice);
logs::channel cellGifDec("cellGifDec");
// cellGifDec aliases (only for cellGifDec.cpp)
using PPMainHandle = vm::pptr<GifDecoder>;

2
rpcs3/Emu/Cell/Modules/cellHttp.cpp
View File

@ -3,7 +3,7 @@
#include "cellHttp.h"
logs::channel cellHttp("cellHttp", logs::level::notice);
logs::channel cellHttp("cellHttp");
s32 cellHttpAuthCacheFlush()

2
rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp
View File

@ -3,7 +3,7 @@
#include "cellHttpUtil.h"
logs::channel cellHttpUtil("cellHttpUtil", logs::level::notice);
logs::channel cellHttpUtil("cellHttpUtil");
s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
{

2
rpcs3/Emu/Cell/Modules/cellImeJp.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/Cell/PPUModule.h"
#include "cellImeJp.h"
logs::channel cellImeJp("cellImeJp", logs::level::notice);
logs::channel cellImeJp("cellImeJp");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellJpgDec.cpp
View File

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_fs.h"
#include "cellJpgDec.h"
logs::channel cellJpgDec("cellJpgDec", logs::level::notice);
logs::channel cellJpgDec("cellJpgDec");
s32 cellJpgDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam)
{

2
rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp
View File

@ -3,7 +3,7 @@
#include "cellJpgEnc.h"
logs::channel cellJpgEnc("cellJpgEnc", logs::level::notice);
logs::channel cellJpgEnc("cellJpgEnc");
s32 cellJpgEncQueryAttr()

2
rpcs3/Emu/Cell/Modules/cellKey2char.cpp
View File

@ -3,7 +3,7 @@
namespace vm { using namespace ps3; }
logs::channel cellKey2char("cellKey2char", logs::level::notice);
logs::channel cellKey2char("cellKey2char");
// Return Codes
enum CellKey2CharError : u32

2
rpcs3/Emu/Cell/Modules/cellL10n.cpp
View File

@ -15,7 +15,7 @@ typedef const char *HostCode;
#include "cellL10n.h"
logs::channel cellL10n("cellL10n", logs::level::notice);
logs::channel cellL10n("cellL10n");
// Translate code id to code name. some codepage may has another name.
// If this makes your compilation fail, try replace the string code with one in "iconv -l"

2
rpcs3/Emu/Cell/Modules/cellLibprof.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellLibprof("cellLibprof", logs::level::notice);
logs::channel cellLibprof("cellLibprof");
s32 cellUserTraceInit()
{

2
rpcs3/Emu/Cell/Modules/cellMic.cpp
View File

@ -4,7 +4,7 @@
#include "cellMic.h"
logs::channel cellMic("cellMic", logs::level::notice);
logs::channel cellMic("cellMic");
s32 cellMicInit()
{

2
rpcs3/Emu/Cell/Modules/cellMusic.cpp
View File

@ -6,7 +6,7 @@
#include "cellMusic.h"
#include "cellSysutil.h"
logs::channel cellMusic("cellMusic", logs::level::notice);
logs::channel cellMusic("cellMusic");
struct music2_t
{

2
rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellMusicDecode("cellMusicDecode", logs::level::notice);
logs::channel cellMusicDecode("cellMusicDecode");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellMusicExport("cellMusicExport", logs::level::notice);
logs::channel cellMusicExport("cellMusicExport");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellNetCtl.cpp
View File

@ -9,7 +9,7 @@
#include "Utilities/StrUtil.h"
logs::channel cellNetCtl("cellNetCtl", logs::level::notice);
logs::channel cellNetCtl("cellNetCtl");
template<>
void fmt_class_string<CellNetCtlError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -6,7 +6,7 @@
#include <thread>
#include "Emu/System.h"
logs::channel cellOskDialog("cellOskDialog", logs::level::notice);
logs::channel cellOskDialog("cellOskDialog");
static char16_t s_osk_text[CELL_OSKDIALOG_STRING_SIZE];

2
rpcs3/Emu/Cell/Modules/cellOvis.cpp
View File

@ -4,7 +4,7 @@
namespace vm { using namespace ps3; }
logs::channel cellOvis("cellOvis", logs::level::notice);
logs::channel cellOvis("cellOvis");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellPamf.cpp
View File

@ -12,7 +12,7 @@ bool squeue_test_exit()
return Emu.IsStopped();
}
logs::channel cellPamf("cellPamf", logs::level::notice);
logs::channel cellPamf("cellPamf");
s32 pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId)
{

2
rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellPhotoDecode("cellPhotoDecode", logs::level::notice);
logs::channel cellPhotoDecode("cellPhotoDecode");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellPhotoExport("cellPhotoExport", logs::level::notice);
logs::channel cellPhotoExport("cellPhotoExport");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellPhotoImportUtil("cellPhotoImportUtil", logs::level::notice);
logs::channel cellPhotoImportUtil("cellPhotoImportUtil");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellPngDec.cpp
View File

@ -19,7 +19,7 @@ typedef png_bytep iCCP_profile_type;
typedef png_charp iCCP_profile_type;
#endif
logs::channel cellPngDec("cellPngDec", logs::level::notice);
logs::channel cellPngDec("cellPngDec");
// cellPngDec aliases to improve readability
using PPHandle = vm::pptr<PngHandle>;

2
rpcs3/Emu/Cell/Modules/cellPngEnc.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellPngEnc("cellPngEnc", logs::level::notice);
logs::channel cellPngEnc("cellPngEnc");
// Error Codes
enum

2
rpcs3/Emu/Cell/Modules/cellPrint.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellPrint("cellPrint", logs::level::notice);
logs::channel cellPrint("cellPrint");
// Error Codes
enum

2
rpcs3/Emu/Cell/Modules/cellRec.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellRec("cellRec", logs::level::notice);
logs::channel cellRec("cellRec");
s32 cellRecOpen()
{

2
rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellRemotePlay("cellRemotePlay", logs::level::notice);
logs::channel cellRemotePlay("cellRemotePlay");
s32 cellRemotePlayGetStatus()
{

2
rpcs3/Emu/Cell/Modules/cellResc.cpp
View File

@ -6,7 +6,7 @@
#include "Emu/RSX/GCM.h"
#include "cellResc.h"
logs::channel cellResc("cellResc", logs::level::notice);
logs::channel cellResc("cellResc");
s32 cellRescInit(vm::ptr<CellRescInitConfig> initConfig)
{

2
rpcs3/Emu/Cell/Modules/cellRtc.cpp
View File

@ -3,7 +3,7 @@
#include "cellRtc.h"
logs::channel cellRtc("cellRtc", logs::level::notice);
logs::channel cellRtc("cellRtc");
s64 convertToUNIXTime(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years)
{

2
rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellRtcAlarm("cellRtcAlarm", logs::level::notice);
logs::channel cellRtcAlarm("cellRtcAlarm");
s32 cellRtcAlarmRegister()
{

2
rpcs3/Emu/Cell/Modules/cellRudp.cpp
View File

@ -5,7 +5,7 @@
#include "cellRudp.h"
logs::channel cellRudp("cellRudp", logs::level::notice);
logs::channel cellRudp("cellRudp");
struct rudp_t
{

2
rpcs3/Emu/Cell/Modules/cellSail.cpp
View File

@ -5,7 +5,7 @@
#include "cellSail.h"
#include "cellPamf.h"
logs::channel cellSail("cellSail", logs::level::notice);
logs::channel cellSail("cellSail");
s32 cellSailMemAllocatorInitialize(vm::ptr<CellSailMemAllocator> pSelf, vm::ptr<CellSailMemAllocatorFuncs> pCallbacks)
{

2
rpcs3/Emu/Cell/Modules/cellSailRec.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSailRec("cellSailRec", logs::level::notice);
logs::channel cellSailRec("cellSailRec");
// Error Codes
enum

2
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View File

@ -10,7 +10,7 @@
#include <mutex>
#include <algorithm>
logs::channel cellSaveData("cellSaveData", logs::level::notice);
logs::channel cellSaveData("cellSaveData");
SaveDialogBase::~SaveDialogBase()
{

2
rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
View File

@ -4,7 +4,7 @@
#include "cellScreenshot.h"
logs::channel cellScreenshot("cellScreenshot", logs::level::notice);
logs::channel cellScreenshot("cellScreenshot");
s32 cellScreenShotSetParameter(vm::cptr<CellScreenShotSetParam> param)
{

2
rpcs3/Emu/Cell/Modules/cellSearch.cpp
View File

@ -4,7 +4,7 @@
#include "cellSearch.h"
logs::channel cellSearch("cellSearch", logs::level::notice);
logs::channel cellSearch("cellSearch");
s32 cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr<CellSearchSystemCallback> func, vm::ptr<u32> userData)
{

2
rpcs3/Emu/Cell/Modules/cellSheap.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSheap("cellSheap", logs::level::notice);
logs::channel cellSheap("cellSheap");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellSpudll.cpp
View File

@ -5,7 +5,7 @@
namespace vm { using namespace ps3; }
logs::channel cellSpudll("cellSpudll", logs::level::notice);
logs::channel cellSpudll("cellSpudll");
template<>
void fmt_class_string<CellSpudllError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellSpurs.cpp
View File

@ -15,7 +15,7 @@
#include "sysPrxForUser.h"
#include "cellSpurs.h"
logs::channel cellSpurs("cellSpurs", logs::level::notice);
logs::channel cellSpurs("cellSpurs");
s32 sys_spu_image_close(vm::ptr<sys_spu_image> img);

2
rpcs3/Emu/Cell/Modules/cellSpursJq.cpp
View File

@ -8,7 +8,7 @@
#include "cellSpurs.h"
#include "cellSpursJq.h"
logs::channel cellSpursJq("cellSpursJq", logs::level::notice);
logs::channel cellSpursJq("cellSpursJq");
s32 cellSpursJobQueueAttributeInitialize()
{

2
rpcs3/Emu/Cell/Modules/cellSsl.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSsl("cellSsl", logs::level::notice);
logs::channel cellSsl("cellSsl");
s32 cellSslInit()
{

2
rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp
View File

@ -3,7 +3,7 @@
#include "cellSubdisplay.h"
logs::channel cellSubdisplay("cellSubdisplay", logs::level::notice);
logs::channel cellSubdisplay("cellSubdisplay");
template<>
void fmt_class_string<CellSubDisplayError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellSync.cpp
View File

@ -6,7 +6,7 @@
#include "Emu/Cell/lv2/sys_process.h"
#include "cellSync.h"
logs::channel cellSync("cellSync", logs::level::notice);
logs::channel cellSync("cellSync");
template<>
void fmt_class_string<CellSyncError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellSync2.cpp
View File

@ -6,7 +6,7 @@
#include "Utilities/StrUtil.h"
logs::channel cellSync2("cellSync2", logs::level::notice);
logs::channel cellSync2("cellSync2");
vm::gvar<CellSync2CallerThreadType> gCellSync2CallerThreadTypePpuThread;
vm::gvar<CellSync2Notifier> gCellSync2NotifierPpuThread;

2
rpcs3/Emu/Cell/Modules/cellSysconf.cpp
View File

@ -3,7 +3,7 @@
#include "cellSysconf.h"
logs::channel cellSysconf("cellSysconf", logs::level::notice);
logs::channel cellSysconf("cellSysconf");
s32 cellSysconfAbort()
{

2
rpcs3/Emu/Cell/Modules/cellSysmodule.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSysmodule("cellSysmodule", logs::level::notice);
logs::channel cellSysmodule("cellSysmodule");
enum
{

2
rpcs3/Emu/Cell/Modules/cellSysutil.cpp
View File

@ -11,7 +11,7 @@
#include <mutex>
#include <queue>
logs::channel cellSysutil("cellSysutil", logs::level::notice);
logs::channel cellSysutil("cellSysutil");
struct sysutil_cb_manager
{

2
rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp
View File

@ -3,7 +3,7 @@
namespace vm { using namespace ps3; }
logs::channel cellSysutilAp("cellSysutilAp", logs::level::notice);
logs::channel cellSysutilAp("cellSysutilAp");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilAvc("cellSysutilAvc", logs::level::notice);
logs::channel cellSysutilAvc("cellSysutilAvc");
s32 cellSysutilAvcByeRequest()
{

2
rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
View File

@ -5,7 +5,7 @@
#include "sceNp2.h"
#include "cellSysutilAvc2.h"
logs::channel cellSysutilAvc2("cellSysutilAvc2", logs::level::notice);
logs::channel cellSysutilAvc2("cellSysutilAvc2");
s32 cellSysutilAvc2GetPlayerInfo()
{

2
rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilMisc("cellSysutilMisc", logs::level::notice);
logs::channel cellSysutilMisc("cellSysutilMisc");
// License areas
enum

2
rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilNpEula("cellSysutilNpEula", logs::level::notice);
logs::channel cellSysutilNpEula("cellSysutilNpEula");
s32 cellSysutilNpEula_59D1629A() // Resistance 3, Uncharted 2
{

2
rpcs3/Emu/Cell/Modules/cellUsbd.cpp
View File

@ -3,7 +3,7 @@
#include "Emu/Cell/PPUModule.h"
#include "cellUsbd.h"
logs::channel cellUsbd("cellUsbd", logs::level::notice);
logs::channel cellUsbd("cellUsbd");
s32 cellUsbdInit()
{

2
rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellUsbPspcm("cellUsbPspcm", logs::level::notice);
logs::channel cellUsbPspcm("cellUsbPspcm");
// Return Codes
enum

2
rpcs3/Emu/Cell/Modules/cellUserInfo.cpp
View File

@ -6,7 +6,7 @@
#include "Utilities/StrUtil.h"
logs::channel cellUserInfo("cellUserInfo", logs::level::notice);
logs::channel cellUserInfo("cellUserInfo");
template<>
void fmt_class_string<CellUserInfoError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/cellVdec.cpp
View File

@ -20,7 +20,7 @@ extern "C"
std::mutex g_mutex_avcodec_open2;
logs::channel cellVdec("cellVdec", logs::level::notice);
logs::channel cellVdec("cellVdec");
vm::gvar<s32> _cell_vdec_prx_ver; // ???

2
rpcs3/Emu/Cell/Modules/cellVideoExport.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cellVideoExport("cellVideoExport", logs::level::notice);
logs::channel cellVideoExport("cellVideoExport");
s32 cellVideoExportProgress()
{

2
rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp
View File

@ -3,7 +3,7 @@
#include "cellVideoUpload.h"
logs::channel cellVideoUpload("cellVideoUpload", logs::level::notice);
logs::channel cellVideoUpload("cellVideoUpload");
s32 cellVideoUploadInitialize(vm::cptr<CellVideoUploadParam> pParam, vm::ptr<CellVideoUploadCallback> cb, vm::ptr<void> userdata)
{

2
rpcs3/Emu/Cell/Modules/cellVoice.cpp
View File

@ -4,7 +4,7 @@
#include "cellVoice.h"
logs::channel cellVoice("cellVoice", logs::level::notice);
logs::channel cellVoice("cellVoice");
s32 cellVoiceConnectIPortToOPort()

2
rpcs3/Emu/Cell/Modules/cellVpost.cpp
View File

@ -10,7 +10,7 @@ extern "C"
#include "cellVpost.h"
logs::channel cellVpost("cellVpost", logs::level::notice);
logs::channel cellVpost("cellVpost");
s32 cellVpostQueryAttr(vm::cptr<CellVpostCfgParam> cfgParam, vm::ptr<CellVpostAttr> attr)
{

2
rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel cell_FreeType2("cell_FreeType2", logs::level::notice);
logs::channel cell_FreeType2("cell_FreeType2");
// Functions
s32 cellFreeType2Ex()

2
rpcs3/Emu/Cell/Modules/libmedi.cpp
View File

@ -2,7 +2,7 @@
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
logs::channel libmedi("libmedi", logs::level::notice);
logs::channel libmedi("libmedi");
s32 cellMediatorCloseContext()
{

2
rpcs3/Emu/Cell/Modules/libmixer.cpp
View File

@ -11,7 +11,7 @@
#include <thread>
#include <mutex>
logs::channel libmixer("libmixer", logs::level::notice);
logs::channel libmixer("libmixer");
struct SurMixerConfig
{

2
rpcs3/Emu/Cell/Modules/libsnd3.cpp
View File

@ -3,7 +3,7 @@
#include "libsnd3.h"
logs::channel libsnd3("libsnd3", logs::level::notice);
logs::channel libsnd3("libsnd3");
s32 cellSnd3Init(u32 maxVoice, u32 samples, vm::ptr<CellSnd3RequestQueueCtx> queue)
{

2
rpcs3/Emu/Cell/Modules/libsynth2.cpp
View File

@ -5,7 +5,7 @@
namespace vm { using namespace ps3; }
logs::channel libsynth2("libsynth2", logs::level::notice);
logs::channel libsynth2("libsynth2");
s32 cellSoundSynth2Config(s16 param, s32 value)
{

2
rpcs3/Emu/Cell/Modules/sceNp.cpp
View File

@ -9,7 +9,7 @@
#include "cellRtc.h"
#include "sceNp.h"
logs::channel sceNp("sceNp", logs::level::notice);
logs::channel sceNp("sceNp");
s32 g_psn_connection_status = SCE_NP_MANAGER_STATUS_OFFLINE;

2
rpcs3/Emu/Cell/Modules/sceNp2.cpp
View File

@ -4,7 +4,7 @@
#include "sceNp.h"
#include "sceNp2.h"
logs::channel sceNp2("sceNp2", logs::level::notice);
logs::channel sceNp2("sceNp2");
s32 sceNp2Init(u32 poolsize, vm::ptr<void> poolptr)
{

2
rpcs3/Emu/Cell/Modules/sceNpClans.cpp
View File

@ -5,7 +5,7 @@
#include "sceNp.h"
#include "sceNpClans.h"
logs::channel sceNpClans("sceNpClans", logs::level::notice);
logs::channel sceNpClans("sceNpClans");
s32 sceNpClansInit(vm::ptr<SceNpCommunicationId> commId, vm::ptr<SceNpCommunicationPassphrase> passphrase, vm::ptr<void> pool, vm::ptr<u32> poolSize, u32 flags)
{

2
rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp
View File

@ -3,7 +3,7 @@
#include "sceNpCommerce2.h"
logs::channel sceNpCommerce2("sceNpCommerce2", logs::level::notice);
logs::channel sceNpCommerce2("sceNpCommerce2");
s32 sceNpCommerce2ExecuteStoreBrowse()
{

2
rpcs3/Emu/Cell/Modules/sceNpSns.cpp
View File

@ -4,7 +4,7 @@
#include "sceNpSns.h"
logs::channel sceNpSns("sceNpSns", logs::level::notice);
logs::channel sceNpSns("sceNpSns");
template<>
void fmt_class_string<sceNpSnsError>::format(std::string& out, u64 arg)

2
rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
View File

@ -14,7 +14,7 @@
#include "Utilities/StrUtil.h"
logs::channel sceNpTrophy("sceNpTrophy", logs::level::notice);
logs::channel sceNpTrophy("sceNpTrophy");
struct trophy_context_t
{

2
rpcs3/Emu/Cell/Modules/sceNpTus.cpp
View File

@ -4,7 +4,7 @@
#include "sceNp.h"
#include "sceNpTus.h"
logs::channel sceNpTus("sceNpTus", logs::level::notice);
logs::channel sceNpTus("sceNpTus");
s32 sceNpTusInit()
{

2
rpcs3/Emu/Cell/Modules/sceNpUtil.cpp
View File

@ -4,7 +4,7 @@
#include "sceNp.h"
#include "sceNpUtil.h"
logs::channel sceNpUtil("sceNpUtil", logs::level::notice);
logs::channel sceNpUtil("sceNpUtil");
s32 sceNpUtilBandwidthTestInitStart(u32 prio, size_t stack)
{

2
rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
View File

@ -6,7 +6,7 @@
#include "Emu/Cell/lv2/sys_process.h"
#include "sysPrxForUser.h"
logs::channel sysPrxForUser("sysPrxForUser", logs::level::notice);
logs::channel sysPrxForUser("sysPrxForUser");
extern u64 get_system_time();

2
rpcs3/Emu/Cell/Modules/sys_io.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
logs::channel sys_io("sys_io", logs::level::notice);
logs::channel sys_io("sys_io");
extern void cellPad_init();
extern void cellKb_init();

2
rpcs3/Emu/Cell/Modules/sys_libc.cpp
View File

@ -5,7 +5,7 @@
namespace vm { using namespace ps3; }
logs::channel sys_libc("sys_libc", logs::level::notice);
logs::channel sys_libc("sys_libc");
void sys_libc_memcpy(vm::ptr<void> dst, vm::cptr<void> src, u32 size)
{

2
rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp
View File

@ -5,7 +5,7 @@
#include "sys_lv2dbg.h"
logs::channel sys_lv2dbg("sys_lv2dbg", logs::level::notice);
logs::channel sys_lv2dbg("sys_lv2dbg");
s32 sys_dbg_read_ppu_thread_context(u64 id, vm::ptr<sys_dbg_ppu_thread_context_t> ppu_context)
{

Some files were not shown because too many files have changed in this diff Show More