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

Shell/Bootstrap: improve network paralellism

Browse Source
This commit is contained in:
Grégoire Henry 2018-04-20 20:43:28 +02:00 committed by Benjamin Canou
parent 6e4b2eab47
commit f2db5ffde3
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib_shell/bootstrap_pipeline.ml
View File

@ -26,7 +26,7 @@ type t = {
fetched_headers: fetched_headers:
(Block_hash.t * Block_header.t) Lwt_pipe.t ; (Block_hash.t * Block_header.t) Lwt_pipe.t ;
fetched_blocks: fetched_blocks:
(Block_hash.t * Block_header.t * Operation.t list list) Lwt_pipe.t ; (Block_hash.t * Block_header.t * Operation.t list list tzresult Lwt.t) Lwt_pipe.t ;
(* HACK, a worker should be able to return the 'error'. *) (* HACK, a worker should be able to return the 'error'. *)
mutable errors: Error_monad.error list ; mutable errors: Error_monad.error list ;
} }
@ -115,6 +115,7 @@ let rec operations_fetch_worker_loop pipeline =
lwt_log_info "fetching operations of block %a from peer %a." lwt_log_info "fetching operations of block %a from peer %a."
Block_hash.pp_short hash Block_hash.pp_short hash
P2p_peer.Id.pp_short pipeline.peer_id >>= fun () -> P2p_peer.Id.pp_short pipeline.peer_id >>= fun () ->
let operations =
map_p map_p
(fun i -> (fun i ->
protect ~canceler:pipeline.canceler begin fun () -> protect ~canceler:pipeline.canceler begin fun () ->
@ -127,6 +128,7 @@ let rec operations_fetch_worker_loop pipeline =
lwt_log_info "fetched operations of block %a from peer %a." lwt_log_info "fetched operations of block %a from peer %a."
Block_hash.pp_short hash Block_hash.pp_short hash
P2p_peer.Id.pp_short pipeline.peer_id >>= fun () -> P2p_peer.Id.pp_short pipeline.peer_id >>= fun () ->
return operations in
protect ~canceler:pipeline.canceler begin fun () -> protect ~canceler:pipeline.canceler begin fun () ->
Lwt_pipe.push pipeline.fetched_blocks Lwt_pipe.push pipeline.fetched_blocks
(hash, header, operations) >>= return (hash, header, operations) >>= return
@ -159,6 +161,7 @@ let rec validation_worker_loop pipeline =
lwt_log_info "requesting validation for block %a from peer %a." lwt_log_info "requesting validation for block %a from peer %a."
Block_hash.pp_short hash Block_hash.pp_short hash
P2p_peer.Id.pp_short pipeline.peer_id >>= fun () -> P2p_peer.Id.pp_short pipeline.peer_id >>= fun () ->
operations >>=? fun operations ->
protect ~canceler:pipeline.canceler begin fun () -> protect ~canceler:pipeline.canceler begin fun () ->
Block_validator.validate Block_validator.validate
~canceler:pipeline.canceler ~canceler:pipeline.canceler
@ -193,9 +196,9 @@ let create
block_validator peer_id chain_db locator = block_validator peer_id chain_db locator =
let canceler = Lwt_canceler.create () in let canceler = Lwt_canceler.create () in
let fetched_headers = let fetched_headers =
Lwt_pipe.create ~size:(50, fun _ -> 1) () in Lwt_pipe.create ~size:(1024, fun _ -> 1) () in
let fetched_blocks = let fetched_blocks =
Lwt_pipe.create ~size:(50, fun _ -> 1) () in Lwt_pipe.create ~size:(128, fun _ -> 1) () in
let pipeline = { let pipeline = {
canceler ; canceler ;
block_header_timeout ; block_operations_timeout ; block_header_timeout ; block_operations_timeout ;