balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Client/Context_unix: code style

Browse Source
This commit is contained in:
MBourgoin 2018-11-06 13:10:24 +01:00 committed by Grégoire Henry
parent 24355f0ae9
commit e35e263fd6
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib_client_base_unix/client_context_unix.ml
View File

@ -32,27 +32,25 @@ class unix_wallet ~base_dir : wallet = object (self)
base_dir base_dir
(Str.(global_replace (regexp_string " ") "_" alias_name) ^ "s") (Str.(global_replace (regexp_string " ") "_" alias_name) ^ "s")
method with_lock : type a. ( unit -> a Lwt.t) -> a Lwt.t = method with_lock : type a. (unit -> a Lwt.t) -> a Lwt.t =
(fun f -> (fun f ->
let unlock fd = let unlock fd =
let fd = Lwt_unix.unix_file_descr fd in let fd = Lwt_unix.unix_file_descr fd in
Unix.lockf fd Unix.F_ULOCK 0; Unix.lockf fd Unix.F_ULOCK 0 ;
Unix.close fd Unix.close fd in
in
let lock () = let lock () =
Lwt_unix.openfile (Filename.concat base_dir "wallet_lock") Lwt_unix.openfile (Filename.concat base_dir "wallet_lock")
Lwt_unix.[O_CREAT; O_WRONLY] 0o644 >>= fun fd -> Lwt_unix.[ O_CREAT ; O_WRONLY ] 0o644 >>= fun fd ->
Lwt_unix.lockf fd Unix.F_LOCK 0 >>= fun () -> Lwt_unix.lockf fd Unix.F_LOCK 0 >>= fun () ->
Lwt.return (fd,(Lwt_unix.on_signal Sys.sigint Lwt.return (fd, (Lwt_unix.on_signal Sys.sigint
(fun _s -> (fun _s ->
unlock fd; unlock fd ;
exit 0 (* exit code? *) ))) exit 0 (* exit code? *) ))) in
in lock () >>= fun (fd, sh) ->
lock () >>= fun (fd,sh) ->
(* catch might be useless if f always uses the error monad *) (* catch might be useless if f always uses the error monad *)
Lwt.catch f (function e -> Lwt.return (unlock fd; raise e)) >>= fun res -> Lwt.catch f (function e -> Lwt.return (unlock fd ; raise e)) >>= fun res ->
Lwt.return (unlock fd) >>= fun () -> Lwt.return (unlock fd) >>= fun () ->
Lwt_unix.disable_signal_handler sh; Lwt_unix.disable_signal_handler sh ;
Lwt.return res) Lwt.return res)
method load : type a. string -> default:a -> a Data_encoding.encoding -> a tzresult Lwt.t = method load : type a. string -> default:a -> a Data_encoding.encoding -> a tzresult Lwt.t =