FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-01-11 00:26:15 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Implements a couple quality of life configuration option handling

Browse Source 
This takes the changes from #829 and moves it to the correct location to be picked up from any loader.
This also fixes #873.
Expands the config paths. Anything that has ~ or is relative will be converted to an absolute path.
This commit is contained in:
Ryan Houdek 2021-03-21 00:01:12 -07:00
parent f68593ea97
commit 91a5a625ac
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
External/FEXCore/Source/Interface/Config/Config.cpp vendored
View File

@ -4,7 +4,9 @@
#include "Interface/Context/Context.h"
#include <FEXCore/Config/Config.h>
#include <filesystem>
#include <map>
#include <sys/sysinfo.h>
namespace FEXCore::Config {
void SetConfig(FEXCore::Context::Context *CTX, ConfigOption Option, uint64_t Config) {
@ -87,8 +89,63 @@ namespace FEXCore::Config {
}
}
std::string ExpandPath(std::string PathName) {
std::filesystem::path Path{PathName};
// Expand home if it exists
if (Path.is_relative()) {
std::string Home = getenv("HOME") ?: "";
auto it = PathName.find("~");
if (it != std::string::npos) {
PathName.replace(it, 1, Home);
return PathName;
}
// Expand relative path to absolute
return std::filesystem::absolute(Path);
}
return {};
}
void ReloadMetaLayer() {
Meta->Load();
// Do configuration option fix ups after everything is reloaded
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_EMULATED_CPU_CORES)) {
FEX_CONFIG_OPT(Cores, EMULATED_CPU_CORES);
if (Cores == 0) {
// When the number of emulated CPU cores is zero then auto detect
FEXCore::Config::EraseSet(FEXCore::Config::CONFIG_EMULATED_CPU_CORES, std::to_string(get_nprocs_conf()));
}
}
auto ExpandPathIfExists = [](FEXCore::Config::ConfigOption Config, std::string PathName) {
auto NewPath = ExpandPath(PathName);
if (!NewPath.empty()) {
FEXCore::Config::EraseSet(Config, NewPath);
}
};
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_ROOTFSPATH)) {
FEX_CONFIG_OPT(PathName, ROOTFSPATH);
ExpandPathIfExists(FEXCore::Config::CONFIG_ROOTFSPATH, PathName());
}
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_THUNKHOSTLIBSPATH)) {
FEX_CONFIG_OPT(PathName, THUNKHOSTLIBSPATH);
ExpandPathIfExists(FEXCore::Config::CONFIG_THUNKHOSTLIBSPATH, PathName());
}
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_THUNKGUESTLIBSPATH)) {
FEX_CONFIG_OPT(PathName, THUNKGUESTLIBSPATH);
ExpandPathIfExists(FEXCore::Config::CONFIG_THUNKGUESTLIBSPATH, PathName());
}
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_THUNKCONFIGPATH)) {
FEX_CONFIG_OPT(PathName, THUNKCONFIGPATH);
ExpandPathIfExists(FEXCore::Config::CONFIG_THUNKCONFIGPATH, PathName());
}
if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_OUTPUTLOG)) {
FEX_CONFIG_OPT(PathName, OUTPUTLOG);
ExpandPathIfExists(FEXCore::Config::CONFIG_OUTPUTLOG, PathName());
}
}
void AddLayer(std::unique_ptr<FEXCore::Config::Layer> _Layer) {

2
Source/Common/ArgumentLoader.cpp
View File

@ -66,7 +66,7 @@ namespace FEX::ArgLoader {
CPUGroup.add_option("-T", "--Threads")
.dest("Threads")
.help("Number of physical hardware threads to tell the process we have")
.help("Number of physical hardware threads to tell the process we have. 0 will auto detect.")
.set_default(1);
CPUGroup.add_option("--smc-checks")