Simplify algorithm: remove count, unused if statement
This commit is contained in:
Nicholas Kariniemi
parent
a003fc9db7
commit
e9c006281a
1 changed files with 40 additions and 128 deletions
168
csp/sync.csp
168
csp/sync.csp
|
|
@ -1,55 +1,47 @@
|
|||
NUM_CLIENTS = 2
|
||||
NUM_DB_STATES = 10
|
||||
NUM_CLIENT_COUNTS = 10
|
||||
CLIENTS = {0..NUM_CLIENTS-1}
|
||||
TIMES = {0..NUM_DB_STATES-1}
|
||||
COUNT = {0..NUM_CLIENT_COUNTS-1}
|
||||
|
||||
channel input:CLIENTS
|
||||
channel save:CLIENTS
|
||||
channel render:CLIENTS.TIMES.COUNT
|
||||
channel up:CLIENTS.TIMES.COUNT
|
||||
channel down:CLIENTS.TIMES.COUNT.TIMES
|
||||
channel bufdown:CLIENTS.TIMES.COUNT.TIMES
|
||||
channel render:CLIENTS.TIMES
|
||||
channel up:CLIENTS.TIMES
|
||||
channel down:CLIENTS.TIMES.TIMES
|
||||
channel bufdown:CLIENTS.TIMES.TIMES
|
||||
channel saved:CLIENTS.TIMES
|
||||
channel bufsaved:CLIENTS.TIMES
|
||||
|
||||
next_t(t) = (t + 1) % NUM_DB_STATES
|
||||
next_count(count) = (count + 1) % NUM_CLIENT_COUNTS
|
||||
|
||||
CLIENT(i, t, count) =
|
||||
CLIENT(i, t) =
|
||||
input!i
|
||||
-> render!i!t!next_count(count)
|
||||
-> up!i!t!next_count(count)
|
||||
-> CLIENT'(i, t, next_count(count))
|
||||
[] CLIENT'(i, t, count)
|
||||
-> render!i!t
|
||||
-> up!i!t
|
||||
-> CLIENT'(i, t)
|
||||
[] CLIENT'(i, t)
|
||||
|
||||
CLIENT'(i, t, count) = bufdown!i?client_t?client_count?server_t
|
||||
-> if t == client_t and count == client_count -- No changes on our side since
|
||||
then
|
||||
render!i!server_t!0
|
||||
-> CLIENT(i, server_t, 0) -- We are now in sync with server at time server_t
|
||||
else -- We had changes since so we are out of sync
|
||||
render!i!server_t!1
|
||||
-> up!i!server_t!1
|
||||
-> CLIENT(i, server_t, 1)
|
||||
CLIENT'(i, t) =
|
||||
bufdown!i?client_t?server_t
|
||||
-> render!i!server_t
|
||||
-> CLIENT(i, server_t)
|
||||
|
||||
DOWNBUF(i) = down!i?client_t?client_count?server_t -> DOWNBUF'(i, client_t, client_count, server_t)
|
||||
DOWNBUF'(i, client_t, client_count, server_t) =
|
||||
down!i?client_t'?client_count'?server_t' -> DOWNBUF'(i, client_t', client_count', server_t')
|
||||
[] bufdown!i!client_t!client_count!server_t -> DOWNBUF(i)
|
||||
DOWNBUF(i) = down!i?client_t?server_t -> DOWNBUF'(i, client_t, server_t)
|
||||
DOWNBUF'(i, client_t, server_t) =
|
||||
down!i?client_t'?server_t' -> DOWNBUF'(i, client_t', server_t')
|
||||
[] bufdown!i!client_t!server_t -> DOWNBUF(i)
|
||||
|
||||
SERVER(i, client_t, count) =
|
||||
up!i?server_t?client_count
|
||||
SERVER(i, client_t) =
|
||||
up!i?server_t
|
||||
-> save!i
|
||||
-> saved!i?new_server_t
|
||||
-> down!i!server_t!client_count!new_server_t
|
||||
-> SERVER(i, new_server_t, 0)
|
||||
-> down!i!server_t!new_server_t
|
||||
-> SERVER(i, new_server_t)
|
||||
[] bufsaved?j:diff(CLIENTS,{i})?new_server_t
|
||||
-> if new_server_t == client_t
|
||||
then SERVER(i, client_t, count)
|
||||
else down!i!client_t!count!new_server_t
|
||||
-> SERVER(i, new_server_t, 0)
|
||||
then SERVER(i, client_t)
|
||||
else down!i!client_t!new_server_t
|
||||
-> SERVER(i, new_server_t)
|
||||
|
||||
SAVEDBUF(i) = saved?j:diff(CLIENTS,{i})?t -> SAVEDBUF'(i, j, t)
|
||||
SAVEDBUF'(i, j, t) = saved?j':diff(CLIENTS,{i})?new_t -> SAVEDBUF'(i, j', new_t)
|
||||
|
|
@ -59,116 +51,36 @@ DB(t) = save?i
|
|||
-> saved!i!next_t(t)
|
||||
-> DB(next_t(t))
|
||||
|
||||
CONN(i, t0) = (CLIENT(i, t0, 0) [|{| bufdown.i |}|] DOWNBUF(i)) [|{| up.i, down.i |}|] (SERVER(i, t0, 0) [|{| bufsaved |}|] SAVEDBUF(i))
|
||||
CONN(i, t0) = (CLIENT(i, t0) [|{| bufdown.i |}|] DOWNBUF(i)) [|{| up.i, down.i |}|] (SERVER(i, t0) [|{| bufsaved |}|] SAVEDBUF(i))
|
||||
SYSTEM = (CONN(0,0) [|{| save.0, saved |}|] DB(0)) [|{| save.1, saved |}|] CONN(1,0)
|
||||
|
||||
|
||||
-----------------------------------------
|
||||
-- Assertions
|
||||
-----------------------------------------
|
||||
|
||||
assert SYSTEM :[deadlock free [F]]
|
||||
assert SYSTEM :[divergence-free]
|
||||
|
||||
|
||||
-----------------------------------------
|
||||
-- Simple sync: one change will sync to other client
|
||||
-----------------------------------------
|
||||
|
||||
-- Suppose we limit our specification to say that each
|
||||
-- user makes a finite number of changes n.
|
||||
LimitedInputs(0) = STOP
|
||||
LimitedInputs(n) = input?i -> LimitedInputs(n-1)
|
||||
|
||||
-- Here is a system that is limited to 3 inputs per client:
|
||||
LimitedSystem = LimitedInputs(3) [|{| input |}|] SYSTEM
|
||||
|
||||
-- We can check first that this limited system is clear of deadlock.
|
||||
|
||||
assert LimitedSystem :[deadlock free [F]]
|
||||
assert LimitedSystem :[divergence-free]
|
||||
|
||||
-- It should have deadlock because we forced it to stop after x moves. The deadlock should not occur in fewer than that many inputs, though.
|
||||
|
||||
-- Should it be divergence free? It should be divergence free because it has no tau events. Divergence means refusing to engage in any visible events indefinitely but not refusing all events at any point.
|
||||
|
||||
|
||||
-- To diverge means to engage in tau events such that the events we care about can never occur.
|
||||
-- E.g. if we hide all the events we don't care about, like inputs and all renders until the last ones,
|
||||
-- we could check to see if the system is divergence free at the end.
|
||||
|
||||
-- Suppose we take our limited system and hide everything except the final renders. If we allow 3
|
||||
-- inputs, both clients should eventually render the latest server state with no changes of their own
|
||||
-- i.e. engage in events render.0.3.0 and render.1.3.0
|
||||
assert LimitedSystem \diff(Events, {render.0.3.0, render.1.3.0}) :[divergence-free]
|
||||
|
||||
-- If this limited system is free of divergence, then it will never wind up in a state where it keeps
|
||||
-- engaging in other events we don't care about, but instead will engage in the events we do care about
|
||||
-- and stop (?).
|
||||
|
||||
-- Let's make this even simpler first. Let's allow only one change.
|
||||
OneInput = LimitedInputs(1) [|{| input |}|] SYSTEM
|
||||
|
||||
-- Can we prove our one change MUST be synced?
|
||||
assert OneInput \diff(Events, {render.0.1.0, render.1.1.0}) :[divergence-free]
|
||||
|
||||
-- This does not diverge. I think this means that the OneInput system MUST, in all possible paths, engage in our two events and then stop. Or does it mean this? What if it only engaged in one and then stopped? To diverge means to get into a loop of engaging in tau events. What if it just stops immediately? Isn't that divergence free?
|
||||
|
||||
-- Can we make a system such that it will stop only if it is in sync at some point? And
|
||||
|
||||
-- Can we make a system such that it will stop unless it is in sync at some point and goes into an infinite loop? Then if we show that in all cases it is free of deadlocks i.e. in all cases it must be in sync at some point.
|
||||
|
||||
-- We can also make assertions about one process refining another e.g.
|
||||
-- assert SPEC [m= SYSTEM where m=(TFRV)D?
|
||||
|
||||
-- If SPEC [FD= SYSTEM, then all traces of SYSTEM are contained within the traces of SPEC, all failures of SYSTEM ...
|
||||
|
||||
SYNC = render.0.1.0 -> render.1.1.0 -> STOP
|
||||
[] render.1.1.0 -> render.0.1.0 -> STOP
|
||||
|
||||
SYNC2 = input.0 -> render.0.1.0 -> render.1.1.0 -> STOP
|
||||
[] input.0 -> render.1.1.0 -> render.0.1.0 -> STOP
|
||||
[] input.1 -> render.0.1.0 -> render.1.1.0 -> STOP
|
||||
[] input.1 -> render.1.1.0 -> render.0.1.0 -> STOP
|
||||
|
||||
assert SYNC2 [T= SYSTEM
|
||||
|
||||
-- i.e. it is POSSIBLE for our system to behave like SYNC2 (passes)
|
||||
|
||||
assert SYNC2 [F= SYSTEM
|
||||
|
||||
-- i.e. our system MUST behave like SYNC2
|
||||
assert SYNC2 [FD= SYSTEM
|
||||
|
||||
-- This fails for several reasons. 1) It is possible for our system to do e.g. input.0 -> input.1, which is not allowed by SYNC2. 2) It is possible for our system to keep taking input. We have no guarantees about consistency so a final sync could happen infinitely later. Actually, we can't guarantee our system is EVER in sync because a user could keep putting in input before sync responses are ever received. Or wait. Is that actually true? We don't accept further input until sync happens....
|
||||
|
||||
-- Suppose we limit inputs to client 0, then try this again.
|
||||
-- Suppose we limit inputs to client 0.
|
||||
|
||||
ClientInputs(i) = input!i -> ClientInputs(i)
|
||||
ClientZeroInput = ClientInputs(0) [|{| input |}|] SYSTEM
|
||||
|
||||
-- Our specification says: if we input something, then both sides must render that something i.e. they are both synced. Order doesn't matter.
|
||||
|
||||
SyncOneInput = input.0 -> render.0.0.1 -> (render.0.1.0 -> render.1.1.0 -> STOP []
|
||||
render.1.1.0 -> render.0.1.0 -> STOP)
|
||||
|
||||
-- Now if this specification is a failures/divergences refinement of our system, then the system must behave like our refinement. We limit our system to only take inputs from client zero. Expectation: this will pass. We do not allow more inputs from client zero until their input has been ACKed. Oh wait. But it is possible that this input is ACKed, then we push out more input, and the other side doesn't get synced until after our second change makes it.
|
||||
assert SyncOneInput [FD= ClientZeroInput \diff(Events, {input.0, render.0.0.1, render.1.1.0})
|
||||
|
||||
-- So let's make it even more trivial. We limit the number of inputs to 1, too.
|
||||
|
||||
OneInputFromClientZero = (ClientZeroInput [|{| input |}|] LimitedInputs(1))
|
||||
assert SyncOneInput [FD= OneInputFromClientZero \diff(Events, {input.0, render.0.0.1, render.1.1.0})
|
||||
|
||||
-- Now, we want to show that given these constraints, when a change comes in on client 0, the change will be rendered on both client 0 and client 1.
|
||||
|
||||
-- This is like writing a unit test but much much more powerful. We are doing a simple test: given one input from client zero, both sides must come into sync IN ALL POSSIBLE SEQUENCES OF EVENTS. That is, regardless of timing of events, it must hold.
|
||||
-- Update: this actually failed, because our specification is too strong. The spec says after input.0 -> render.0.0.1 we must be able to accept either ordering of rendering events. Our implementation, however, can get into a state where only one sequence of events is possible. So we need to loosen our specification or our assertion to say OK, that's fine, as long as one of these sequences occurs.
|
||||
|
||||
-- Do these fail?
|
||||
assert SyncOneInput [T= OneInputFromClientZero \diff(Events, {input.0, render.0.0.1, render.1.1.0})
|
||||
|
||||
-- This succeeds, meaning it is POSSIBLE for the constrained implementation to behave like our spec.
|
||||
|
||||
assert SyncOneInput [F= OneInputFromClientZero \diff(Events, {input.0, render.0.0.1, render.1.1.0})
|
||||
|
||||
-- This fails with the same example as the FD refinement.
|
||||
-- What if we add nondeterminism?
|
||||
|
||||
SyncOneInputNondeterm = input.0 -> render.0.0.1 -> (render.0.1.0 -> render.1.1.0 -> STOP |~|
|
||||
render.1.1.0 -> render.0.1.0 -> STOP)
|
||||
assert SyncOneInputNondeterm [FD= OneInputFromClientZero \diff(Events, {input.0, render.0.0.1, render.1.1.0, render.0.1.0})
|
||||
|
||||
-- I.e. you don't have to accept both options at the same points, you just have to nondeterministically choose one of the options in all cases. That would be good enough for me. Expectation: this should succeed.
|
||||
-- Result: fails. Our spec assumes that following a render event, the other render event must be in the allowed acceptances. The implementation does not necessarily have this.
|
||||
-- But is this a bug? What does it mean for something to have this event in their acceptances? Does it just mean they can accept it at that point? We don't need to be that strong, we just need to say hey, accept it at SOME point after.
|
||||
-- Update: it was a specification bug. We had missed specifying our third render event. So I think the acceptance set here means it will accept that event at some point. This assertion now passes. We have written one comprehensive unit test.
|
||||
SyncOneInputNondeterm = input.0 -> render.0.0 -> (render.0.1 -> render.1.1 -> STOP |~|
|
||||
render.1.1 -> render.0.1 -> STOP)
|
||||
assert SyncOneInputNondeterm [FD= OneInputFromClientZero \diff(Events, {input.0, render.0.0, render.0.1, render.1.1})
|
||||
Loading…
Reference in a new issue