Commit b3159ec2 authored by Ralf Jung's avatar Ralf Jung

Merge branch 'fix_and_cinc' into 'master'

Fix and conditional increment example

See merge request !19
parents fcd5c1de 31b7db5f
Pipeline #17179 failed with stage
in 15 minutes and 17 seconds
......@@ -91,6 +91,7 @@ theories/hocap/lib/oneshot.v
theories/hocap/concurrent_runners.v
theories/hocap/parfib.v
theories/logatom/cinc.v
theories/logatom/treiber.v
theories/logatom/treiber2.v
theories/logatom/elimination_stack/hocap_spec.v
......
......@@ -9,6 +9,6 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris_examples"]
depends: [
"coq-iris" { (= "dev.2019-05-31.0.5c07c3be") | (= "dev") }
"coq-iris" { (= "dev.2019-06-03.2.b368c861") | (= "dev") }
"coq-autosubst" { = "dev.coq86" }
]
This diff is collapsed.
......@@ -365,10 +365,10 @@ Section atomic_snapshot.
wp_load. eauto.
Qed.
Definition val_list_to_bool (v : list val) : bool :=
Definition prophecy_to_bool (v : list (val * val)) : bool :=
match v with
| LitV (LitBool b) :: _ => b
| _ => false
| (_, LitV (LitBool b)) :: _ => b
| _ => false
end.
Lemma readPair_spec γ p :
......@@ -413,7 +413,7 @@ Section atomic_snapshot.
iMod "AU" as (xv yv) "[Hpair Hclose]".
rewrite /pair_content.
iDestruct (excl_sync with "Hp⚫ Hpair") as %[= -> ->].
destruct (val_list_to_bool proph_val) eqn:Hproph.
destruct (prophecy_to_bool proph_val) eqn:Hproph.
- (* prophecy value is predicting that timestamp has not changed, so we commit *)
(* committing AU *)
iMod ("Hclose" with "Hpair") as "HΦ".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment