From f71187c7750be7a5e2a48c9cac265804b4e3dd42 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 2 Nov 2011 21:40:31 -0700 Subject: [PATCH] tools.profiler.sampling: twiddle output format --- basis/tools/profiler/sampling/sampling.factor | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/basis/tools/profiler/sampling/sampling.factor b/basis/tools/profiler/sampling/sampling.factor index ab23f5be85..f9ccfd24d9 100644 --- a/basis/tools/profiler/sampling/sampling.factor +++ b/basis/tools/profiler/sampling/sampling.factor @@ -4,7 +4,7 @@ combinators.short-circuit continuations fry generalizations hashtables.identity io kernel kernel.private locals math math.statistics math.vectors memory namespaces prettyprint sequences sequences.generalizations sets sorting -tools.profiler.sampling.private ; +tools.profiler.sampling.private math.parser.private ; FROM: sequences => change-nth ; FROM: assocs => change-at ; IN: tools.profiler.sampling @@ -136,27 +136,26 @@ TUPLE: profile-node get-raw-profile-data (flat) ; : depth. ( depth -- ) - [ " " write ] times ; + [ "| " write ] times ; : by-total-time ( nodes -- nodes' ) >alist [ second total-time>> ] inv-sort-with ; : duration. ( duration -- ) - samples-per-second get-global { - { [ dup 1000 <= ] [ drop duration>milliseconds >integer pprint "ms" write ] } - { [ dup 1,000,000 <= ] [ drop duration>microseconds >integer pprint "µs" write ] } - [ drop duration>nanoseconds >integer pprint "ns" write ] - } cond ; + duration>milliseconds >float "%9.1fms" format-float write ; + +: percentage. ( num denom -- ) + [ duration>seconds ] bi@ [ 100 * ] dip /f "%6.2f%%" format-float write ; DEFER: (profile.) : times. ( node -- ) { [ total-time>> duration. ] - [ " (GC:" write gc-time>> duration. ] - [ ", JIT:" write jit-time>> duration. ] - [ ", FFI:" write foreign-time>> duration. ] - [ ", FT:" write foreign-thread-time>> duration. ")" write ] + [ " (GC:" write [ gc-time>> ] [ total-time>> ] bi percentage. ] + [ ", JIT:" write [ jit-time>> ] [ total-time>> ] bi percentage. ] + [ ", FFI:" write [ foreign-time>> ] [ total-time>> ] bi percentage. ] + [ ", FT:" write [ foreign-thread-time>> ] [ total-time>> ] bi percentage. ")" write ] } cleave ; :: (profile-node.) ( word node depth -- )