mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-17 11:29:58 -04:00
Stop sending a request again to a new translator child after the first one gave no answer for the read timeout.
plat_child_read returned -1 both for a broken pipe and for a child that sent nothing for PLAT_CHILD_READ_MS (120 s), and svc_request retried any failure once on a fresh child. The translator is deterministic, so a program it hangs on hangs the second child too: a compute shader, which the replay thread looks up synchronously (vk_exec_draw.c shader_for), held the game for about 4 minutes instead of 2. plat_child_read now returns -2 on the timeout (win32.c and linux.c), child_exchange_raw returns 1, 0 for a broken pipe or a child that could not start, and -1 for the timeout, and svc_request stops the child and gives -1 without asking again; a dead child is still restarted once. translate_one fails such a request with its own reason, keeps its job and code for diagnosis and deletes whatever the stopped child wrote. The carry pass's child runs at idle priority, so a busy machine can starve it that long: carry_exchange does not resend after a timeout either, and carry_translate counts it as a failed input, not as an unavailable translator, so one slow program does not count towards the three that stop the pass. platform.h lets a build set PLAT_CHILD_READ_MS. Not reproduced before the change (no translator hang appears in the available logs). tests/child_timeout_check.py (new) builds the real child and request functions with a 300 ms timeout: a silent child gives -2 and costs one timeout with one child started, an exiting child is restarted once, an answering child gives its line. Every runtime file compiles, with no new warnings in gfx_shader.c and win32.c. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -562,7 +562,9 @@ static int child_start(Svc *v) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// One line out, one line in (no newline in the reply). 0 when the pipe broke.
|
||||
// One line out, one line in (no newline in the reply). 1 answered; 0 when the child could not start or the pipe broke;
|
||||
// -1 when the child sent nothing for PLAT_CHILD_READ_MS (stuck on this request: the translator is deterministic, so
|
||||
// sending it again would wait as long).
|
||||
static int child_exchange_raw(Svc *v, const char *line, char *reply, size_t reply_size) {
|
||||
if (!v->child && !child_start(v)) return 0;
|
||||
plat_inc64(&n_requests);
|
||||
@@ -582,6 +584,7 @@ static int child_exchange_raw(Svc *v, const char *line, char *reply, size_t repl
|
||||
}
|
||||
if (v->in_len == sizeof v->inbuf) v->in_len = 0; // an overlong line: drop it, wait for its end
|
||||
long got = plat_child_read(v->child, v->inbuf + v->in_len, sizeof v->inbuf - v->in_len);
|
||||
if (got == -2) return -1;
|
||||
if (got <= 0) return 0;
|
||||
v->in_len += (size_t)got;
|
||||
}
|
||||
@@ -589,9 +592,9 @@ static int child_exchange_raw(Svc *v, const char *line, char *reply, size_t repl
|
||||
|
||||
static int child_exchange(Svc *v, const char *line, char *reply, size_t reply_size) {
|
||||
uint64_t p0 = perf_begin(); // NX2NAVI_TRACE=perf: render-thread time spent translating
|
||||
int ok = child_exchange_raw(v, line, reply, reply_size);
|
||||
int r = child_exchange_raw(v, line, reply, reply_size);
|
||||
perf_end(PERF_XLATE, p0);
|
||||
return ok;
|
||||
return r;
|
||||
}
|
||||
|
||||
// Children allowed at run time: NX2NAVI_XLATE_PROCS, default 2.
|
||||
@@ -664,13 +667,25 @@ static void svc_set_limit(int n) {
|
||||
plat_cond_broadcast(&S.freed);
|
||||
}
|
||||
|
||||
// One request on a child; a dead child is restarted once. 0 when the translator is unavailable. The caller has given
|
||||
// up its virtual core (kern_core_away): the wait for a child and the translation are host time.
|
||||
// One request on a child; a dead child is restarted once. 1 answered, 0 when the translator is unavailable, -1 when
|
||||
// the child gave no answer for PLAT_CHILD_READ_MS: it is stopped and the request is not sent again, which would hold
|
||||
// the caller (the replay thread for a compute shader) as long once more. The caller has given up its virtual core
|
||||
// (kern_core_away): the wait for a child and the translation are host time.
|
||||
static int svc_request(const char *line, char *reply, size_t reply_size) {
|
||||
Svc *v = svc_get();
|
||||
int ok = 0;
|
||||
for (int attempt = 0; attempt < 2 && !ok; attempt++)
|
||||
if (!(ok = child_exchange(v, line, reply, reply_size))) child_stop(v);
|
||||
for (int attempt = 0; attempt < 2; attempt++) {
|
||||
int r = child_exchange(v, line, reply, reply_size);
|
||||
if (r > 0) {
|
||||
ok = 1;
|
||||
break;
|
||||
}
|
||||
child_stop(v);
|
||||
if (r < 0) {
|
||||
ok = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
svc_put(v);
|
||||
return ok;
|
||||
}
|
||||
@@ -2202,7 +2217,7 @@ static void zpass_kick(void) { plat_once(&Z.once, zpass_start, NULL); }
|
||||
int gfx_shader_raw_request(const char *line, char *reply, size_t reply_size) {
|
||||
int away = kern_core_away();
|
||||
Svc *v = svc_get();
|
||||
int ok = child_exchange(v, line, reply, reply_size);
|
||||
int ok = child_exchange(v, line, reply, reply_size) > 0;
|
||||
if (!ok) child_stop(v);
|
||||
svc_put(v);
|
||||
kern_core_back(&away);
|
||||
@@ -2562,9 +2577,9 @@ static const GfxShader *translate_one(const Req *r, int stage, const uint8_t *co
|
||||
} else {
|
||||
if (!write_file(code_path, code + skip, code_len)) return free(req), fail("cannot write the code file", hex);
|
||||
int ok = svc_request(req, reply, sizeof reply);
|
||||
// Keep a failed translation's job and code for diagnosis.
|
||||
int failed = ok && strncmp(reply, "ok ", 3);
|
||||
int kept = keep >= 2 || (keep && a && a->mvprev) || failed;
|
||||
// Keep a failed translation's job and code for diagnosis, and those of a request the translator never answered.
|
||||
int failed = ok > 0 && strncmp(reply, "ok ", 3);
|
||||
int kept = keep >= 2 || (keep && a && a->mvprev) || failed || ok < 0;
|
||||
if (kept) {
|
||||
char job_path[PATH_CAP + 80];
|
||||
snprintf(job_path, sizeof job_path, "%s/%s.job", cache_dir, hex);
|
||||
@@ -2572,6 +2587,13 @@ static const GfxShader *translate_one(const Req *r, int stage, const uint8_t *co
|
||||
}
|
||||
free(req);
|
||||
if (!kept) plat_file_delete(code_path);
|
||||
if (ok < 0) { // whatever the stopped child wrote is not a translation
|
||||
plat_file_delete(spv_path), plat_file_delete(res_path);
|
||||
char why[96];
|
||||
snprintf(why, sizeof why, "the translator gave no answer in %d s; its child was stopped",
|
||||
PLAT_CHILD_READ_MS / 1000);
|
||||
return fail(why, hex);
|
||||
}
|
||||
if (!ok) return fail("translator unavailable", hex);
|
||||
if (failed) {
|
||||
plat_file_delete(spv_path), plat_file_delete(res_path);
|
||||
@@ -3724,14 +3746,18 @@ static void carry_wait(void) {
|
||||
}
|
||||
|
||||
// One request on the pass's child, started below every normal process when needed; a dead child is restarted once.
|
||||
// 1 answered, 0 unavailable, -1 no answer for PLAT_CHILD_READ_MS: the child is stopped and the request not sent again
|
||||
// (at idle priority a busy machine can starve the child that long, so the next request gets a new child).
|
||||
static int carry_exchange(const char *line, char *reply, size_t n) {
|
||||
for (int attempt = 0; attempt < 2; attempt++) {
|
||||
if (!carry_svc.child) {
|
||||
if (!child_start(&carry_svc)) return 0;
|
||||
plat_child_lower(carry_svc.child);
|
||||
}
|
||||
if (child_exchange_raw(&carry_svc, line, reply, n)) return 1;
|
||||
int r = child_exchange_raw(&carry_svc, line, reply, n);
|
||||
if (r > 0) return 1;
|
||||
child_stop(&carry_svc);
|
||||
if (r < 0) return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -3739,8 +3765,8 @@ static int carry_exchange(const char *line, char *reply, size_t n) {
|
||||
// Translates a stored input again under the current identity and stores the files as translate_one does, leaving the
|
||||
// memory cache alone. The job's files have names of their own (sha256("TKSC", key)), so an on-demand translation of the
|
||||
// same key at the same time never writes the same files; each renames its own onto the key's, with the same content.
|
||||
// 1 stored, 0 the translator refused the program or wrote no usable translation (why says which), -1 no translator or
|
||||
// a file error.
|
||||
// 1 stored, 0 the translator refused the program, gave no answer or wrote no usable translation (why says which), -1 no
|
||||
// translator or a file error.
|
||||
static int carry_translate(const Req *r, const Inputs *in, char *why, size_t nwhy) {
|
||||
uint8_t t[32], tb[36];
|
||||
memcpy(tb, "TKSC", 4), memcpy(tb + 4, r->key, 32);
|
||||
@@ -3757,8 +3783,8 @@ static int carry_translate(const Req *r, const Inputs *in, char *why, size_t nwh
|
||||
char *req = malloc(cap), reply[LINE_MAX_LEN];
|
||||
if (!req) return plat_file_delete(code_path), snprintf(why, nwhy, "out of memory"), -1;
|
||||
build_request(req, hex, r->stage_name, code_path, r->c1, r->c1_len, &in->a, in->control, NULL);
|
||||
int ok = carry_exchange(req, reply, sizeof reply), refused = ok && strncmp(reply, "ok ", 3);
|
||||
if (refused) { // as translate_one: the job and its code stay, for a translator fix to be tested on
|
||||
int ok = carry_exchange(req, reply, sizeof reply), refused = ok > 0 && strncmp(reply, "ok ", 3);
|
||||
if (refused || ok < 0) { // as translate_one: the job and its code stay, for a translator fix to be tested on
|
||||
char job_path[PATH_CAP + 80];
|
||||
snprintf(job_path, sizeof job_path, "%s/%s.job", cache_dir, hex);
|
||||
write_file(job_path, req, strlen(req));
|
||||
@@ -3767,6 +3793,10 @@ static int carry_translate(const Req *r, const Inputs *in, char *why, size_t nwh
|
||||
}
|
||||
free(req);
|
||||
if (!ok) return snprintf(why, nwhy, "translator unavailable"), -1;
|
||||
if (ok < 0) { // this input fails; the pass goes on with the next on a new child
|
||||
plat_file_delete(spv_path), plat_file_delete(res_path);
|
||||
return snprintf(why, nwhy, "the translator gave no answer in %d s", PLAT_CHILD_READ_MS / 1000), 0;
|
||||
}
|
||||
GfxShader *s = refused ? NULL : disk_load_from(t, NULL, 0, 0);
|
||||
if (!s || s->stage != in->stage) {
|
||||
snprintf(why, nwhy, "%s", refused ? reply : s ? "translated to another stage" : "translator output missing or malformed");
|
||||
|
||||
@@ -2594,13 +2594,14 @@ void plat_child_lower(PlatChild *c) { // a higher nice value needs no privileg
|
||||
// A child that died makes the write fail with EPIPE; SIGPIPE is ignored for the process (main.c), as Windows has none.
|
||||
int plat_child_write(PlatChild *c, const void *data, size_t n) { return write_all(c->in, data, n); }
|
||||
|
||||
// See win32.c plat_child_read: a child that never answers fails the read after PLAT_CHILD_READ_MS.
|
||||
// See win32.c plat_child_read: a child that never answers fails the read with -2 after PLAT_CHILD_READ_MS.
|
||||
long plat_child_read(PlatChild *c, void *buf, size_t cap) {
|
||||
struct pollfd pf = {.fd = c->out, .events = POLLIN};
|
||||
int r;
|
||||
do r = poll(&pf, 1, PLAT_CHILD_READ_MS);
|
||||
while (r < 0 && errno == EINTR);
|
||||
if (r <= 0) return -1; // timed out or failed
|
||||
if (!r) return -2; // timed out
|
||||
if (r < 0) return -1; // failed
|
||||
ssize_t k;
|
||||
do k = read(c->out, buf, cap);
|
||||
while (k < 0 && errno == EINTR);
|
||||
|
||||
@@ -563,8 +563,12 @@ void plat_child_stop(PlatChild *c); // kills the child and
|
||||
// that must not slow the game down (gfx_shader.c, the carry pass).
|
||||
void plat_child_lower(PlatChild *c);
|
||||
int plat_child_write(PlatChild *c, const void *data, size_t n); // 1 when all n bytes were written
|
||||
#ifndef PLAT_CHILD_READ_MS // a check may build the child functions with a shorter one
|
||||
#define PLAT_CHILD_READ_MS 120000 // plat_child_read gives up on a child that sends nothing for this long
|
||||
long plat_child_read(PlatChild *c, void *buf, size_t cap); // bytes read (at least 1); 0 or negative: pipe broke or timed out
|
||||
#endif
|
||||
// Bytes read (at least 1); 0 or -1 when the pipe broke (the child is gone); -2 when nothing came for PLAT_CHILD_READ_MS
|
||||
// while the child kept its end open (a child stuck on its input: asking it again would wait as long).
|
||||
long plat_child_read(PlatChild *c, void *buf, size_t cap);
|
||||
|
||||
// ---- local IPC: a stream connection to another program of this machine, one listen location per name (Discord's
|
||||
// Rich Presence, discord_rpc.c). On Windows the named pipe \\.\pipe\<name>; on Linux the Unix domain socket
|
||||
|
||||
@@ -2384,15 +2384,16 @@ int plat_child_write(PlatChild *c, const void *data, size_t n) {
|
||||
}
|
||||
|
||||
// A child that stays alive but never answers (a translator stuck on one program) used to block the reader for good,
|
||||
// and with it the draw or dispatch waiting for that shader: after PLAT_CHILD_READ_MS without a byte the read fails,
|
||||
// and the caller stops the child (gfx_shader.c svc_request). The pipe is anonymous, so readiness is polled.
|
||||
// and with it the draw or dispatch waiting for that shader: after PLAT_CHILD_READ_MS without a byte the read fails
|
||||
// with -2, apart from the -1 of a broken pipe, and the caller stops the child without sending the request again
|
||||
// (gfx_shader.c svc_request). The pipe is anonymous, so readiness is polled.
|
||||
long plat_child_read(PlatChild *c, void *buf, size_t cap) {
|
||||
ULONGLONG t0 = GetTickCount64();
|
||||
for (unsigned spins = 0;; spins++) {
|
||||
DWORD avail = 0;
|
||||
if (!PeekNamedPipe(c->out, NULL, 0, NULL, &avail, NULL)) return -1; // broken: the child exited
|
||||
if (avail) break;
|
||||
if (GetTickCount64() - t0 > PLAT_CHILD_READ_MS) return -1;
|
||||
if (GetTickCount64() - t0 > PLAT_CHILD_READ_MS) return -2;
|
||||
Sleep(spins < 50 ? 0 : 1);
|
||||
}
|
||||
DWORD got = 0;
|
||||
|
||||
Reference in New Issue
Block a user