Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
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