add fsrd-changes and fswr-changes builtin queries

Author: fmaste

bench/stdout-tools/app/tq.hs

@@ -77,6 +77,8 @@ cliFunctionReader str = case str of
   "heap-changes" -> Right   FilterReduce.heapChangesFR
   "live-changes" -> Right   FilterReduce.liveChangesFR
   "rss-changes"  -> Right   FilterReduce.rssChangesFR
+  "fsrd-changes" -> Right   FilterReduce.fsRdChangesFR
+  "fswr-changes" -> Right   FilterReduce.fsWrChangesFR
   "cpu-ticks"    -> Right   FilterReduce.cpuTicksFR
   _ -> Left str
 

bench/stdout-tools/src/Cardano/Tracer/FilterReduce.hs

@@ -24,6 +24,8 @@ module Cardano.Tracer.FilterReduce
   , heapChanges, heapChangesFR
   , liveChanges, liveChangesFR
   , rssChanges, rssChangesFR
+  , fsRdChanges, fsRdChangesFR
+  , fsWrChanges, fsWrChangesFR
   , cpuTicks, cpuTicksFR
   ) where
 
@@ -293,6 +295,60 @@ rssChanges = (,)
 rssChangesFR :: FilterReduce
 rssChangesFR = uncurry MkFilterReduce rssChanges
 
+fsRdChanges :: ( Filter.Compose
+                   (Filter.Compose
+                     (Filter.Compose
+                       (Filter.Compose Filter.ParseTrace Filter.RightTrace)
+                       Filter.Namespace
+                     )
+                     Filter.RightAt
+                   )
+                   (Filter.AesonWithAt (Trace.Remainder Trace.DataResources))
+               , Reducer.Changes (Trace.Remainder Trace.DataResources)
+               )
+fsRdChanges = (,)
+  ( Filter.ParseTrace
+    Filter.<->
+    Filter.RightTrace
+    Filter.<->
+    Filter.Namespace "Resources"
+    Filter.<->
+    Filter.RightAt
+    Filter.<->
+    (Filter.AesonWithAt :: Filter.AesonWithAt (Trace.Remainder Trace.DataResources))
+  )
+  (Reducer.Changes (Trace.resourcesFsRd . Trace.remainderData))
+
+fsRdChangesFR :: FilterReduce
+fsRdChangesFR = uncurry MkFilterReduce fsRdChanges
+
+fsWrChanges :: ( Filter.Compose
+                   (Filter.Compose
+                     (Filter.Compose
+                       (Filter.Compose Filter.ParseTrace Filter.RightTrace)
+                       Filter.Namespace
+                     )
+                     Filter.RightAt
+                   )
+                   (Filter.AesonWithAt (Trace.Remainder Trace.DataResources))
+               , Reducer.Changes (Trace.Remainder Trace.DataResources)
+               )
+fsWrChanges = (,)
+  ( Filter.ParseTrace
+    Filter.<->
+    Filter.RightTrace
+    Filter.<->
+    Filter.Namespace "Resources"
+    Filter.<->
+    Filter.RightAt
+    Filter.<->
+    (Filter.AesonWithAt :: Filter.AesonWithAt (Trace.Remainder Trace.DataResources))
+  )
+  (Reducer.Changes (Trace.resourcesFsWr . Trace.remainderData))
+
+fsWrChangesFR :: FilterReduce
+fsWrChangesFR = uncurry MkFilterReduce fsWrChanges
+
 cpuTicks :: ( Filter.Compose
                 (Filter.Compose
                    (Filter.Compose

bench/stdout-tools/src/Cardano/Tracer/Trace.hs

@@ -159,6 +159,7 @@ data DataResources = DataResources
   , resourcesCentiGC :: Integer
   , resourcesCentiMut :: Integer
   , resourcesFsRd :: Integer
+  , resourcesFsWr :: Integer
   , resourcesGcsMajor :: Integer
   , resourcesGcsMinor :: Integer
   , resourcesHeap :: Integer