@@ -21,28 +21,29 @@
2121module Main (main) where
2222
2323import Control.DeepSeq (NFData(..))
24−import System.Random (randomRIO)
24+import Control.Exception (SomeException)
25+import System.IO (Handle, hClose)
2526import Streamly.Internal.Data.Unfold (Unfold)
27+import System.Random (randomRIO)
2628
2729import qualified Prelude
30+import qualified Streamly.Benchmark.Data.NestedUnfoldOps as Nested
31+import qualified Streamly.FileSystem.Handle as FH
2832import qualified Streamly.Internal.Data.Fold as FL
2933import qualified Streamly.Internal.Data.Unfold as UF
3034import qualified Streamly.Internal.Data.Stream.IsStream as S
3135import qualified Streamly.Internal.Data.Stream.StreamD as D
3236import qualified Streamly.Internal.Data.Stream.StreamK as K
33−import qualified Streamly.Benchmark.Data.NestedUnfoldOps as Nested
34−
35−-- For Unfold Exception Benchmarks
36−import qualified Streamly.FileSystem.Handle as FH
37−import qualified Streamly.Internal.Data.Unfold as IUF
3837import qualified Streamly.Prelude as SP
39−import Streamly.Benchmark.CommonH
40−import System.IO (Handle, hClose)
41−import Control.Exception (SomeException)
4238
43−import Streamly.Benchmark.Common
4439import Gauge hiding (env)
4540import Prelude hiding (concat, take, filter, zipWith, map, mapM, takeWhile)
41+import Streamly.Benchmark.Common
42+import Streamly.Benchmark.CommonH
43+
44+#ifdef INSPECTION
45+import Test.Inspection
46+#endif
4647
4748{-# INLINE benchIO #-}
4849benchIO :: (NFData b) => String -> (Int -> IO b) -> Benchmark
@@ -428,7 +429,6 @@ _apDiscardFst = undefined
428429_apDiscardSnd :: Int -> Int -> m ()
429430_apDiscardSnd = undefined
430431
431−
432432-------------------------------------------------------------------------------
433433-- Benchmarks
434434-------------------------------------------------------------------------------
@@ -558,7 +558,7 @@ o_n_space_nested size =
558558-- | Send the file contents to /dev/null with exception handling
559559readWriteOnExceptionUnfold :: Handle -> Handle -> IO ()
560560readWriteOnExceptionUnfold inh devNull =
561− let readEx = IUF.onException (\_ -> hClose inh) FH.read
561+ let readEx = UF.onException (\_ -> hClose inh) FH.read
562562 in SP.fold (FH.write devNull) $ SP.unfold readEx inh
563563
564564#ifdef INSPECTION
@@ -570,7 +570,7 @@ inspect $ hasNoTypeClasses 'readWriteOnExceptionUnfold
570570readWriteHandleExceptionUnfold :: Handle -> Handle -> IO ()
571571readWriteHandleExceptionUnfold inh devNull =
572572 let handler (_e :: SomeException) = hClose inh >> return 10
573− readEx = IUF.handle (IUF.singletonM handler) FH.read
573+ readEx = UF.handle (UF.singletonM handler) FH.read
574574 in SP.fold (FH.write devNull) $ SP.unfold readEx inh
575575
576576#ifdef INSPECTION
@@ -581,7 +581,7 @@ inspect $ hasNoTypeClasses 'readWriteHandleExceptionUnfold
581581-- | Send the file contents to /dev/null with exception handling
582582readWriteFinally_Unfold :: Handle -> Handle -> IO ()
583583readWriteFinally_Unfold inh devNull =
584− let readEx = IUF.finally_ (\_ -> hClose inh) FH.read
584+ let readEx = UF.finally_ (\_ -> hClose inh) FH.read
585585 in SP.fold (FH.write devNull) $ SP.unfold readEx inh
586586
587587#ifdef INSPECTION
@@ -591,13 +591,13 @@ inspect $ hasNoTypeClasses 'readWriteFinally_Unfold
591591
592592readWriteFinallyUnfold :: Handle -> Handle -> IO ()
593593readWriteFinallyUnfold inh devNull =
594− let readEx = IUF.finally (\_ -> hClose inh) FH.read
594+ let readEx = UF.finally (\_ -> hClose inh) FH.read
595595 in SP.fold (FH.write devNull) $ SP.unfold readEx inh
596596
597597-- | Send the file contents to /dev/null with exception handling
598598readWriteBracket_Unfold :: Handle -> Handle -> IO ()
599599readWriteBracket_Unfold inh devNull =
600− let readEx = IUF.bracket_ return (\_ -> hClose inh) FH.read
600+ let readEx = UF.bracket_ return (\_ -> hClose inh) FH.read
601601 in SP.fold (FH.write devNull) $ SP.unfold readEx inh
602602
603603#ifdef INSPECTION
@@ -607,7 +607,7 @@ inspect $ hasNoTypeClasses 'readWriteBracket_Unfold
607607
608608readWriteBracketUnfold :: Handle -> Handle -> IO ()
609609readWriteBracketUnfold inh devNull =
610− let readEx = IUF.bracket return (\_ -> hClose inh) FH.read
610+ let readEx = UF.bracket return (\_ -> hClose inh) FH.read
611611 in SP.fold (FH.write devNull) $ S.unfold readEx inh
612612
613613o_1_space_copy_read_exceptions :: BenchEnv -> [Benchmark]
@@ -651,9 +651,6 @@ main = do
651651 , o_1_space_filtering size
652652 , o_1_space_zip size
653653 , o_1_space_nested size
654− -- I have to pass BenchEnv instead of size here
655− -- DONE
656− -- , o_1_space_copy_read_exceptions env
657654 ]
658655 , bgroup (o_n_space_prefix moduleName)
659656 $ Prelude.concat [o_n_space_nested size]