Commit 34301f8
SP0.10: AgentLoopDriver — paced sense-decide-act loop via SimulationController (#739)
* SP0.10: Add AgentLoopDriver — paced sense-decide-act loop via SimulationController
* SP0.10: fix review — off-thread-safe snapshot + contract KDoc
Address Important + Minor findings from PR #739 review (#732 SP0.10).
Issue 2 — DefaultNetworkPerceptionPort.snapshot() was not off-thread-safe:
it read plain non-volatile mutable sim fields and iterated the live
approwedTrains list, so an off-thread driver call could throw a
ConcurrentModificationException. Fix follows the spec's capture-on-sim-thread
model (never blocks/interrupts the kDisco kernel — no sim-thread lock):
- Add @volatile latestCaptured cache; captureSnapshot() does the fresh
on-thread read and publishes; snapshot() returns latestCaptured or
SimulationSnapshot.EMPTY — a pure cached read that never touches live
state, never throws, never blocks the kernel.
- Add SimulationSnapshot.EMPTY companion (default before first capture).
- Migrate ShuntingLoop's two on-thread snapshot() calls (admission +
path-advancement) to captureSnapshot() — behavior-preserving (still fresh
reads, plus the cache publish side-effect).
- AgentLoopDriver keeps calling snapshot(), now genuinely off-thread-safe.
Issue 1 — contract drift: the :core KDoc on Dispatcher, SimulationController
and NetworkPerceptionPort still claimed single-kDisco-thread exclusivity,
contradicting the SP0.5 spec which runs the drive loop on the driver's own
thread. Updated to reflect that the kDisco kernel runs on its own single
thread while outside callers (the SP0.10 driver, future LLM) run in their
own threads; implementations must not rely on kDisco-thread exclusivity.
Minor 4 — rewrote the "mirrors DefaultSimulationContext" comment in
AgentLoopDriver.runCycle() without exact numbers and without the misleading
call-order claim (DefaultSimulationContext does throttle→awaitIfPaused; the
driver does awaitIfPaused→throttle); kept an accurate initial-delta
convention reference.
Tests: added captureSnapshot() to the two SimulationSnapshotTest stubs;
migrated the six fresh-read assertions in DefaultNetworkPerceptionPortTest
to captureSnapshot() and added two cached-snapshot() tests (returns EMPTY
before first capture; returns last capture and stays frozen through later
mutations). AgentLoopDriverTest unchanged (driver uses the mocked snapshot()).1 parent 61188f4 commit 34301f8
11 files changed
Lines changed: 744 additions & 67 deletions
File tree
- core/src
- commonMain/kotlin/cz/vutbr/fit/interlockSim
- context
- ports
- sim
- commonTest/kotlin/cz/vutbr/fit/interlockSim/ports
- jvmTest/kotlin/cz/vutbr/fit/interlockSim/ports
- dispatcher-agent
- src
- main/kotlin/cz/vutbr/fit/interlockSim/dispatcher
- test/kotlin/cz/vutbr/fit/interlockSim/dispatcher
Lines changed: 25 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
29 | 32 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
33 | 38 | | |
34 | 39 | | |
35 | 40 | | |
| |||
44 | 49 | | |
45 | 50 | | |
46 | 51 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
51 | 56 | | |
52 | 57 | | |
53 | 58 | | |
54 | 59 | | |
55 | 60 | | |
56 | 61 | | |
57 | | - | |
58 | | - | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
59 | 65 | | |
60 | 66 | | |
61 | 67 | | |
| |||
64 | 70 | | |
65 | 71 | | |
66 | 72 | | |
67 | | - | |
68 | | - | |
| 73 | + | |
| 74 | + | |
69 | 75 | | |
70 | 76 | | |
71 | 77 | | |
| |||
Lines changed: 55 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
56 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
57 | 65 | | |
58 | 66 | | |
59 | 67 | | |
| |||
231 | 239 | | |
232 | 240 | | |
233 | 241 | | |
234 | | - | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
235 | 267 | | |
236 | 268 | | |
237 | 269 | | |
238 | | - | |
| 270 | + | |
| 271 | + | |
239 | 272 | | |
240 | 273 | | |
241 | 274 | | |
242 | 275 | | |
243 | 276 | | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
257 | 294 | | |
258 | 295 | | |
259 | 296 | | |
| |||
Lines changed: 47 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
45 | 50 | | |
46 | 51 | | |
47 | 52 | | |
| |||
132 | 137 | | |
133 | 138 | | |
134 | 139 | | |
135 | | - | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
136 | 165 | | |
137 | 166 | | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
142 | 178 | | |
143 | 179 | | |
144 | 180 | | |
145 | 181 | | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
| 182 | + | |
| 183 | + | |
152 | 184 | | |
153 | | - | |
154 | | - | |
155 | | - | |
| 185 | + | |
156 | 186 | | |
157 | | - | |
| 187 | + | |
158 | 188 | | |
Lines changed: 20 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
42 | 48 | | |
43 | 49 | | |
44 | 50 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
385 | | - | |
| 385 | + | |
386 | 386 | | |
387 | 387 | | |
388 | 388 | | |
| |||
403 | 403 | | |
404 | 404 | | |
405 | 405 | | |
406 | | - | |
| 406 | + | |
407 | 407 | | |
408 | 408 | | |
409 | 409 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
166 | 169 | | |
167 | 170 | | |
168 | 171 | | |
| |||
207 | 210 | | |
208 | 211 | | |
209 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
210 | 216 | | |
211 | 217 | | |
212 | 218 | | |
| |||
0 commit comments