empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

navigate march: Fix use-after-free and other bugs

Browse source 
unit_move() is too big and has too many paths through its loop.
Maintenance of the (unspoken) loop invariant isn't obvious.  In fact,
it isn't maintained on some paths.  I found several bugs:

* We check prerequisite conditions for moving before the first move
  and around prompts.  When a condition becomes wrong on the move,
  movement continues all the same until the next prompt.  I believe
  the only way this can happen is loss of crew due to hitting a mine.

* We cache ships and land units in a list of struct ulist.  When a
  ship or land unit gets left behind, its node is removed from the
  list and freed.

  We keep pointer flg pointing to the flagship in that list for
  convenience.  However, the pointer isn't updated until the next
  prompt.  It's referenced for automatic radar and all sub-commands
  other than the six directions and 'h'.  Use after free when such a
  sub-command gets processed after a flagship change without a prompt.
  Same for land units.  For instance, navigating a pair of ships "jh"
  where the flagship has no mobility leaves the flagship behind, then
  attempts to radar automatically using the ship in the freed list
  node.  Likewise, marching a similar pair of land units "jl" examines
  the land unit in the freed list node to figure out how to look.

* We cache mobility in the same list to support fractional mobility
  during movement.  Movement deducts from cached mobility and writes
  the result back to the ship or land unit.

  If something else charges it mobility while it's in this list, the
  cache becomes stale.  shp_nav() and lnd_nav() reload stale caches,
  but don't run often enough.  For instance, when a ship hits mines,
  the mine damage makes the cache stale.  If a direction or 'h'
  follows directly, the stale mobility is written back, clobbering the
  mine hit's mobility loss.

This mess dates back to Empire 2, where it replaced a different mess.
There may be more bugs.

unit_move()'s complex control flow makes reasoning about its loop
invariant too error-prone.  Rewrite the mess instead, splitting off
sensible subroutines.

Also fixes a couple of minor annoyances:

* White-space can confuse the parser.  For instance, "jg l" is
  interpreted like "jgll".  Fix to reject the space.  Broken in commit
  0c12d83, v4.3.7.

* The flagship uses radar automatically before any sub-command (since
  Chainsaw), and all ships use it automatically after a move (since
  4.2.2).  Make them all use it before and after each sub-command,
  whether it's a move or not.

* Land units don't use radar automatically.  Make them use it just
  like ships.

* Always report a flagship / leader change right when it happens, not
  only before and after a prompt.

Left for another day, marked FIXME: BTU charging is unclean.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-05 16:32:25 +01:00
parent 198e2dd076
commit 24000b4855
13 changed files with 281 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/navi-march/01-navigate-1
View file

@ -30,7 +30,6 @@ iyh
| lose crew, by hitting mines in 11,-5
| at least one hit must lose crew; use __cmd to force it if necessary
navi 32/33/34/35/36/37/38/39 jiyh
| BUG: moves on without crew
| TODO sink ship at navi prompt, changing leader
| TODO slap bridge onto ship at navi prompt
|| sector entry
@ -126,5 +125,4 @@ navi 135/130/131/136/137/138/139
j
| implicit sweep, not all capable
mmmh
| BUG: mobility use low
|| TODO interdiction

3
tests/navi-march/02-march-1
View file

@ -29,7 +29,6 @@ iyh
| at least one hit must lose crew; use __cmd to force it if necessary
__cmd added -1 0 0
march 32/33/34/35/36/37/38/39 jiyh
| BUG: moves on without crew
| TODO destroy land unit at march prompt, changing leader
| TODO kidnap at march prompt
|| sector entry
@ -97,7 +96,6 @@ l
l 0
gbbb
B 0
| BUG: radar not used on march
M *
r
r 100
@ -127,5 +125,4 @@ march 135/130/131/136/137/138/139
j
| implicit sweep, not all capable
mmmh
| BUG: mobility use low
|| TODO interdiction

36
tests/navi-march/final.xdump
View file

@ -145,14 +145,14 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
28 1 3 -1 9 100 117 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
30 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
31 0 11 -5 9 0 53 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
32 1 10 -6 9 75 105 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
33 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
32 1 10 -6 9 75 75 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
33 1 10 -6 9 80 82 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
34 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
35 1 10 -6 9 66 103 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
36 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
37 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
38 1 10 -6 9 69 104 0 40 9 -5 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
39 1 10 -6 9 64 103 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
35 1 10 -6 9 66 63 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
36 1 10 -6 9 80 82 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
37 1 10 -6 9 80 82 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
38 1 11 -5 9 69 117 0 40 9 -5 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
39 1 10 -6 9 64 60 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
50 1 1 1 9 100 117 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
51 1 4 0 9 100 127 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
52 1 2 0 9 100 117 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
@ -189,8 +189,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
122 1 13 -3 16 100 85 0 40 0 0 none 0 "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
128 1 11 -3 16 100 -12 0 40 0 0 none 0 "" 0 5 5 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
129 1 10 -2 16 100 99 0 40 0 0 none 0 "" 0 5 100 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
130 1 11 -5 16 43 1 0 40 0 0 none 0 "" 0 3 10 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
131 1 11 -5 16 58 20 0 40 0 0 none 0 "" 0 3 11 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
130 1 11 -5 16 43 -11 0 40 0 0 none 0 "" 0 4 9 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
131 1 11 -5 16 66 12 0 40 0 0 none 0 "" 0 3 14 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
135 1 11 -5 9 70 82 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
136 1 11 -5 9 69 81 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
137 1 11 -5 9 100 117 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
@ -222,14 +222,14 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
25 1 -5 3 0 100 127 0 30 -5 3 reserve 3 "" -1 127 42 (bombed) "hhhhn" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
30 1 7 5 0 100 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
31 0 8 6 0 0 85 0 30 6 6 none 3 "" -1 0 42 () "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
32 1 7 5 0 87 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
32 1 7 5 0 87 78 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
33 1 7 5 0 100 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
34 1 7 5 0 86 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
35 1 7 5 0 87 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
36 1 7 5 0 78 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
37 1 7 5 0 90 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
38 1 7 5 0 78 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
39 1 7 5 0 84 93 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
34 1 7 5 0 86 78 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
35 1 7 5 0 87 79 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
36 1 8 6 0 78 104 0 30 6 6 none 3 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
37 1 7 5 0 90 81 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
38 1 7 5 0 78 69 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
39 1 7 5 0 84 75 0 30 6 6 none 3 "" -1 0 42 () "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
50 1 11 3 0 100 105 0 30 9 3 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
51 1 -1 3 0 100 105 0 30 1 3 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
52 1 -3 3 0 100 127 0 30 -3 3 none 3 "" -1 127 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@ -265,7 +265,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
120 1 2 0 15 100 127 0 130 2 0 none 1 "" -1 127 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
121 1 7 7 15 100 52 0 130 7 7 none 1 "" -1 0 42 () "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
128 1 9 7 15 100 -23 0 130 7 7 none 1 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
130 1 8 6 15 94 52 0 130 6 6 none 1 "" -1 0 42 () "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
130 1 8 6 15 94 48 0 130 6 6 none 1 "" -1 0 42 () "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
131 1 8 6 15 96 48 0 130 6 6 none 1 "" -1 0 42 () "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
135 1 8 6 0 100 104 0 30 6 6 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
136 1 8 6 0 100 104 0 30 6 6 none 3 "" -1 0 42 () "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@ -279,7 +279,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile p
/config
config news
actor action victim times duration time
1 25 0 21 0 0
1 25 0 20 0 0
1 56 0 11 0 0
/config
config trade

75
tests/navi-march/journal.log
View file

@ -156,6 +156,7 @@
Play#1 output Play#1 1 pt patrol boat (#38) takes 31
Play#1 output Play#1 1 Kawhomp! Mine detected in 11,-5!
Play#1 output Play#1 1 pt patrol boat (#39) takes 36
Play#1 output Play#1 1 pt patrol boat (#38) is crewless & stays in 11,-5
Play#1 output Play#1 1 shp# ship type x,y fl eff mil sh gun pn he xl ln mob tech
Play#1 output Play#1 1 32 pt patrol boat 11,-5 75% 1 0 0 0 0 0 0 88 40
Play#1 output Play#1 1 33 pt patrol boat 11,-5 80% 1 0 0 0 0 0 0 94 40
@ -163,7 +164,6 @@
Play#1 output Play#1 1 35 pt patrol boat 11,-5 66% 1 0 0 0 0 0 0 77 40
Play#1 output Play#1 1 36 pt patrol boat 11,-5 80% 1 0 0 0 0 0 0 94 40
Play#1 output Play#1 1 37 pt patrol boat 11,-5 80% 1 0 0 0 0 0 0 94 40
Play#1 output Play#1 1 38 pt patrol boat 11,-5 69% 0 0 0 0 0 0 0 81 40
Play#1 output Play#1 1 39 pt patrol boat 11,-5 64% 1 0 0 0 0 0 0 75 40
Play#1 output Play#1 1 pt patrol boat (#32) stopped at 10,-6
Play#1 output Play#1 1 pt patrol boat (#33) stopped at 10,-6
@ -171,7 +171,6 @@
Play#1 output Play#1 1 pt patrol boat (#35) stopped at 10,-6
Play#1 output Play#1 1 pt patrol boat (#36) stopped at 10,-6
Play#1 output Play#1 1 pt patrol boat (#37) stopped at 10,-6
Play#1 output Play#1 1 pt patrol boat (#38) stopped at 10,-6
Play#1 output Play#1 1 pt patrol boat (#39) stopped at 10,-6
Play#1 output Play#1 6 0 628
Play#1 input navi 50 nh
@ -329,9 +328,10 @@
Play#1 output Play#1 4 <127.0:0.0: 0,0>
Play#1 input yyyy
Play#1 output Play#1 1 cs cargo ship (#84) is out of mobility & stays in 0,0
Play#1 output Play#1 1 Changing flagship to cs cargo ship (#83)
Play#1 output Play#1 1 cs cargo ship (#83) is out of mobility & stays in -1,-1
Play#1 output Play#1 1 cs cargo ship (#82) is out of mobility & stays in -3,-3
Play#1 output Play#1 1 Changing flagship to cs cargo ship (#80)
Play#1 output Play#1 1 cs cargo ship (#82) is out of mobility & stays in -3,-3
Play#1 output Play#1 1 . .
Play#1 output Play#1 1 . . .
Play#1 output Play#1 1 . .
@ -412,11 +412,11 @@
Play#1 output Play#1 1 -5 . . . . X . -5
Play#1 output Play#1 1 -4 . . . . . . -4
Play#1 output Play#1 1 -3 . i -3
Play#1 output Play#1 1 -2 . . . . -2
Play#1 output Play#1 1 -1 . i . . . . . -1
Play#1 output Play#1 1 0 . . = . = O = . . 0
Play#1 output Play#1 1 1 h h h h h h ? 1
Play#1 output Play#1 1 2 c c c c c ? 2
Play#1 output Play#1 1 -2 . . . . . . . -2
Play#1 output Play#1 1 -1 . i . . . . . . -1
Play#1 output Play#1 1 0 . . = . = O = . . . 0
Play#1 output Play#1 1 1 h h h h h h ? ? 1
Play#1 output Play#1 1 2 c c c c c c ? ? 2
Play#1 output Play#1 1 3 + + 3
Play#1 output Play#1 1 4 4
Play#1 output Play#1 1 5 5
@ -456,8 +456,8 @@
Play#1 output Play#1 1 -2 . . . . . . . . -2
Play#1 output Play#1 1 -1 . . . . . i . . . . . -1
Play#1 output Play#1 1 0 . = . . . = . = . = 0
Play#1 output Play#1 1 1 h h h h h P h h h h 1
Play#1 output Play#1 1 2 c ? c c c c c c 2
Play#1 output Play#1 1 1 h h h h h P h h h h ? 1
Play#1 output Play#1 1 2 c ? c c c c c c c ? 2
Play#1 output Play#1 1 3 + + 3
Play#1 output Play#1 1 4 4
Play#1 output Play#1 1 5 5
@ -678,8 +678,7 @@
Play#1 output Play#1 1 Kawhomp! Mine detected in 11,-5!
Play#1 output Play#1 1 ms minesweeper (#130) takes 10
Play#1 output Play#1 1 Sweep...
Play#1 output Play#1 1 Kawhomp! Mine detected in 11,-5!
Play#1 output Play#1 1 ms minesweeper (#131) takes 11
Play#1 output Play#1 1 Sweep...
Play#1 output Play#1 1 pt patrol boat (#135) stopped at 11,-5
Play#1 output Play#1 1 ms minesweeper (#130) stopped at 11,-5
Play#1 output Play#1 1 ms minesweeper (#131) stopped at 11,-5
@ -831,12 +830,12 @@
Play#1 output Play#1 1 cav cavalry #38 takes 22
Play#1 output Play#1 1 Blammo! Landmines detected in 8,6!
Play#1 output Play#1 1 cav cavalry #39 takes 16
Play#1 output Play#1 1 cav cavalry #36 has no mil on it to guide it & stays in 8,6
Play#1 output Play#1 1 lnd# land type x,y a eff mil sh gun xl ln mu tech retr
Play#1 output Play#1 1 32 cav cavalry 8,6 87% 1 0 0 0 0 90 30 42%
Play#1 output Play#1 1 33 cav cavalry 8,6 100% 1 0 0 0 0 104 30 42%
Play#1 output Play#1 1 34 cav cavalry 8,6 86% 1 0 0 0 0 90 30 42%
Play#1 output Play#1 1 35 cav cavalry 8,6 87% 1 0 0 0 0 91 30 42%
Play#1 output Play#1 1 36 cav cavalry 8,6 78% 0 0 0 0 0 82 30 42%
Play#1 output Play#1 1 37 cav cavalry 8,6 90% 1 0 0 0 0 93 30 42%
Play#1 output Play#1 1 38 cav cavalry 8,6 78% 1 0 0 0 0 81 30 42%
Play#1 output Play#1 1 39 cav cavalry 8,6 84% 1 0 0 0 0 87 30 42%
@ -844,7 +843,6 @@
Play#1 output Play#1 1 cav cavalry #33 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #34 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #35 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #36 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #37 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #38 stopped at 7,5
Play#1 output Play#1 1 cav cavalry #39 stopped at 7,5
@ -992,9 +990,10 @@
Play#1 output Play#1 4 <127.0:0.0: 3,5>
Play#1 input jjun
Play#1 output Play#1 1 cav cavalry #84 is out of mobility & stays in 3,5
Play#1 output Play#1 1 Changing leader to cav cavalry #83
Play#1 output Play#1 1 cav cavalry #83 is out of mobility & stays in 5,5
Play#1 output Play#1 1 cav cavalry #82 is out of mobility & stays in 8,4
Play#1 output Play#1 1 Changing leader to cav cavalry #80
Play#1 output Play#1 1 cav cavalry #82 is out of mobility & stays in 8,4
Play#1 output Play#1 1 m m
Play#1 output Play#1 1 m m m
Play#1 output Play#1 1 m m
@ -1077,7 +1076,7 @@
Play#1 output Play#1 1 0 . = . . . = . = . = 0
Play#1 output Play#1 1 1 h h h h h C h h h h ? 1
Play#1 output Play#1 1 2 c c c c c c c c c ? 2
Play#1 output Play#1 1 3 + + + + + + + + + ? 3
Play#1 output Play#1 1 3 + + + + + + + + + + 3
Play#1 output Play#1 1 4 m m m m + m m m m 4
Play#1 output Play#1 1 5 m m m m + m m m m 5
Play#1 output Play#1 1 6 ? ? ? m m m m m m 6
@ -1123,9 +1122,9 @@
Play#1 output Play#1 1 0 . = . . . = . = . = 0
Play#1 output Play#1 1 1 h h h h h C h h h h ? 1
Play#1 output Play#1 1 2 c c c c c c c c c ? 2
Play#1 output Play#1 1 3 + + + + + + + + + ? 3
Play#1 output Play#1 1 4 m m m m + m m m m 4
Play#1 output Play#1 1 5 m m m m + m m m m 5
Play#1 output Play#1 1 3 + + + + + + + + + + 3
Play#1 output Play#1 1 4 ? m m m m + m m m m 4
Play#1 output Play#1 1 5 ? m m m m + m m m m 5
Play#1 output Play#1 1 6 ? ? ? m m m m m m 6
Play#1 output Play#1 1 ---------000000000011
Play#1 output Play#1 1 987654321012345678901
@ -1382,14 +1381,14 @@
Play#0 output Play#0 1 1 27 pt patrol boat 1,-1 100% 0 2 0 0 0 0 0 0 127 40
Play#0 output Play#0 1 1 28 pt patrol boat 3,-1 100% 0 2 0 0 0 0 0 0 117 40
Play#0 output Play#0 1 1 30 pt patrol boat 10,-6 100% 0 2 0 0 0 0 0 0 108 40
Play#0 output Play#0 1 1 32 pt patrol boat 10,-6 75% 0 1 0 0 0 0 0 0 105 40
Play#0 output Play#0 1 1 33 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 106 40
Play#0 output Play#0 1 1 32 pt patrol boat 10,-6 75% 0 1 0 0 0 0 0 0 75 40
Play#0 output Play#0 1 1 33 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 82 40
Play#0 output Play#0 1 1 34 pt patrol boat 10,-6 100% 0 1 0 0 0 0 0 0 108 40
Play#0 output Play#0 1 1 35 pt patrol boat 10,-6 66% 0 1 0 0 0 0 0 0 103 40
Play#0 output Play#0 1 1 36 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 106 40
Play#0 output Play#0 1 1 37 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 106 40
Play#0 output Play#0 1 1 38 pt patrol boat 10,-6 69% 0 0 0 0 0 0 0 0 104 40
Play#0 output Play#0 1 1 39 pt patrol boat 10,-6 64% 0 1 0 0 0 0 0 0 103 40
Play#0 output Play#0 1 1 35 pt patrol boat 10,-6 66% 0 1 0 0 0 0 0 0 63 40
Play#0 output Play#0 1 1 36 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 82 40
Play#0 output Play#0 1 1 37 pt patrol boat 10,-6 80% 0 1 0 0 0 0 0 0 82 40
Play#0 output Play#0 1 1 38 pt patrol boat 11,-5 69% 0 0 0 0 0 0 0 0 117 40
Play#0 output Play#0 1 1 39 pt patrol boat 10,-6 64% 0 1 0 0 0 0 0 0 60 40
Play#0 output Play#0 1 1 50 pt patrol boat 1,1 100% 0 2 0 0 0 0 0 0 117 40
Play#0 output Play#0 1 1 51 pt patrol boat 4,0 100% 0 2 0 0 0 0 0 0 127 40
Play#0 output Play#0 1 1 52 pt patrol boat 2,0 100% 0 2 0 0 0 0 0 0 117 40
@ -1426,8 +1425,8 @@
Play#0 output Play#0 1 1 122 ms minesweeper 13,-3 100% 0 5 0 0 0 0 0 0 85 40
Play#0 output Play#0 1 1 128 ms minesweeper 11,-3 100% 0 5 0 0 0 0 0 0 -12 40
Play#0 output Play#0 1 1 129 ms minesweeper 10,-2 100% 0 5 0 0 0 0 0 0 99 40
Play#0 output Play#0 1 1 130 ms minesweeper 11,-5 43% 0 3 0 0 0 0 0 0 1 40
Play#0 output Play#0 1 1 131 ms minesweeper 11,-5 58% 0 3 0 0 0 0 0 0 20 40
Play#0 output Play#0 1 1 130 ms minesweeper 11,-5 43% 0 4 0 0 0 0 0 0 -11 40
Play#0 output Play#0 1 1 131 ms minesweeper 11,-5 66% 0 3 0 0 0 0 0 0 12 40
Play#0 output Play#0 1 1 135 pt patrol boat 11,-5 70% 0 1 0 0 0 0 0 0 82 40
Play#0 output Play#0 1 1 136 pt patrol boat 11,-5 69% 0 1 0 0 0 0 0 0 81 40
Play#0 output Play#0 1 1 137 pt patrol boat 11,-5 100% 0 2 0 0 0 0 0 0 117 40
@ -1444,8 +1443,8 @@
Play#0 output Play#0 1 122 ms 13,-3 100% 0 5 0 3 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 128 ms 11,-3 100% 0 5 0 5 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 129 ms 10,-2 100% 0 5 0 100 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 130 ms 11,-5 43% 0 3 0 10 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 131 ms 11,-5 58% 0 3 0 11 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 130 ms 11,-5 43% 0 4 0 9 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 131 ms 11,-5 66% 0 3 0 14 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 8 ships
Play#0 output Play#0 6 0 640
Play#0 input retr * ?rflags#0
@ -1494,14 +1493,14 @@
Play#0 output Play#0 1 1 24 tra train 2,2 100% 5 127 127 0 40 42% 0 0
Play#0 output Play#0 1 1 25 cav cavalry -5,3 100% 5 127 127 0 30 42% 0 0
Play#0 output Play#0 1 1 30 cav cavalry 7,5 100% 5 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 32 cav cavalry 7,5 87% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 32 cav cavalry 7,5 87% 1 0 78 0 30 42% 0 0
Play#0 output Play#0 1 1 33 cav cavalry 7,5 100% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 34 cav cavalry 7,5 86% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 35 cav cavalry 7,5 87% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 36 cav cavalry 7,5 78% 0 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 37 cav cavalry 7,5 90% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 38 cav cavalry 7,5 78% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 39 cav cavalry 7,5 84% 1 0 93 0 30 42% 0 0
Play#0 output Play#0 1 1 34 cav cavalry 7,5 86% 1 0 78 0 30 42% 0 0
Play#0 output Play#0 1 1 35 cav cavalry 7,5 87% 1 0 79 0 30 42% 0 0
Play#0 output Play#0 1 1 36 cav cavalry 8,6 78% 0 0 104 0 30 42% 0 0
Play#0 output Play#0 1 1 37 cav cavalry 7,5 90% 1 0 81 0 30 42% 0 0
Play#0 output Play#0 1 1 38 cav cavalry 7,5 78% 1 0 69 0 30 42% 0 0
Play#0 output Play#0 1 1 39 cav cavalry 7,5 84% 1 0 75 0 30 42% 0 0
Play#0 output Play#0 1 1 50 cav cavalry 11,3 100% 5 0 105 0 30 42% 0 0
Play#0 output Play#0 1 1 51 cav cavalry -1,3 100% 5 0 105 0 30 42% 0 0
Play#0 output Play#0 1 1 52 cav cavalry -3,3 100% 5 127 127 0 30 42% 0 0
@ -1537,7 +1536,7 @@
Play#0 output Play#0 1 1 120 eng engineer 2,0 100% 5 127 127 0 130 42% 0 0
Play#0 output Play#0 1 1 121 eng engineer 7,7 100% 5 0 52 0 130 42% 0 0
Play#0 output Play#0 1 1 128 eng engineer 9,7 100% 5 0 -23 0 130 42% 0 0
Play#0 output Play#0 1 1 130 eng engineer 8,6 94% 5 0 52 0 130 42% 0 0
Play#0 output Play#0 1 1 130 eng engineer 8,6 94% 5 0 48 0 130 42% 0 0
Play#0 output Play#0 1 1 131 eng engineer 8,6 96% 5 0 48 0 130 42% 0 0
Play#0 output Play#0 1 1 135 cav cavalry 8,6 100% 5 0 104 0 30 42% 0 0
Play#0 output Play#0 1 1 136 cav cavalry 8,6 100% 5 0 104 0 30 42% 0 0

2
tests/smoke/journal.log
View file

@ -12314,7 +12314,7 @@
Play#1 output Play#1 1 -4 - . . . . . . . . . . . . . -4
Play#1 output Play#1 1 -3 - . . . o . . . . . . . . . -3
Play#1 output Play#1 1 -2 . . o o c + t l . . o ? . ? . -2
Play#1 output Play#1 1 -1 - . . b m j h = = ) o ? ? ? . -1
Play#1 output Play#1 1 -1 - . . b m m h = = ) o ? ? ? . -1
Play#1 output Play#1 1 0 - - . j m m k . . . . ? ? ? ? 0
Play#1 output Play#1 1 1 - - . k m m j d . . . ? ? ? 1
Play#1 output Play#1 1 2 - - . i m k r w e ! . . ? ? 2