mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-20 08:19:56 -04:00
Keep the state file's line ahead of RivaTuner Statistics Server's profile, and keep what a run owes the profile after a put back that did not land.
The review found three ways rtss-profile.txt could fall behind the profile. Every write after a run's first one saved the profile before the line, so a kill between the two left a line whose value the profile no longer held, and the next start took the game's limit for the player's (rtss_restore_plan LEAVE). A put back whose write did not land kept the line, but rtss_put_back_done cleared S.changed, so a later limit took the run's first-write path again and read the game's own limit from the profile as the value to put back, overwriting the true one in the line. And put_back removed the line after DeleteProfile without checking that the profile went away. The line now carries the value the run wrote before the newest one (rtss_decide.h RtssSaved prev_limit and prev_den, rtss1 with two more fields; the file came with this branch and was never released). rtss_limit.c apply writes the new value into the line before the profile (record_before) and drops the previous one once the profile holds the new one, or returns to it when RTSS refused it (record_after), and rtss_restore_plan takes a profile holding either value for the game's. A new owed flag keeps had_profile, old_limit and old_denominator from the run's first write until a put back lands: a later first write keeps them and the line's values, a failed first write leaves the line alone, and rtss_limit_restore tries the put back again at the exit. put_back and restore_left check that a deleted profile is gone before they remove the line, and restore_left's lines name the value the profile held. tests/rtss_limit_check.c covers the new fields and the plan for either value; tests/rtss_worker_check.c checks the line before and after a write (state_record), a run killed inside the save of its second limit and the next start removing the profile (kill_restart_mid_write), a put back that did not land followed by a limit and the exit (put_back_owed), and a removal that did not land (put_back_undeleted). Lines over 120 columns from the earlier fixes are wrapped. Not reproduced before the change. Checks that passed: tests/rtss_limit_check.py (44 of 44), tests/exit_order_check.py, tests/fatal_exit_check.py, pass_cc_check.py --wall on rtss_limit.c, tools/check_content.py --staged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -353,7 +353,8 @@ static void unproven(void) {
|
||||
{0, 1, "no API seen", "RivaTuner Statistics Server lists the game but has not seen its Vulkan presents yet"},
|
||||
{0x7, 1, "another API's presents",
|
||||
"RivaTuner Statistics Server lists the game but has not seen its Vulkan presents yet"},
|
||||
{RTSS_API_VULKAN, 0, "no period measured", "RivaTuner Statistics Server has measured no frames of the game lately"},
|
||||
{RTSS_API_VULKAN, 0, "no period measured",
|
||||
"RivaTuner Statistics Server has measured no frames of the game lately"},
|
||||
};
|
||||
Run r;
|
||||
RtssOut o;
|
||||
@@ -598,26 +599,30 @@ static void pace_period(void) {
|
||||
// The state file (rtss-profile.txt): its lines, the file's text as the worker rewrites it, and what a start does with a
|
||||
// line that a run which did not close left behind.
|
||||
static void saved(void) {
|
||||
RtssSaved a = {0, 0, 1, 60, 1, "ocarina.exe"}, r;
|
||||
RtssSaved a = {0, 0, 1, 60, 1, 60, 1, "ocarina.exe"}, r;
|
||||
char line[400], out[2048];
|
||||
size_t n = rtss_saved_format(line, sizeof line, &a);
|
||||
CHECK(n == strlen(line) && !strcmp(line, "rtss1 0 0 1 60 1 ocarina.exe\n"), "the line: %s", line);
|
||||
CHECK(n == strlen(line) && !strcmp(line, "rtss1 0 0 1 60 1 60 1 ocarina.exe\n"), "the line: %s", line);
|
||||
CHECK(rtss_saved_parse(line, n - 1, &r) && !r.existed && !r.old_limit && r.old_den == 1 && r.limit == 60 &&
|
||||
r.den == 1 && !strcmp(r.name, "ocarina.exe"),
|
||||
r.den == 1 && r.prev_limit == 60 && r.prev_den == 1 && !strcmp(r.name, "ocarina.exe"),
|
||||
"read back");
|
||||
const char *spaced = "rtss1 1 59940 1000 144 1 My Game.exe\r";
|
||||
const char *spaced = "rtss1 1 59940 1000 144 1 60 1 My Game.exe\r";
|
||||
CHECK(rtss_saved_parse(spaced, strlen(spaced), &r) && r.existed && r.old_limit == 59940 && r.old_den == 1000 &&
|
||||
!strcmp(r.name, "My Game.exe"),
|
||||
r.limit == 144 && r.prev_limit == 60 && !strcmp(r.name, "My Game.exe"),
|
||||
"a name with a space, a line ending in CR");
|
||||
static const char *bad[] = {"rtss1 2 0 1 60 1 x.exe", "rtss1 0 0 0 60 1 x.exe", "rtss1 0 0 1 60 0 x.exe",
|
||||
"rtss1 0 0 1 60 1", "rtss1 0 0 1 60 1 ", "rtss2 0 0 1 60 1 x.exe", "rtss1 0 0 1 x 1 x.exe",
|
||||
"", "# rtss1 0 0 1 60 1 x.exe"};
|
||||
static const char *bad[] = {"rtss1 2 0 1 60 1 60 1 x.exe", "rtss1 0 0 0 60 1 60 1 x.exe",
|
||||
"rtss1 0 0 1 60 0 60 1 x.exe", "rtss1 0 0 1 60 1 60 0 x.exe",
|
||||
"rtss1 0 0 1 60 1 60 1", "rtss1 0 0 1 60 1 60 1 ",
|
||||
"rtss2 0 0 1 60 1 60 1 x.exe", "rtss1 0 0 1 x 1 60 1 x.exe",
|
||||
"rtss1 0 0 1 60 1 x.exe", "",
|
||||
"# rtss1 0 0 1 60 1 60 1 x.exe"};
|
||||
for (unsigned i = 0; i < sizeof bad / sizeof *bad; i++)
|
||||
CHECK(!rtss_saved_parse(bad[i], strlen(bad[i]), &r), "not a line: '%s'", bad[i]);
|
||||
CHECK(!rtss_saved_format(line, 20, &a), "a line that does not fit");
|
||||
|
||||
// found past a comment, a malformed line and another profile's line, whatever the case of its letters
|
||||
const char *text = RTSS_SAVED_HEADER "rtss1 9 garbage\nrtss1 1 30 1 144 1 My Game.exe\nrtss1 0 0 1 60 1 OCARINA.EXE";
|
||||
const char *text = RTSS_SAVED_HEADER
|
||||
"rtss1 9 garbage\nrtss1 1 30 1 144 1 144 1 My Game.exe\nrtss1 0 0 1 60 1 60 1 OCARINA.EXE";
|
||||
CHECK(rtss_saved_find(text, "ocarina.exe", &r) && r.limit == 60 && !r.existed, "ours, the last line, no newline");
|
||||
CHECK(rtss_saved_find(text, "my game.exe", &r) && r.limit == 144 && r.old_limit == 30, "the other one");
|
||||
CHECK(!rtss_saved_find(text, "ocarina_dev.exe", &r) && !rtss_saved_find("", "ocarina.exe", &r), "none");
|
||||
@@ -628,20 +633,23 @@ static void saved(void) {
|
||||
a2.limit = 144;
|
||||
n = rtss_saved_update(text, "ocarina.exe", &a2, out, sizeof out, &records);
|
||||
CHECK(n == strlen(out) && records == 2 &&
|
||||
!strcmp(out, RTSS_SAVED_HEADER "rtss1 1 30 1 144 1 My Game.exe\nrtss1 0 0 1 144 1 ocarina.exe\n"),
|
||||
!strcmp(out, RTSS_SAVED_HEADER
|
||||
"rtss1 1 30 1 144 1 144 1 My Game.exe\nrtss1 0 0 1 144 1 60 1 ocarina.exe\n"),
|
||||
"replaced:\n%s", out);
|
||||
char again[2048];
|
||||
n = rtss_saved_update(out, "OCARINA.exe", NULL, again, sizeof again, &records);
|
||||
CHECK(records == 1 && !strcmp(again, RTSS_SAVED_HEADER "rtss1 1 30 1 144 1 My Game.exe\n"), "removed:\n%s", again);
|
||||
CHECK(records == 1 && !strcmp(again, RTSS_SAVED_HEADER "rtss1 1 30 1 144 1 144 1 My Game.exe\n"), "removed:\n%s",
|
||||
again);
|
||||
n = rtss_saved_update(again, "My Game.exe", NULL, out, sizeof out, &records);
|
||||
CHECK(n && !records, "the last line removed: no record left, the file goes");
|
||||
n = rtss_saved_update("", "ocarina.exe", &a, out, sizeof out, &records);
|
||||
CHECK(records == 1 && !strcmp(out, RTSS_SAVED_HEADER "rtss1 0 0 1 60 1 ocarina.exe\n"), "a new file:\n%s", out);
|
||||
CHECK(records == 1 && !strcmp(out, RTSS_SAVED_HEADER "rtss1 0 0 1 60 1 60 1 ocarina.exe\n"), "a new file:\n%s",
|
||||
out);
|
||||
CHECK(!rtss_saved_update(text, "ocarina.exe", &a, out, sizeof RTSS_SAVED_HEADER + 10, &records),
|
||||
"a text that does not fit");
|
||||
|
||||
// What a start does. Run A made the profile and wrote 60/1, and was killed: B finds 60/1 and removes the profile.
|
||||
RtssSaved made = {0, 0, 1, 60, 1, "ocarina.exe"}, had = {1, 30, 1, 60, 1, "ocarina.exe"};
|
||||
RtssSaved made = {0, 0, 1, 60, 1, 60, 1, "ocarina.exe"}, had = {1, 30, 1, 60, 1, 60, 1, "ocarina.exe"};
|
||||
CHECK(rtss_restore_plan(&made, 1, 60, 1) == RTSS_PLAN_DELETE, "the run's own profile: removed");
|
||||
CHECK(rtss_restore_plan(&made, 1, 75, 1) == RTSS_PLAN_LEAVE, "the player set 75 since: theirs");
|
||||
CHECK(rtss_restore_plan(&made, 0, 0, 1) == RTSS_PLAN_NONE, "the player removed it, or the run was killed before "
|
||||
@@ -650,10 +658,22 @@ static void saved(void) {
|
||||
CHECK(rtss_restore_plan(&had, 1, 30, 1) == RTSS_PLAN_LEAVE, "killed before the write landed: the player's 30/1");
|
||||
CHECK(rtss_restore_plan(&had, 0, 0, 1) == RTSS_PLAN_LEAVE, "the player removed their profile since: left so");
|
||||
CHECK(rtss_restore_plan(&had, 1, 60, 0) == RTSS_PLAN_WRITE, "an RTSS without the denominator reads none: 1");
|
||||
RtssSaved frac = {1, 0, 1, 59940, 1000, "ocarina.exe"};
|
||||
RtssSaved frac = {1, 0, 1, 59940, 1000, 59940, 1000, "ocarina.exe"};
|
||||
CHECK(rtss_restore_plan(&frac, 1, 59940, 1) == RTSS_PLAN_LEAVE && rtss_restore_plan(&frac, 1, 59940, 1000) ==
|
||||
RTSS_PLAN_WRITE,
|
||||
"the denominator is compared too");
|
||||
// A run that wrote 60/1 and then 144/1 ended between the line and the profile's change, or after it: the profile
|
||||
// holds 60/1 or 144/1, both the game's; anything else is the player's.
|
||||
RtssSaved moving = {1, 30, 1, 144, 1, 60, 1, "ocarina.exe"}, moving_made = {0, 0, 1, 144, 1, 60, 1, "ocarina.exe"};
|
||||
CHECK(rtss_restore_plan(&moving, 1, 60, 1) == RTSS_PLAN_WRITE && rtss_restore_plan(&moving, 1, 144, 1) ==
|
||||
RTSS_PLAN_WRITE,
|
||||
"either value of the game's: 30/1 back");
|
||||
CHECK(rtss_restore_plan(&moving_made, 1, 60, 1) == RTSS_PLAN_DELETE &&
|
||||
rtss_restore_plan(&moving_made, 1, 144, 1) == RTSS_PLAN_DELETE,
|
||||
"either value of the game's, in a profile the run made: removed");
|
||||
CHECK(rtss_restore_plan(&moving, 1, 75, 1) == RTSS_PLAN_LEAVE && rtss_restore_plan(&moving, 1, 60, 1000) ==
|
||||
RTSS_PLAN_LEAVE,
|
||||
"another value: the player's");
|
||||
}
|
||||
|
||||
// The profile's values for a limit (T15): whole rates as they are, a fraction over 1000 where RTSS knows the
|
||||
|
||||
Reference in New Issue
Block a user