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

Shell: Avoid leak in distributed_db_functor worker loop

Browse Source
This commit is contained in:
Pierre Chambart 2018-06-26 19:58:40 +02:00
parent 8b8dcddd02
commit 3da1e56133
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib_shell/distributed_db_functors.ml
View File

@ -466,9 +466,10 @@ end = struct
(* TODO *) (* TODO *)
Lwt.return_unit Lwt.return_unit
let rec worker_loop state = let worker_loop state =
let shutdown = Lwt_canceler.cancelation state.canceler let shutdown = Lwt_canceler.cancelation state.canceler in
and timeout = compute_timeout state in let rec loop state =
let timeout = compute_timeout state in
Lwt.choose Lwt.choose
[ (state.events >|= fun _ -> ()) ; timeout ; shutdown ] >>= fun () -> [ (state.events >|= fun _ -> ()) ; timeout ; shutdown ] >>= fun () ->
if Lwt.state shutdown <> Lwt.Sleep then if Lwt.state shutdown <> Lwt.Sleep then
@ -479,7 +480,7 @@ end = struct
state.events >>= fun events -> state.events >>= fun events ->
state.events <- Lwt_pipe.pop_all state.queue ; state.events <- Lwt_pipe.pop_all state.queue ;
Lwt_list.iter_s (process_event state now) events >>= fun () -> Lwt_list.iter_s (process_event state now) events >>= fun () ->
worker_loop state loop state
else else
lwt_debug "timeout" >>= fun () -> lwt_debug "timeout" >>= fun () ->
let now = Unix.gettimeofday () in let now = Unix.gettimeofday () in
@ -518,7 +519,9 @@ end = struct
Hash.pp key P2p_peer.Id.pp_short peer) Hash.pp key P2p_peer.Id.pp_short peer)
request request
end requests Lwt.return_unit >>= fun () -> end requests Lwt.return_unit >>= fun () ->
worker_loop state loop state
in
loop state
let create param = let create param =
let state = { let state = {