From 22fd8e1c05e3fa8a823dba282b9feb71bc71b9a8 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Sat, 4 Mar 2017 22:15:27 -0800 Subject: [PATCH] arrangement set_timeout fix --- extraction/lockserv-seqnum/ocaml/LockServSeqNumArrangement.ml | 2 +- extraction/lockserv/ocaml/LockServArrangement.ml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extraction/lockserv-seqnum/ocaml/LockServSeqNumArrangement.ml b/extraction/lockserv-seqnum/ocaml/LockServSeqNumArrangement.ml index 5b02e7e..fe7208d 100644 --- a/extraction/lockserv-seqnum/ocaml/LockServSeqNumArrangement.ml +++ b/extraction/lockserv-seqnum/ocaml/LockServSeqNumArrangement.ml @@ -16,7 +16,7 @@ module LockServSeqNumArrangement (P : Params) = struct type client_id = int type res = (output list * state) * ((name * msg) list) type task_handler = name -> state -> res - type timeout_setter = name -> state -> float + type timeout_setter = name -> state -> float option let systemName = "Lock Server with Sequence Numbering" diff --git a/extraction/lockserv/ocaml/LockServArrangement.ml b/extraction/lockserv/ocaml/LockServArrangement.ml index 6ebd79d..12092d6 100644 --- a/extraction/lockserv/ocaml/LockServArrangement.ml +++ b/extraction/lockserv/ocaml/LockServArrangement.ml @@ -16,7 +16,7 @@ module LockServArrangement (P : Params) = struct type client_id = int type res = (output list * state) * ((name * msg) list) type task_handler = name -> state -> res - type timeout_setter = name -> state -> float + type timeout_setter = name -> state -> float option let systemName = "Lock Server" @@ -35,7 +35,7 @@ module LockServArrangement (P : Params) = struct let handleNet = fun dst src m s -> let open LockServ in Obj.magic ((lockServ_MultiParams P.num_clients).net_handlers (Obj.magic dst) (Obj.magic src) (Obj.magic m) (Obj.magic s)) - + let deserializeMsg = LockServSerialization.deserializeMsg let serializeMsg = LockServSerialization.serializeMsg