git.iko.soy/streamly
on master help sign in
Move parallel loops test to Prelude.
7de5e0epranaysashank
streamly.cabal−11
compare with master
unifiedsplit
@@ -817,17 +817,6 @@ test-suite string-test
817 , hspec >= 2.0 && < 3
817 , hspec >= 2.0 && < 3
818 default-language: Haskell2010
818 default-language: Haskell2010
819
819
820−test-suite parallel-loops
821− import: test-options
822− type: exitcode-stdio-1.0
823− default-language: Haskell2010
824− main-is: parallel-loops.hs
825− hs-source-dirs: test
826− build-Depends:
827− streamly
828− , base >= 4.9 && < 5
829− , random >= 1.0.0 && < 2
830−
831test-suite version-bounds
820test-suite version-bounds
832 import: test-options
821 import: test-options
833 type: exitcode-stdio-1.0
822 type: exitcode-stdio-1.0
test/Streamly/Test/Prelude.hs+25
@@ -229,6 +229,7 @@ mixedOpsAheadly =
229 return (x1 + y1 + z1)
229 return (x1 + y1 + z1)
230 return (x + y + z)
230 return (x + y + z)
231
231
232+-- XXX Merge both the loops.
232nestedLoops :: IO ()
233nestedLoops :: IO ()
233nestedLoops = S.drain $ do
234nestedLoops = S.drain $ do
234 S.yieldM $ hSetBuffering stdout LineBuffering
235 S.yieldM $ hSetBuffering stdout LineBuffering
@@ -249,6 +250,29 @@ nestedLoops = S.drain $ do
249 repeatIt = if n > 1 then loop name (n - 1) else S.nil
250 repeatIt = if n > 1 then loop name (n - 1) else S.nil
250 in return result `S.wAsync` repeatIt
251 in return result `S.wAsync` repeatIt
251
252
253+parallelLoops :: IO ()
254+parallelLoops = do
255+ hSetBuffering stdout LineBuffering
256+ S.drain $ do
257+ x <- S.take 10 $ loop "A" `S.parallel` loop "B"
258+ S.yieldM $ myThreadId >>= putStr . show
259+ >> putStr " got "
260+ >> print x
261+
262+ where
263+
264+ -- we can just use
265+ -- parallely $ cycle1 $ yieldM (...)
266+ loop :: String -> SerialT IO (String, Int)
267+ loop name = do
268+ S.yieldM $ threadDelay 1000000
269+ rnd <- S.yieldM (randomIO :: IO Int)
270+ S.yieldM $ myThreadId >>= putStr . show
271+ >> putStr " yielding "
272+ >> print rnd
273+ return (name, rnd) `S.parallel` loop name
274+
275+
252main :: IO ()
276main :: IO ()
253main = hspec $ H.parallel $ do
277main = hspec $ H.parallel $ do
254 describe "Filtering" $ do
278 describe "Filtering" $ do
@@ -266,6 +290,7 @@ main = hspec $ H.parallel $ do
266 describe "Simple MonadError and MonadThrow" simpleMonadError
290 describe "Simple MonadError and MonadThrow" simpleMonadError
267
291
268 it "Nested loops" nestedLoops
292 it "Nested loops" nestedLoops
293+ it "Parallel loops" parallelLoops
269 {-
294 {-
270 describe "Composed MonadError serially" $ composeWithMonadError serially
295 describe "Composed MonadError serially" $ composeWithMonadError serially
271 describe "Composed MonadError wSerially" $ composeWithMonadError wSerially
296 describe "Composed MonadError wSerially" $ composeWithMonadError wSerially
test/parallel-loops.hsdeleted−27
@@ -1,27 +0,0 @@
1−import Control.Concurrent (myThreadId, threadDelay)
2−import System.IO (stdout, hSetBuffering, BufferMode(LineBuffering))
3−import System.Random (randomIO)
4−import Streamly.Prelude
5−import qualified Streamly.Prelude as S
6−
7−main :: IO ()
8−main = do
9− hSetBuffering stdout LineBuffering
10− S.drain $ do
11− x <- S.take 10 $ loop "A" `parallel` loop "B"
12− S.yieldM $ myThreadId >>= putStr . show
13− >> putStr " got "
14− >> print x
15−
16− where
17−
18− -- we can just use
19− -- parallely $ cycle1 $ yieldM (...)
20− loop :: String -> Serial (String, Int)
21− loop name = do
22− S.yieldM $ threadDelay 1000000
23− rnd <- S.yieldM (randomIO :: IO Int)
24− S.yieldM $ myThreadId >>= putStr . show
25− >> putStr " yielding "
26− >> print rnd
27− return (name, rnd) `parallel` loop name