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

Shell/mempool: pretty-printing

Browse Source
This commit is contained in:
Raphaël Proust 2018-11-14 14:32:48 +08:00 committed by Benjamin Canou
parent c02a970a28
commit 7e81fe6c9c
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_shell/mempool_peer_worker.ml
View File

@ -68,7 +68,11 @@ module Make (Static: STATIC) (Mempool_worker: Mempool_worker.T)
| Mempool_result of Mempool_worker.result | Mempool_result of Mempool_worker.result
type output = result Operation_hash.Map.t type output = result Operation_hash.Map.t
let pp_input = Format.pp_print_list Operation_hash.pp let pp_input ppf input =
Format.fprintf ppf
"@[<v 0>%a@]"
(Format.pp_print_list Operation_hash.pp)
input
let result_encoding = let result_encoding =
let open Data_encoding in let open Data_encoding in
union union
@ -257,7 +261,11 @@ module Make (Static: STATIC) (Mempool_worker: Mempool_worker.T)
let encoding = let encoding =
let open Data_encoding in let open Data_encoding in
list Operation_hash.encoding list Operation_hash.encoding
let pp = Format.pp_print_list Operation_hash.pp let pp ppf os =
Format.fprintf ppf
"@[<v 2>Request:@,%a@]"
(Format.pp_print_list Operation_hash.pp)
os
end end
module Event = struct module Event = struct

35
src/lib_shell/mempool_worker.ml
View File

@ -126,6 +126,14 @@ module Make(Static: STATIC)(Proto: Registered_protocol.T)
(fun () -> Not_in_branch) ; (fun () -> Not_in_branch) ;
] ]
let pp_result ppf = function
| Applied _ -> Format.pp_print_string ppf "applied"
| Branch_delayed _ -> Format.pp_print_string ppf "branch delayed"
| Branch_refused _ -> Format.pp_print_string ppf "branch refused"
| Refused _ -> Format.pp_print_string ppf "refused"
| Duplicate -> Format.pp_print_string ppf "duplicate"
| Not_in_branch -> Format.pp_print_string ppf "not in branch"
let operation_encoding = let operation_encoding =
let open Data_encoding in let open Data_encoding in
conv conv
@ -211,15 +219,12 @@ module Make(Static: STATIC)(Proto: Registered_protocol.T)
| Debug msg -> Format.fprintf ppf "%s" msg | Debug msg -> Format.fprintf ppf "%s" msg
| Request (view, { pushed ; treated ; completed }, None) -> | Request (view, { pushed ; treated ; completed }, None) ->
Format.fprintf ppf Format.fprintf ppf
"@[<v 0>%a@,\ "@[<v 0>%a@,Pushed: %a, Treated: %a, Completed: %a@]"
Pushed: %a, Treated: %a, Completed: %a@]"
Request.pp view Request.pp view
Time.pp_hum pushed Time.pp_hum treated Time.pp_hum completed Time.pp_hum pushed Time.pp_hum treated Time.pp_hum completed
| Request (view, { pushed ; treated ; completed }, Some errors) -> | Request (view, { pushed ; treated ; completed }, Some errors) ->
Format.fprintf ppf Format.fprintf ppf
"@[<v 0>%a@,\ "@[<v 0>%a@,Pushed: %a, Treated: %a, Failed: %a@,Errors: %a@]"
Pushed: %a, Treated: %a, Failed: %a@,\
%a@]"
Request.pp view Request.pp view
Time.pp_hum pushed Time.pp_hum treated Time.pp_hum completed Time.pp_hum pushed Time.pp_hum treated Time.pp_hum completed
(Format.pp_print_list Error_monad.pp) errors (Format.pp_print_list Error_monad.pp) errors
@ -272,6 +277,17 @@ module Make(Static: STATIC)(Proto: Registered_protocol.T)
Operation.encoding Operation.encoding
) )
let pp break ppf table =
let open Format in
Operation_hash.Table.iter
(fun h (r, _) ->
fprintf ppf "Operation %a: %a"
Operation_hash.pp_short h
pp_result r;
break ppf
)
table
let create () = Operation_hash.Table.create 1000 let create () = Operation_hash.Table.create 1000
let add t parsed_op result = let add t parsed_op result =
@ -377,8 +393,13 @@ module Make(Static: STATIC)(Proto: Registered_protocol.T)
(fun cache -> { cache }) (fun cache -> { cache })
ValidatedCache.encoding ValidatedCache.encoding
let pp ppf _view = let pp ppf { cache } =
Format.fprintf ppf "lots of operations" ValidatedCache.pp
(fun ppf ->
Format.pp_print_string ppf ";";
Format.pp_print_space ppf ())
ppf
cache
end end