Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion specifications/FlashProtocol/APFlashWithMutex.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONSTANT
NODE <- NodeVal
DATA <- DataVal
Other <- OtherVal
Undefined <- UndefinedVal

INVARIANT
Expand Down
7 changes: 1 addition & 6 deletions specifications/FlashProtocol/APFlashWithMutex.tla
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ CONSTANTS
\* @type: Set(Str);
DATA,
\* @type: Str;
Other,
\* @type: Str;
Undefined

VARIABLES
Expand Down Expand Up @@ -57,9 +55,7 @@ VARIABLES
\* @type: Str;
FwdCmd,
\* @type: Str;
FwdSrc,
\* @type: Bool;
Env_o
FwdSrc

\* Both components of the variable group are strings, which the type checker
\* cannot tell apart from a two-element sequence. The group is shadowed here
Expand All @@ -77,7 +73,6 @@ INSTANCE FlashWithMutex
\* Concrete values for the constants used by APFlashWithMutex.cfg.
NodeVal == { "n1", "n2" }
DataVal == { "d1", "d2" }
OtherVal == "Other"
UndefinedVal == "Undefined"

==============================================================================
469 changes: 76 additions & 393 deletions specifications/FlashProtocol/FlashWithMutex.tla

Large diffs are not rendered by default.

410 changes: 410 additions & 0 deletions specifications/FlashProtocol/FlashWithMutexCMP.tla

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion specifications/FlashProtocol/MCFlashWithMutex.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONSTANTS
NODE = {n1, n2}
DATA = {d1, d2}
Other = Other
Undefined = Undefined

SYMMETRY Symmetry
Expand Down
4 changes: 2 additions & 2 deletions specifications/FlashProtocol/MCFlashWithMutex.tla
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
------------------------- MODULE MCFlashWithMutex -------------------------
EXTENDS FlashWithMutex, TLC

\* Nodes and data values are independently interchangeable. The Other and
\* Undefined sentinels are fixed because they are outside these sets.
\* Nodes and data values are independently interchangeable. The Undefined
\* sentinel is fixed because it is outside these sets.
Symmetry == Permutations(NODE) \union Permutations(DATA)

==============================================================================
1 change: 0 additions & 1 deletion specifications/FlashProtocol/MCFlashWithMutexLive.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONSTANTS
NODE = {n1, n2}
DATA = {d1, d2}
Other = Other
Undefined = Undefined

SPECIFICATION FairSpec
Expand Down
23 changes: 14 additions & 9 deletions specifications/FlashProtocol/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@
"features": [],
"models": []
},
{
"path": "specifications/FlashProtocol/FlashWithMutexCMP.tla",
"features": [],
"models": []
},
{
"path": "specifications/FlashProtocol/APFlashWithMutex.tla",
"features": [],
"models": [
{
"path": "specifications/FlashProtocol/APFlashWithMutex.cfg",
"runtime": "00:38:09",
"runtime": "00:00:44",
"mode": "symbolic",
"result": "success"
}
Expand All @@ -32,12 +37,12 @@
"models": [
{
"path": "specifications/FlashProtocol/MCFlashWithMutex.cfg",
"runtime": "00:00:04",
"runtime": "00:00:01",
"mode": "exhaustive search",
"result": "success",
"distinctStates": 32994,
"totalStates": 159216,
"stateDepth": 34
"distinctStates": 2024,
"totalStates": 7552,
"stateDepth": 21
}
]
},
Expand All @@ -47,12 +52,12 @@
"models": [
{
"path": "specifications/FlashProtocol/MCFlashWithMutexLive.cfg",
"runtime": "00:04:44",
"runtime": "00:00:15",
"mode": "exhaustive search",
"result": "success",
"distinctStates": 131976,
"totalStates": 636852,
"stateDepth": 34,
"distinctStates": 8096,
"totalStates": 30196,
"stateDepth": 21,
"workers": 4
}
]
Expand Down
Loading