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

P2p: more debug in P2p_connection.

Browse Source
This commit is contained in:
Grégoire Henry 2017-11-11 03:34:12 +01:00 committed by Benjamin Canou
parent d866b1bfa5
commit 5beb62c83e
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,19 +489,32 @@ let catch_closed_pipe f =
| exn -> fail (Exn exn) | exn -> fail (Exn exn)
end end
let write { writer } msg = let pp_json encoding ppf msg =
Format.pp_print_string ppf
(Data_encoding_ezjsonm.to_string
(Data_encoding.Json.construct encoding msg))
let write { writer ; conn } msg =
catch_closed_pipe begin fun () -> catch_closed_pipe begin fun () ->
debug "Sending message to %a: %a"
P2p_types.Peer_id.pp_short conn.info.peer_id (pp_json writer.encoding) msg ;
Lwt.return (Writer.encode_message writer msg) >>=? fun buf -> Lwt.return (Writer.encode_message writer msg) >>=? fun buf ->
Lwt_pipe.push writer.messages (buf, None) >>= return Lwt_pipe.push writer.messages (buf, None) >>= return
end end
let write_sync { writer } msg =
let write_sync { writer ; conn } msg =
catch_closed_pipe begin fun () -> catch_closed_pipe begin fun () ->
let waiter, wakener = Lwt.wait () in let waiter, wakener = Lwt.wait () in
debug "Sending message to %a: %a"
P2p_types.Peer_id.pp_short conn.info.peer_id (pp_json writer.encoding) msg ;
Lwt.return (Writer.encode_message writer msg) >>=? fun buf -> Lwt.return (Writer.encode_message writer msg) >>=? fun buf ->
Lwt_pipe.push writer.messages (buf, Some wakener) >>= fun () -> Lwt_pipe.push writer.messages (buf, Some wakener) >>= fun () ->
waiter waiter
end end
let write_now { writer } msg =
let write_now { writer ; conn } msg =
debug "Try sending message to %a: %a"
P2p_types.Peer_id.pp_short conn.info.peer_id (pp_json writer.encoding) msg ;
Writer.encode_message writer msg >>? fun buf -> Writer.encode_message writer msg >>? fun buf ->
try Ok (Lwt_pipe.push_now writer.messages (buf, None)) try Ok (Lwt_pipe.push_now writer.messages (buf, None))
with Lwt_pipe.Closed -> Error [P2p_io_scheduler.Connection_closed] with Lwt_pipe.Closed -> Error [P2p_io_scheduler.Connection_closed]