0dc4c70f18
The SIGHUP/SIGTERM handler gob-encoded the live game tree from the signal goroutine while the game goroutine was mid-turn mutating it, and AutoSave removed the save file before encoding — so the failure mode was not a stale save but a deleted one followed by a possibly torn replacement, with a window in which the player had neither. The suite has run under -race since 2026-08-09 and was green because nothing had ever driven the turn loop concurrently with a signal: evidence of untested, not of safe. The handler no longer writes anything. AutoSaveOnSignal posts a request, wakes the input read, and waits up to signalSaveTimeout for the game goroutine to take it; the encode runs on the goroutine that owns the state, at the three points where that goroutine can sit: between turns (command), on waking from a blocked readchar, and while parked in the `!` shell escape (runShellEscape, which now runs the shell on a helper goroutine so a hangup during it still rescues the game). Blocked on input is the case that matters — a dropped connection lands while the player is thinking, so a flag checked only between turns would never be looked at. Terminal.ReadChar therefore returns (byte, bool), with ok false meaning "woken by Interrupt, no key", and term.Tcell posts a tcell.EventInterrupt onto tcell's own event queue to unpark PollEvent. readchar services the request and reads again, so no caller sees it. Running the shell on a helper goroutine would also have moved term.Tcell.ShellEscape's panic on a failed Screen.Resume onto it, and a panic at the top of any goroutine terminates the process without running the deferred calls of the others — including cmd/rogue/main.go's `defer t.Fini()`. The tty would have been left raw on precisely the path where the terminal is already broken, which is issue #12's failure on a path this change created. runShellEscape therefore recovers the helper's panic and re-raises it on the game goroutine, whose stack has the restore in it, so "every path restores the terminal via Terminal.Fini before exiting" stays true. saveFile writes a temporary file in the save's own directory, fsyncs it and renames it over the target instead of truncating in place, so a save that fails — or never happens because the deadline ran out — leaves the player's previous save whole. What the handoff guarantees is stated exactly rather than flatteringly: the encode runs on the state-owning goroutine, so the snapshot is internally consistent and restorable, but it is not necessarily taken between commands. readchar is reached from mid-command prompts (--More--, askOverwrite, getStr, the direction and pack prompts) and the command has already mutated state by then, so a save taken there freezes that command half applied and restoring loses the rest of it. The SIGINT/SIGQUIT no-save decision and the single-signal-read ordering guarantee are untouched. pendingSaver reads the game out from under its mutex rather than delegating with it held, because the delegated call now blocks until the save is taken.
36 lines
797 B
Go
36 lines
797 B
Go
//nolint:testpackage // white-box tests reach unexported state (approved 2026-07-07)
|
|
package game
|
|
|
|
// testTerm is a headless Terminal for tests: rendering is a no-op and
|
|
// input plays a script, then alternates space/newline so that --More--
|
|
// and [Press return] prompts never block.
|
|
type testTerm struct {
|
|
input []byte
|
|
pos int
|
|
tick int
|
|
}
|
|
|
|
func (t *testTerm) Render(*Window) {}
|
|
|
|
func (t *testTerm) Fini() {}
|
|
|
|
// Interrupt has nothing to wake: this terminal's ReadChar never blocks.
|
|
// The blocking case has its own fake, blockingTerm in autosave_test.go.
|
|
func (t *testTerm) Interrupt() {}
|
|
|
|
func (t *testTerm) ReadChar() (byte, bool) {
|
|
if t.pos < len(t.input) {
|
|
c := t.input[t.pos]
|
|
t.pos++
|
|
|
|
return c, true
|
|
}
|
|
|
|
t.tick++
|
|
if t.tick%2 == 0 {
|
|
return '\n', true
|
|
}
|
|
|
|
return ' ', true
|
|
}
|