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

Shell/P2p: propagate all errors to {raw_,}write_sync.

Browse Source 
Those functions are only used in the testsuite.
This commit is contained in:
Grégoire Henry 2017-04-10 00:10:42 +02:00
parent c187a0b792
commit 413bddcd96
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/node/net/p2p_connection.ml
View File

@ -303,15 +303,8 @@ module Writer = struct
let rec worker_loop st = let rec worker_loop st =
Lwt_unix.yield () >>= fun () -> Lwt_unix.yield () >>= fun () ->
Lwt_utils.protect ~canceler:st.canceler begin fun () -> Lwt_utils.protect ~canceler:st.canceler begin fun () ->
Lwt_pipe.pop st.messages >>= fun (buf, wakener) -> Lwt_pipe.pop st.messages >>= return
lwt_debug "writing %d bytes to %a"
(MBytes.length buf) Connection_info.pp st.conn.info >>= fun () ->
Crypto.write_chunk st.conn.fd st.conn.cryptobox_data buf >>= fun res ->
iter_option wakener ~f:(fun u -> Lwt.wakeup_later u res) ;
Lwt.return res
end >>= function end >>= function
| Ok () ->
worker_loop st
| Error [Lwt_utils.Canceled | Exn Lwt_pipe.Closed] -> | Error [Lwt_utils.Canceled | Exn Lwt_pipe.Closed] ->
lwt_debug "connection closed to %a" lwt_debug "connection closed to %a"
Connection_info.pp st.conn.info >>= fun () -> Connection_info.pp st.conn.info >>= fun () ->
@ -322,6 +315,38 @@ module Writer = struct
Connection_info.pp st.conn.info pp_print_error err >>= fun () -> Connection_info.pp st.conn.info pp_print_error err >>= fun () ->
Canceler.cancel st.canceler >>= fun () -> Canceler.cancel st.canceler >>= fun () ->
Lwt.return_unit Lwt.return_unit
| Ok (buf, wakener) ->
lwt_debug "writing %d bytes to %a"
(MBytes.length buf) Connection_info.pp st.conn.info >>= fun () ->
Lwt_utils.protect ~canceler:st.canceler begin fun () ->
Crypto.write_chunk st.conn.fd st.conn.cryptobox_data buf
end >>= fun res ->
match res with
| Ok () ->
iter_option wakener ~f:(fun u -> Lwt.wakeup_later u res) ;
worker_loop st
| Error err ->
iter_option wakener
~f:(fun u ->
Lwt.wakeup_later u
(Error [P2p_io_scheduler.Connection_closed])) ;
match err with
| [ Lwt_utils.Canceled | Exn Lwt_pipe.Closed ] ->
lwt_debug "connection closed to %a"
Connection_info.pp st.conn.info >>= fun () ->
Lwt.return_unit
| [ P2p_io_scheduler.Connection_closed ] ->
lwt_debug "connection closed to %a"
Connection_info.pp st.conn.info >>= fun () ->
Canceler.cancel st.canceler >>= fun () ->
Lwt.return_unit
| err ->
lwt_log_error
"@[<v 2>error writing to %a@ %a@]"
Connection_info.pp st.conn.info
pp_print_error err >>= fun () ->
Canceler.cancel st.canceler >>= fun () ->
Lwt.return_unit
let run ?size conn encoding canceler = let run ?size conn encoding canceler =
let compute_size = function let compute_size = function
@ -336,6 +361,11 @@ module Writer = struct
} in } in
Canceler.on_cancel st.canceler begin fun () -> Canceler.on_cancel st.canceler begin fun () ->
Lwt_pipe.close st.messages ; Lwt_pipe.close st.messages ;
while not (Lwt_pipe.is_empty st.messages) do
let _, w = Lwt_pipe.pop_now_exn st.messages in
iter_option w
~f:(fun u -> Lwt.wakeup_later u (Error [Exn Lwt_pipe.Closed]))
done ;
Lwt.return_unit Lwt.return_unit
end ; end ;
st.worker <- st.worker <-
@ -451,3 +481,4 @@ let close ?(wait = false) st =
Writer.shutdown st.writer >>= fun () -> Writer.shutdown st.writer >>= fun () ->
P2p_io_scheduler.close st.conn.fd >>= fun _ -> P2p_io_scheduler.close st.conn.fd >>= fun _ ->
Lwt.return_unit Lwt.return_unit