chiark / gitweb /
Ian Jackson [Sat, 3 Apr 2021 17:34:06 +0000 (18:34 +0100)]
at: Do not any longer tolerate JS errors on game reset
This is all supposed to be sorted now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:06:30 +0000 (20:06 +0100)]
at, wdt: Some log formatting improvements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 19:03:23 +0000 (20:03 +0100)]
wdriver: Put js logs in their own files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:42:34 +0000 (19:42 +0100)]
wdriver: Pass DirSubst to JsLogfile::open
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:39:46 +0000 (19:39 +0100)]
wdriver: Refactor types surrounding JsLogfile
Nothing substantially changed yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:18:14 +0000 (19:18 +0100)]
wdriver: Rename fetch_js_log
This is different to the in-game log.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:12:47 +0000 (12:12 +0100)]
wdt: Fix load race (tidy up)
Get rid of the delay-for-testing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:11:53 +0000 (12:11 +0100)]
wdt: Fix load race
With the sleep this fails before, and passes afterwards.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 18:14:36 +0000 (19:14 +0100)]
wdt: Introduce a vpid cache
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:53:08 +0000 (12:53 +0100)]
wdt, at: Use vpid mapping everywhere, rather than hardcoded
Races can affect the vpid layout! This fixes flakiness in the tests.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 17:45:08 +0000 (18:45 +0100)]
apitest: Provide PlayerId everywhere
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 17:43:50 +0000 (18:43 +0100)]
apitest: Make setup_statuc_users not take a mut
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 17:32:54 +0000 (18:32 +0100)]
apitest: Make setup_static_users less lifetimes-entangled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 17:21:39 +0000 (18:21 +0100)]
apitest: Make MgmtConn a RefCell
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 17:06:45 +0000 (18:06 +0100)]
apitest: Make mgmt_conn be ForGame
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 15:47:57 +0000 (16:47 +0100)]
cmdlistener: Break out pieceid_lookup
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 15:28:20 +0000 (16:28 +0100)]
cmdlistener: Introduce no_updates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 15:19:06 +0000 (16:19 +0100)]
cmdlistener: pieceid lookup commands
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:52:53 +0000 (12:52 +0100)]
wdt: Test reload too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 11:52:40 +0000 (12:52 +0100)]
api: Some trace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 16:58:19 +0000 (17:58 +0100)]
updates: Replace *_nc functions, pass IsResponseToClientOp around
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 16:46:42 +0000 (17:46 +0100)]
clear log, including piece moves, on game reset
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 01:23:49 +0000 (02:23 +0100)]
wdt: altergame move test, works
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 01:16:09 +0000 (02:16 +0100)]
wdt: altermove test, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 02:43:14 +0000 (03:43 +0100)]
wdt: Improve/fix some JS logging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 4 Apr 2021 01:39:15 +0000 (02:39 +0100)]
js: Fix a missing bit of pieceops.Insert
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 16:14:32 +0000 (17:14 +0100)]
organise: recover order
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 14:39:15 +0000 (15:39 +0100)]
organise: Include Pos in PrimaryEnt
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 14:36:15 +0000 (15:36 +0100)]
organise: Introduce PrimaryEnt (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 14:17:12 +0000 (15:17 +0100)]
Revert "organise: Swap piece and bbox"
We don't actually want this, because we're going to have to do
something way more complicated.
This reverts commit
d6d21588b29f5dcfd4089b39277807ad38b98aec.
Ian Jackson [Sat, 3 Apr 2021 10:45:14 +0000 (11:45 +0100)]
organise: Swap piece and bbox
This will make the sort work nicely.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:43:37 +0000 (11:43 +0100)]
organise: Set Z levels
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 01:04:01 +0000 (02:04 +0100)]
Note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:24:03 +0000 (11:24 +0100)]
Note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:16:25 +0000 (11:16 +0100)]
shapelib: Change piece bbox rounding
This is causing things not to fit into hands. I don't think this
rounding up is actually necessary; it was just an abundance of
caution.
This deals with a todo.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:09:29 +0000 (11:09 +0100)]
organise: Improve debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:09:39 +0000 (11:09 +0100)]
geometry: Provide Rect::size()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:04:01 +0000 (11:04 +0100)]
Note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 09:57:34 +0000 (10:57 +0100)]
Note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:50:58 +0000 (03:50 +0100)]
Note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:48:42 +0000 (03:48 +0100)]
organise: Adjust overlaps, introduce AbutCompr
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 10:02:09 +0000 (11:02 +0100)]
organise: Improve debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 09:47:11 +0000 (10:47 +0100)]
organise: Provide debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:44:16 +0000 (03:44 +0100)]
organise: Fix a typo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:03:34 +0000 (03:03 +0100)]
organise: Use our wrc, not the client's
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 01:58:02 +0000 (02:58 +0100)]
organise: Note some bugs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 22:35:38 +0000 (23:35 +0100)]
organise: Introduce new functionality
It still has some bugs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 22:35:29 +0000 (23:35 +0100)]
hidden: Provide fully_visible_to
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:39:58 +0000 (03:39 +0100)]
updates: Send xupdates without by_client
This was fundamentally wrong.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 3 Apr 2021 02:28:30 +0000 (03:28 +0100)]
updates: abolish Vec part of UpdateFromOpComplex
This is redundant.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 22:44:54 +0000 (23:44 +0100)]
utils: Many fixes to want_let
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 22:15:03 +0000 (23:15 +0100)]
hand: Rename Behaviour (from Sort)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:48:31 +0000 (21:48 +0100)]
movehist: Provide key for adjusting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 22:00:39 +0000 (23:00 +0100)]
movehist: Show on reload
Move the data from Session to DataLoad where it should have been all
alone, and actually use it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:54:40 +0000 (22:54 +0100)]
movehist: Abbreviate many names
Now this is a module, this is nicer.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:43:24 +0000 (21:43 +0100)]
movehist: Actually display in JS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:41:52 +0000 (22:41 +0100)]
movehist: Provide move len in update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:24:33 +0000 (22:24 +0100)]
movehist: Send updates only on "significant" changes
Currently this is just movement.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 23:04:01 +0000 (00:04 +0100)]
js: Do not unconditionally set gen_update_hook
When we reload, can bust the tests, as the hook gets overwritten.
I think.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:47:28 +0000 (21:47 +0100)]
movehist: Provide marker element
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:34:21 +0000 (21:34 +0100)]
movehist: Rework a bit and provide more to JS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:53:46 +0000 (20:53 +0100)]
movehist: Move LENS etc. to otter, out of base
We're going to send this as literals, not via wasm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:51:41 +0000 (20:51 +0100)]
movehist: Plumb lens through to js
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:43:02 +0000 (21:43 +0100)]
js: piece_xy: Make it return Pos
Just tidying up.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:41:38 +0000 (22:41 +0100)]
geometry: Provide len
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:16:24 +0000 (22:16 +0100)]
geometry: Promote len2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:15:57 +0000 (22:15 +0100)]
geometry: Promote PosPromote to a trait
And provide for f64
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:36:01 +0000 (20:36 +0100)]
movehist: script: wip record
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:32:08 +0000 (20:32 +0100)]
script: Introduce CompassAngle alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:27:30 +0000 (20:27 +0100)]
script: Add a note about MovementRecord
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:19:31 +0000 (20:19 +0100)]
movehist: Send out in Session
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:03:05 +0000 (20:03 +0100)]
movehist: Move into its own module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:54:20 +0000 (17:54 +0100)]
updates: Move PUE_P alias into prelude
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:38:26 +0000 (12:38 +0100)]
movehost: Send updates.
Just a stub to receive them, right now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:22:55 +0000 (17:22 +0100)]
Provide insert() and remove() on SparseSecondaryEntry
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:14:56 +0000 (20:14 +0100)]
want: Let variants be paths
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:56:08 +0000 (17:56 +0100)]
if_let: Let variants be paths
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:38:21 +0000 (16:38 +0100)]
want: Delete obsolete commented-out code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:35:32 +0000 (16:35 +0100)]
OldNew: Make it Serialize and Deserialize
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:33:39 +0000 (16:33 +0100)]
want: further tidying and nice-ifying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:57:46 +0000 (13:57 +0100)]
want: Use new arrangements in hidden
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:57:20 +0000 (13:57 +0100)]
want: Provide wants!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:56:47 +0000 (13:56 +0100)]
want: Remove some clutter from invocations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:55:01 +0000 (13:55 +0100)]
want: Fix extra debug case
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:43:10 +0000 (13:43 +0100)]
want: Use a few more times
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:41:29 +0000 (13:41 +0100)]
want: Provide new facilities and use them in one place
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:39:56 +0000 (13:39 +0100)]
InternalLogicError: Provide new() and tolerate()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:39:40 +0000 (13:39 +0100)]
if_let: Slight formatting adjustment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 10:34:37 +0000 (11:34 +0100)]
Use Void, not ad-hoc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 10:33:00 +0000 (11:33 +0100)]
Use Void, not our own
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:59:53 +0000 (12:59 +0100)]
introduce if_let!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:40:02 +0000 (12:40 +0100)]
updates: Provide facehint in PreparedUpdateEntry
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:02:31 +0000 (12:02 +0100)]
gamestate: Fix a style nit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:15:35 +0000 (16:15 +0100)]
wdt-hand: Add a missing synch
Experimentally, pausing otter to simulate losing the race gives us a
conflict error. This is kind of expected.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:10:47 +0000 (16:10 +0100)]
apitest: Provide OtterPauseable etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 14:58:30 +0000 (15:58 +0100)]
apitest: Move OtterPaused from wdt-simple
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:57:47 +0000 (11:57 +0100)]
html, SvgAttrs: Change type of SvgAttrs
Amazingly this seems to *save* 2k of wasm code.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:52:29 +0000 (11:52 +0100)]
html: Move to otter-base
No uses yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:29:51 +0000 (11:29 +0100)]
cmd updates: Centralise St::flush.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:05:38 +0000 (11:05 +0100)]
cmd updates: Shuffle some variables
For neatness and clarity.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>