trace-forward: remove wasUsed flag

Author: fmaste

trace-forward/src/Trace/Forward/Utils/ForwardSink.hs

@@ -12,6 +12,5 @@ data ForwardSink lo = ForwardSink
   { forwardQueue     :: !(TVar (TBQueue lo))
   , disconnectedSize :: !Word
   , connectedSize    :: !Word
-  , wasUsed          :: !(TVar Bool)
   , overflowCallback :: !([lo] -> IO ())
   }

trace-forward/src/Trace/Forward/Utils/TraceObject.hs

@@ -26,7 +26,7 @@ import           Control.Concurrent.STM.TBQueue
   , flushTBQueue
   )
 import           Control.Concurrent.STM.TVar
-import           Control.Monad (replicateM, unless)
+import           Control.Monad (replicateM)
 import qualified Data.List.NonEmpty as NE
 import           Data.Word (Word16)
 
@@ -44,14 +44,12 @@ initForwardSink
 initForwardSink ForwarderConfiguration{disconnectedQueueSize, connectedQueueSize} callback = do
   -- Initially we always create a big queue, because during node's start
   -- the number of tracing items may be very big.
-  (queue, used) <- atomically $
-    (,) <$> (newTVar =<< newTBQueue (fromIntegral disconnectedQueueSize))
-        <*> newTVar False
+  queueTVar <- atomically $
+    newTVar =<< newTBQueue (fromIntegral disconnectedQueueSize)
   return $ ForwardSink
-    { forwardQueue     = queue
+    { forwardQueue     = queueTVar
     , disconnectedSize = disconnectedQueueSize
     , connectedSize    = connectedQueueSize
-    , wasUsed          = used
     , overflowCallback = callback
     }
 
@@ -83,23 +81,18 @@ writeToSinkSTM queueTVar traceObject = do
 readFromSink
   :: ForwardSink lo -- ^ The sink contains the queue we read 'TraceObject's from.
   -> Forwarder.TraceObjectForwarder lo IO ()
-readFromSink ForwardSink{forwardQueue, wasUsed} =
+readFromSink ForwardSink{forwardQueue} =
   Forwarder.TraceObjectForwarder
     { Forwarder.recvMsgTraceObjectsRequest = \blocking (NumberOfTraceObjects n) ->
-        atomically $ readFromSinkSTM
-                       forwardQueue
-                       wasUsed
-                       blocking
-                       n
+        atomically $ readFromSinkSTM forwardQueue blocking n
     , Forwarder.recvMsgDone = return ()
     }
 
 readFromSinkSTM :: TVar (TBQueue lo)
-                -> TVar Bool
                 -> TokBlockingStyle blocking
                 -> Word16
                 -> STM (BlockingReplyList blocking lo)
-readFromSinkSTM queueTVar wasUsedTVar blocking n = do
+readFromSinkSTM queueTVar blocking n = do
   ---------- STM transaction: start ----------
   queue <- readTVar queueTVar
   isEmpty <- isEmptyTBQueue queue
@@ -115,7 +108,6 @@ readFromSinkSTM queueTVar wasUsedTVar blocking n = do
              then flushTBQueue queue -- Flush is non-blocking, can return empty.
              -- If requested maximum number is less than length, read `n` times.
              else replicateM (fromIntegral n) (readTBQueue queue)
-  unless (null res) $ modifyTVar' wasUsedTVar . const $ True
   pure $ case blocking of
            TokNonBlocking -> NonBlockingReply res
            TokBlocking    -> BlockingReply  $ case NE.nonEmpty res of