H12: Build the next match's island on a worker thread

When a match's results begin, Match starts the next match's Simulation on a
WorkerThreadPool task (its seed is fixed by then) and collects it when the
lobby opens. The same task plans the island's tide levels
(Simulation.plan_tide) and runs a prepare_next hook, which ServerLoop uses
to build the bots' NavGrid and BotWorld for the island. All of these read
only the new simulation, so the results are the ones the main thread would
have made: tests compare the state hash, terrain, solids, props, tide
levels and navigation with fresh ones, and the ten-matches test still
matches its references. A Match freed while its task runs waits for it.

Measured: a 24-bot server paced in real time through the results, lobby,
countdown and 3 s of the next drop has a worst tick of 5.4 ms; it was 1.8 s.
In the 24-client soak at 2% loss, moving the island alone left a 0.82 s tick
(the bots' navigation) and moving that too left 74 ms at the next match's
start (planning the tide), which this also moves. The soak hasn't been run
again since that last step.

Closes #79

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-13 01:27:39 -05:00
co-authored by Claude Opus 5.5
parent 3a76371760
commit ad0fd2695d
5 changed files with 158 additions and 4 deletions
+25
View File
@@ -89,3 +89,28 @@ func test_server_returns_to_the_lobby_and_starts_the_next_match() -> void:
assert_eq(loop.bots.size(), 3, "bots are rebuilt for the new match")
assert_eq(loop.player_ids, [1, 2, 3] as Array[int])
assert_eq(loop.ticks, 5)
## H12: the next island's bot navigation is made on the worker with the island, and
## is the same as navigation made on the main thread.
func test_the_next_islands_navigation_is_made_in_the_background() -> void:
var rules: MatchRules = MatchRules.new()
rules.max_players = 2
rules.min_players = 0
rules.lobby_ticks = 2
rules.countdown_ticks = 2
rules.results_ticks = 2
rules.fill_with_bots = false
var loop: ServerLoop = ServerLoop.new(77, 0, 0, rules)
var first: NavGrid = loop.nav
while loop.match_flow.phase != Match.RESULTS:
loop.run_tick()
while loop.match_flow.phase != Match.LOBBY:
loop.run_tick()
assert_true(loop.nav != first, "new navigation for the new island")
assert_true(loop.match_flow.prepared.has("nav"), "made by the worker")
var fresh: NavGrid = NavGrid.build(loop.match_flow.sim)
assert_true(loop.nav.heights == fresh.heights, "the same heights")
assert_true(loop.nav.blocked == fresh.blocked, "the same blocked cells")
assert_eq(loop.nav.main_region, fresh.main_region)
assert_true(loop.world.walkable == BotWorld.build(loop.match_flow.sim, fresh).walkable)
+46
View File
@@ -330,3 +330,49 @@ func test_watchers_take_places_ahead_of_bots_in_the_next_match() -> void:
assert_eq(m.bot_handles.size(), 1, "one bot fills the one empty place")
for handle: int in [1, 7, 9]:
assert_true(m.entity_of.has(handle))
## H12: the next match's island is built on a worker thread during the results, so
## the step that opens the lobby doesn't stall, and the world is exactly the one the
## main thread would have built.
func test_the_next_island_is_built_off_the_main_thread_and_matches_a_fresh_one() -> void:
var rules: MatchRules = _rules(4, false)
rules.min_players = 0
rules.results_ticks = 4
var m: Match = Match.new(SEED, rules)
_until(m, Match.RESULTS, 20)
assert_true(m._next_task >= 0, "the results start the next island's task")
var built_on: Simulation = m.sim
_until(m, Match.LOBBY, 10)
assert_true(m.sim != built_on, "the lobby has a new simulation")
assert_eq(m._next_task, -1, "the task was collected")
var fresh: Simulation = Simulation.new(m.match_seed(1))
assert_eq(m.sim.rng.match_seed, fresh.rng.match_seed)
assert_eq(m.sim.state_hash(), fresh.state_hash())
assert_true(m.sim.ground.heights == fresh.ground.heights, "same terrain")
assert_eq(m.sim.ground.solids, fresh.ground.solids, "same solids")
assert_eq(m.sim.props.count(), fresh.props.count(), "same props")
assert_eq(m.sim._planned_levels, SafeGround.new(fresh.ground).plan_levels(), "its tide is planned already, and the same")
func test_a_match_freed_during_the_results_waits_for_its_task() -> void:
var rules: MatchRules = _rules(4, false)
rules.min_players = 0
rules.results_ticks = 1000
var m: Match = Match.new(SEED, rules)
_until(m, Match.RESULTS, 20)
assert_true(m._next_task >= 0)
m = null
assert_true(true, "freeing it with a task running raises no error")
func test_the_prepare_hook_runs_with_the_next_island() -> void:
var rules: MatchRules = _rules(4, false)
rules.min_players = 0
var m: Match = Match.new(SEED, rules)
m.prepare_next = func(next_sim: Simulation) -> Dictionary:
return {"seed": next_sim.rng.match_seed, "props": next_sim.props.count()}
_until(m, Match.RESULTS, 20)
_until(m, Match.LOBBY, 10)
assert_eq(m.prepared.get("seed"), m.sim.rng.match_seed, "prepared for the lobby's own island")
assert_eq(m.prepared.get("props"), m.sim.props.count())