Update config.cpp
This commit is contained in:
1 parent
28265faedc
commit
e16735d16d
1 file changed
+79
-49
@@ -66,18 +66,19 @@ namespace config {
|
|||||||
std::uint32_t gOverrideFreqs[HocClkModule_EnumMax];
|
std::uint32_t gOverrideFreqs[HocClkModule_EnumMax];
|
||||||
std::map<std::tuple<std::uint64_t, HocClkProfile, HocClkModule>, std::uint32_t> gProfileMHzMap;
|
std::map<std::tuple<std::uint64_t, HocClkProfile, HocClkModule>, std::uint32_t> gProfileMHzMap;
|
||||||
std::map<std::uint64_t, std::uint8_t> gProfileCountMap;
|
std::map<std::uint64_t, std::uint8_t> gProfileCountMap;
|
||||||
std::set<std::uint64_t> gLoadedTids;
|
|
||||||
std::map<std::uint64_t, time_t> gProfileMtimes;
|
std::map<std::uint64_t, time_t> gProfileMtimes;
|
||||||
|
|
||||||
|
bool gGlobalLoaded = false;
|
||||||
std::uint64_t gCurrentGameTid = 0;
|
std::uint64_t gCurrentGameTid = 0;
|
||||||
bool gProfilesDirty = false;
|
bool gProfilesDirty = false;
|
||||||
bool gMigrationHappened = false;
|
bool gMigrationHappened = false;
|
||||||
LockableMutex gConfigMutex;
|
LockableMutex gConfigMutex;
|
||||||
LockableMutex gOverrideMutex;
|
LockableMutex gOverrideMutex;
|
||||||
|
|
||||||
time_t CheckFileMtime(const std::string &path) {
|
time_t CheckFileMtime(const char *path) {
|
||||||
time_t mtime = 0;
|
time_t mtime = 0;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(path.c_str(), &st) == 0) {
|
if (stat(path, &st) == 0) {
|
||||||
mtime = st.st_mtime;
|
mtime = st.st_mtime;
|
||||||
}
|
}
|
||||||
return mtime;
|
return mtime;
|
||||||
@@ -205,8 +206,8 @@ namespace config {
|
|||||||
gLoaded = false;
|
gLoaded = false;
|
||||||
gProfileMHzMap.clear();
|
gProfileMHzMap.clear();
|
||||||
gProfileCountMap.clear();
|
gProfileCountMap.clear();
|
||||||
gLoadedTids.clear();
|
|
||||||
gProfileMtimes.clear();
|
gProfileMtimes.clear();
|
||||||
|
gGlobalLoaded = false;
|
||||||
gCurrentGameTid = 0;
|
gCurrentGameTid = 0;
|
||||||
gProfilesDirty = false;
|
gProfilesDirty = false;
|
||||||
for (unsigned int i = 0; i < HocClkConfigValue_EnumMax; i++) {
|
for (unsigned int i = 0; i < HocClkConfigValue_EnumMax; i++) {
|
||||||
@@ -216,7 +217,7 @@ namespace config {
|
|||||||
|
|
||||||
void LoadSettings() {
|
void LoadSettings() {
|
||||||
fileUtils::LogLine("[cfg] Reading %s", gSettingsPath.c_str());
|
fileUtils::LogLine("[cfg] Reading %s", gSettingsPath.c_str());
|
||||||
gSettingsMtime = CheckFileMtime(gSettingsPath);
|
gSettingsMtime = CheckFileMtime(gSettingsPath.c_str());
|
||||||
if (!gSettingsMtime) {
|
if (!gSettingsMtime) {
|
||||||
fileUtils::LogLine("[cfg] Settings file not found, using defaults");
|
fileUtils::LogLine("[cfg] Settings file not found, using defaults");
|
||||||
return;
|
return;
|
||||||
@@ -228,7 +229,7 @@ namespace config {
|
|||||||
|
|
||||||
void LoadKip() {
|
void LoadKip() {
|
||||||
fileUtils::LogLine("[cfg] Reading %s", gKipPath.c_str());
|
fileUtils::LogLine("[cfg] Reading %s", gKipPath.c_str());
|
||||||
gKipMtime = CheckFileMtime(gKipPath);
|
gKipMtime = CheckFileMtime(gKipPath.c_str());
|
||||||
if (!gKipMtime) {
|
if (!gKipMtime) {
|
||||||
fileUtils::LogLine("[cfg] KIP config file not found, using defaults");
|
fileUtils::LogLine("[cfg] KIP config file not found, using defaults");
|
||||||
return;
|
return;
|
||||||
@@ -238,17 +239,25 @@ namespace config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string ProfilePathForTid(std::uint64_t tid) {
|
// "<profiles-dir>/<16-hex-tid>.ini" + NUL
|
||||||
char filename[32];
|
constexpr size_t PROFILE_PATH_MAX = 64;
|
||||||
snprintf(filename, sizeof(filename), "%016lX.ini", tid);
|
|
||||||
return gProfilesDir + "/" + filename;
|
void ProfilePathForTid(std::uint64_t tid, char *outPath, size_t outSize) {
|
||||||
|
snprintf(outPath, outSize, "%s/%016lX.ini", gProfilesDir.c_str(), tid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void EvictProfile(std::uint64_t tid) {
|
bool IsProfileLoaded(std::uint64_t tid) {
|
||||||
if (tid == HOCCLK_GLOBAL_PROFILE_TID) {
|
if (tid == HOCCLK_GLOBAL_PROFILE_TID) {
|
||||||
|
return gGlobalLoaded;
|
||||||
|
}
|
||||||
|
return tid != 0 && tid == gCurrentGameTid;
|
||||||
|
}
|
||||||
|
|
||||||
|
void EvictCurrentGame() {
|
||||||
|
if (gCurrentGameTid == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const std::uint64_t tid = gCurrentGameTid;
|
||||||
for (unsigned int profile = 0; profile < HocClkProfile_EnumMax; profile++) {
|
for (unsigned int profile = 0; profile < HocClkProfile_EnumMax; profile++) {
|
||||||
for (unsigned int module = 0; module < HocClkModule_EnumMax; module++) {
|
for (unsigned int module = 0; module < HocClkModule_EnumMax; module++) {
|
||||||
gProfileMHzMap.erase(std::make_tuple(tid, (HocClkProfile)profile, (HocClkModule)module));
|
gProfileMHzMap.erase(std::make_tuple(tid, (HocClkProfile)profile, (HocClkModule)module));
|
||||||
@@ -256,7 +265,18 @@ namespace config {
|
|||||||
}
|
}
|
||||||
gProfileCountMap.erase(tid);
|
gProfileCountMap.erase(tid);
|
||||||
gProfileMtimes.erase(tid);
|
gProfileMtimes.erase(tid);
|
||||||
gLoadedTids.erase(tid);
|
gCurrentGameTid = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DropGlobalProfile() {
|
||||||
|
for (unsigned int profile = 0; profile < HocClkProfile_EnumMax; profile++) {
|
||||||
|
for (unsigned int module = 0; module < HocClkModule_EnumMax; module++) {
|
||||||
|
gProfileMHzMap.erase(std::make_tuple(HOCCLK_GLOBAL_PROFILE_TID, (HocClkProfile)profile, (HocClkModule)module));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gProfileCountMap.erase(HOCCLK_GLOBAL_PROFILE_TID);
|
||||||
|
gProfileMtimes.erase(HOCCLK_GLOBAL_PROFILE_TID);
|
||||||
|
gGlobalLoaded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void LoadProfileTid(std::uint64_t tid) {
|
void LoadProfileTid(std::uint64_t tid) {
|
||||||
@@ -264,26 +284,29 @@ namespace config {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gLoadedTids.count(tid)) {
|
const bool isGlobal = (tid == HOCCLK_GLOBAL_PROFILE_TID);
|
||||||
|
if (IsProfileLoaded(tid)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tid != HOCCLK_GLOBAL_PROFILE_TID && gCurrentGameTid != 0) {
|
if (!isGlobal) {
|
||||||
EvictProfile(gCurrentGameTid);
|
EvictCurrentGame();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string path = ProfilePathForTid(tid);
|
char path[PROFILE_PATH_MAX];
|
||||||
|
ProfilePathForTid(tid, path, sizeof(path));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(path.c_str(), &st) == 0) {
|
if (stat(path, &st) == 0) {
|
||||||
fileUtils::LogLine("[cfg] Loading profile %s", path.c_str());
|
fileUtils::LogLine("[cfg] Loading profile %s", path);
|
||||||
ini_browse(&BrowseProfileIni, (void *)(uintptr_t)tid, path.c_str());
|
ini_browse(&BrowseProfileIni, (void *)(uintptr_t)tid, path);
|
||||||
gProfileMtimes[tid] = st.st_mtime;
|
gProfileMtimes[tid] = st.st_mtime;
|
||||||
} else {
|
} else {
|
||||||
gProfileMtimes.erase(tid);
|
gProfileMtimes.erase(tid);
|
||||||
}
|
}
|
||||||
gLoadedTids.insert(tid);
|
if (isGlobal) {
|
||||||
if (tid != HOCCLK_GLOBAL_PROFILE_TID) {
|
gGlobalLoaded = true;
|
||||||
|
} else {
|
||||||
gCurrentGameTid = tid;
|
gCurrentGameTid = tid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -498,8 +521,8 @@ namespace config {
|
|||||||
gMigrationHappened = false;
|
gMigrationHappened = false;
|
||||||
gProfileMHzMap.clear();
|
gProfileMHzMap.clear();
|
||||||
gProfileCountMap.clear();
|
gProfileCountMap.clear();
|
||||||
gLoadedTids.clear();
|
|
||||||
gProfileMtimes.clear();
|
gProfileMtimes.clear();
|
||||||
|
gGlobalLoaded = false;
|
||||||
gCurrentGameTid = 0;
|
gCurrentGameTid = 0;
|
||||||
gProfilesDirty = false;
|
gProfilesDirty = false;
|
||||||
gSettingsMtime = 0;
|
gSettingsMtime = 0;
|
||||||
@@ -529,8 +552,8 @@ namespace config {
|
|||||||
|
|
||||||
bool Refresh() {
|
bool Refresh() {
|
||||||
std::scoped_lock lock{ gConfigMutex };
|
std::scoped_lock lock{ gConfigMutex };
|
||||||
time_t settingsMtime = CheckFileMtime(gSettingsPath);
|
time_t settingsMtime = CheckFileMtime(gSettingsPath.c_str());
|
||||||
time_t kipMtime = CheckFileMtime(gKipPath);
|
time_t kipMtime = CheckFileMtime(gKipPath.c_str());
|
||||||
if (!gLoaded || gSettingsMtime != settingsMtime || gKipMtime != kipMtime) {
|
if (!gLoaded || gSettingsMtime != settingsMtime || gKipMtime != kipMtime) {
|
||||||
Load();
|
Load();
|
||||||
return true;
|
return true;
|
||||||
@@ -540,27 +563,29 @@ namespace config {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::uint64_t> staleTids;
|
bool profilesChanged = false;
|
||||||
for (std::uint64_t tid : gLoadedTids) {
|
char profilePath[PROFILE_PATH_MAX];
|
||||||
time_t mtime = CheckFileMtime(ProfilePathForTid(tid));
|
if (gGlobalLoaded) {
|
||||||
auto it = gProfileMtimes.find(tid);
|
ProfilePathForTid(HOCCLK_GLOBAL_PROFILE_TID, profilePath, sizeof(profilePath));
|
||||||
|
auto it = gProfileMtimes.find(HOCCLK_GLOBAL_PROFILE_TID);
|
||||||
time_t known = (it != gProfileMtimes.end()) ? it->second : 0;
|
time_t known = (it != gProfileMtimes.end()) ? it->second : 0;
|
||||||
if (mtime != known) {
|
if (CheckFileMtime(profilePath) != known) {
|
||||||
staleTids.push_back(tid);
|
fileUtils::LogLine("[cfg] Global profile changed on disk, dropping cache");
|
||||||
|
DropGlobalProfile();
|
||||||
|
profilesChanged = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (std::uint64_t tid : staleTids) {
|
if (gCurrentGameTid != 0) {
|
||||||
fileUtils::LogLine("[cfg] Profile %016lX changed on disk, dropping cache", tid);
|
ProfilePathForTid(gCurrentGameTid, profilePath, sizeof(profilePath));
|
||||||
for (unsigned int profile = 0; profile < HocClkProfile_EnumMax; profile++) {
|
auto it = gProfileMtimes.find(gCurrentGameTid);
|
||||||
for (unsigned int module = 0; module < HocClkModule_EnumMax; module++) {
|
time_t known = (it != gProfileMtimes.end()) ? it->second : 0;
|
||||||
gProfileMHzMap.erase(std::make_tuple(tid, (HocClkProfile)profile, (HocClkModule)module));
|
if (CheckFileMtime(profilePath) != known) {
|
||||||
}
|
fileUtils::LogLine("[cfg] Profile %016lX changed on disk, dropping cache", gCurrentGameTid);
|
||||||
|
EvictCurrentGame();
|
||||||
|
profilesChanged = true;
|
||||||
}
|
}
|
||||||
gProfileCountMap.erase(tid);
|
|
||||||
gProfileMtimes.erase(tid);
|
|
||||||
gLoadedTids.erase(tid);
|
|
||||||
}
|
}
|
||||||
return !staleTids.empty();
|
return profilesChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HasProfilesLoaded() {
|
bool HasProfilesLoaded() {
|
||||||
@@ -570,7 +595,7 @@ namespace config {
|
|||||||
|
|
||||||
std::uint32_t GetAutoClockHz(std::uint64_t tid, HocClkModule module, HocClkProfile profile, bool returnRaw) {
|
std::uint32_t GetAutoClockHz(std::uint64_t tid, HocClkModule module, HocClkProfile profile, bool returnRaw) {
|
||||||
std::scoped_lock lock{ gConfigMutex };
|
std::scoped_lock lock{ gConfigMutex };
|
||||||
if (gLoaded && !gLoadedTids.count(tid)) {
|
if (gLoaded && !IsProfileLoaded(tid)) {
|
||||||
LoadProfileTid(tid);
|
LoadProfileTid(tid);
|
||||||
}
|
}
|
||||||
switch (profile) {
|
switch (profile) {
|
||||||
@@ -608,7 +633,8 @@ namespace config {
|
|||||||
|
|
||||||
mkdir(FILE_PROFILES_DIR, 0777);
|
mkdir(FILE_PROFILES_DIR, 0777);
|
||||||
|
|
||||||
std::string profilePath = ProfilePathForTid(tid);
|
char profilePath[PROFILE_PATH_MAX];
|
||||||
|
ProfilePathForTid(tid, profilePath, sizeof(profilePath));
|
||||||
|
|
||||||
uint8_t numProfiles = 0;
|
uint8_t numProfiles = 0;
|
||||||
|
|
||||||
@@ -649,11 +675,11 @@ namespace config {
|
|||||||
|
|
||||||
if (keys.empty()) {
|
if (keys.empty()) {
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(profilePath.c_str(), &st) == 0 && remove(profilePath.c_str()) != 0) {
|
if (stat(profilePath, &st) == 0 && remove(profilePath) != 0) {
|
||||||
fileUtils::LogLine("[cfg] Failed to remove empty profile %s", profilePath.c_str());
|
fileUtils::LogLine("[cfg] Failed to remove empty profile %s", profilePath);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!ini_putsection(CONFIG_VAL_SECTION, keyPointers.data(), valuePointers.data(), profilePath.c_str())) {
|
} else if (!ini_putsection(CONFIG_VAL_SECTION, keyPointers.data(), valuePointers.data(), profilePath)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -672,8 +698,12 @@ namespace config {
|
|||||||
mhz++;
|
mhz++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gLoadedTids.insert(tid);
|
if (tid == HOCCLK_GLOBAL_PROFILE_TID) {
|
||||||
if (tid != HOCCLK_GLOBAL_PROFILE_TID) {
|
gGlobalLoaded = true;
|
||||||
|
} else {
|
||||||
|
if (tid != gCurrentGameTid) {
|
||||||
|
EvictCurrentGame();
|
||||||
|
}
|
||||||
gCurrentGameTid = tid;
|
gCurrentGameTid = tid;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -685,7 +715,7 @@ namespace config {
|
|||||||
|
|
||||||
std::uint8_t GetProfileCount(std::uint64_t tid) {
|
std::uint8_t GetProfileCount(std::uint64_t tid) {
|
||||||
std::scoped_lock lock{ gConfigMutex };
|
std::scoped_lock lock{ gConfigMutex };
|
||||||
if (tid != 0 && gLoaded && !gLoadedTids.count(tid)) {
|
if (tid != 0 && gLoaded && !IsProfileLoaded(tid)) {
|
||||||
LoadProfileTid(tid);
|
LoadProfileTid(tid);
|
||||||
}
|
}
|
||||||
auto it = gProfileCountMap.find(tid);
|
auto it = gProfileCountMap.find(tid);
|
||||||
|
|||||||
Reference in new issue
Block a user