wb analyse: fix trace-frequencies for oddly-structured messages & less clutter in logs

Author: deepfire

Diff for: bench/locli/src/Cardano/Analysis/API/Ground.hs

@@ -323,10 +323,9 @@ dumpObjects ident xs (JsonOutputFile f) = liftIO $ do
 dumpAssociatedObjects :: ToJSON a => String -> [(JsonLogfile, a)] -> ExceptT Text IO ()
 dumpAssociatedObjects ident xs = liftIO $
   flip mapConcurrently_ xs $
-    \(JsonLogfile f, x) -> do
-        progress ident (Q f)
-        withFile (replaceExtension f $ ident <> ".json") WriteMode $ \hnd ->
-          LBS.hPutStrLn hnd $ encode x
+    \(JsonLogfile f, x) ->
+      withFile (replaceExtension f $ ident <> ".json") WriteMode $ \hnd ->
+        LBS.hPutStrLn hnd $ encode x
 
 readAssociatedObjects :: forall a.
   FromJSON a => String -> [JsonLogfile] -> ExceptT Text IO [(JsonLogfile, a)]

Diff for: nix/workbench/analyse.sh

@@ -395,7 +395,7 @@ case "$op" in
                                              -e 'chain-rejecta.json'    \
                                              -e 'chain.json'
               ))
-        progress "analyse" "prettifying JSON data:  ${analysis_jsons[*]}"
+        progress "analyse" "prettifying JSON data:  ${#analysis_jsons[*]} files"
         time json_compact_prettify "${analysis_jsons[@]}"
         progress "output" "run:  $(white $run)  subdir:  $(yellow analysis)"
         ;;
@@ -537,7 +537,7 @@ case "$op" in
              --slurpfile         freqs "$adir"/logs-$mach.tracefreq.json
         done;;
 
-    trace-frequencies | trace-freq | freq )
+    trace-frequencies | trace-freq | freq | tf )
         local new_only= sargs=()
         while test $# -gt 0
         do case "$1" in
@@ -548,7 +548,7 @@ case "$op" in
         local logfile=${1:?$usage}; shift
 
 
-        trace_frequencies "$logfile" > "${logfile}.tracefreqs.json"
+        trace_frequencies_json "$logfile" > "${logfile}.tracefreqs.json"
 
         local src=$(wc -l <"$logfile")
         local res=$(cut -d' ' -f1 "${logfile}.trace-freqs" |
@@ -632,7 +632,10 @@ trace_frequencies_json() {
     jq 'reduce inputs as $line
           ( {};
             ( $line
-            | (try .ns[0] // .ns) + ":" + (.data.kind //.data.val.kind)
+            | (try .ns[0] // .ns)
+              + ":"
+              + (if .data | type != "object" then .data | type
+                else (.data.kind //.data.val.kind) end)
             )              as $key
           | (.[$key] // 0) as $acc
           | . + { "\($key)": ($acc + 1) }

Diff for: nix/workbench/run.sh

@@ -93,11 +93,11 @@ case "$op" in
         echo $global_rundir;;
 
     list-runs | runs | lsr )
-        local usage="USAGE: wb run $op [--on-remote | -or | -r]"
+        local usage="USAGE: wb run $op [--remote | -r]"
         local on_remote=
         while test $# -gt 0
         do case "$1" in
-               --on-remote | -or | -r ) on_remote='true';;
+               --remote | -r ) on_remote='true';;
                * ) msg "FATAL:  list, unknown flag '$1'"; usage_run;;
            esac; shift; done
 
@@ -109,14 +109,14 @@ case "$op" in
         fi;;
 
     list-remote | remote | lsrr ) ## Convenience alias for 'list'
-        run "${sargs[@]}" list --on-remote;;
+        run list --remote;;
 
     list-verbose | verb | lsrv )
-        local usage="USAGE: wb run $op [--on-remote | -or | -r] [--limit [N=10] | -n N]"
+        local usage="USAGE: wb run $op [--remote | -r] [--limit [N=10] | -n N]"
         local on_remote= limit=10
         while test $# -gt 0
         do case "$1" in
-               --on-remote | -or | -r ) on_remote='true';;
+               --remote | -r ) on_remote='true';;
                --limit | -n )           limit=$2; shift;;
                * ) msg "FATAL:  list-verbose, unknown flag '$1'"; usage_run;;
            esac; shift; done
@@ -129,14 +129,14 @@ case "$op" in
         fi;;
 
     list-verbose-remote | rverb | lsrvr ) ## Convenience alias for 'list-verbose'
-        run "${sargs[@]}" list-verbose --on-remote;;
+        run list-verbose --remote;;
 
     list-sets | sets | lss )
-        local usage="USAGE: wb run $op [--on-remote | -or | -r]"
+        local usage="USAGE: wb run $op [--remote | -r]"
         local on_remote=
         while test $# -gt 0
         do case "$1" in
-               --on-remote | -or | -r ) on_remote='true';;
+               --remote | -r ) on_remote='true';;
                * ) msg "FATAL:  list-sets, unknown flag '$1'"; usage_run;;
            esac; shift; done
 
@@ -148,7 +148,7 @@ case "$op" in
         fi;;
 
     list-sets-remote | rsets | lssr ) ## Convenience alias for 'list-sets'
-        run "${sargs[@]}" list-sets --on-remote;;
+        run list-sets --remote;;
 
     set-add | add | sa )
         local usage="USAGE: wb run $op NAME [RUN..]"
@@ -163,12 +163,12 @@ case "$op" in
              done);;
 
     run-or-set | ros )
-        local usage="USAGE: wb run $op [--query] [--on-remote | -or | -r] NAME"
+        local usage="USAGE: wb run $op [--query] [--remote | -r] NAME"
         local query= get_args=() on_remote=
         while test $# -gt 0
         do case "$1" in
                --try | --query ) get_args+=($1); query='true';;
-               --on-remote | -or | -r ) on_remote='true';;
+               --remote | -r ) on_remote='true';;
                --* ) msg "FATAL:  run-or-set, unknown flag '$1'"; usage_run;;
                * ) break;; esac; shift; done
 
@@ -619,7 +619,7 @@ EOF
         local usage="USAGE: wb run $op RUN.."
         local runs=() run
         for rs in $*
-        do runs+=($(run "${sargs[@]}" run-or-set --query --on-remote $rs || echo $rs))
+        do runs+=($(run "${sargs[@]}" run-or-set --query --remote $rs || echo $rs))
         done
         if test $# = 0; then runs=(current); fi
 

Diff for: nix/workbench/wb

@@ -84,7 +84,7 @@ usage_extra() {
           block-propagation          blockprop    bp
           performance                             perf
           performance-host           perf-host
-          trace-frequencies          trace-freq   freq
+          trace-frequencies          trace-freq   freq tf
           chain-rejecta-reasons      chain-rejecta   rejecta
 $(color white)
 EOF
@@ -308,7 +308,7 @@ main() {
         | block-propagation        | blockprop  | bp            \
         | performance                           | perf          \
         | performance-host         | perf-host                  \
-        | trace-frequencies        | trace-freq | freq          \
+        | trace-frequencies        | trace-freq | freq | tf     \
         | chain-rejecta-reasons    | chain-rejecta | rejecta    \
           )                       analyse $op         "$@";;