8b8fd22 · streamly · git.iko.soy

git.iko.soy/streamly

satisfy hlint (pragmas, imports, <> instead of ++)

commit8b8fd225781d2422df286ceb15bce02f90cb823e authorHarendra Kumar <harendra.kumar@gmail.com> dateSat 13 Oct 2018, 07:15 (8 years ago) parenta0b1ac8

9 files changed+41−55

compare with master

unifiedsplit

src/Streamly/Prelude.hs+1−2 src/Streamly/SVar.hs+36−35 src/Streamly/Streams/Parallel.hs−1 src/Streamly/Streams/Prelude.hs−2 src/Streamly/Streams/SVar.hs+4−7 src/Streamly/Streams/Serial.hs−1 src/Streamly/Streams/StreamD.hs−3 src/Streamly/Streams/StreamK.hs−3 src/Streamly/Streams/Zip.hs−1

src/Streamly/Prelude.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE CPP #-}

32{-# LANGUAGE FlexibleContexts #-}

43{-# LANGUAGE FlexibleInstances #-}

@@ -230,7 +229,7 @@ import Control.Monad.IO.Class (MonadIO(..))

230229import Data.Maybe (isJust, fromJust)

231230import Prelude

232231 hiding (filter, drop, dropWhile, take, takeWhile, zipWith, foldr,

233− foldl, map, mapM, mapM_, sequence, all, any, sum, product, elem,

232+ foldl, mapM, mapM_, sequence, all, any, sum, product, elem,

234233 notElem, maximum, minimum, head, last, tail, length, null,

235234 reverse, iterate, init, and, or, lookup, foldr1)

236235import qualified Prelude

src/Streamly/SVar.hs+36−35

@@ -125,6 +125,7 @@ import Data.IORef

125125 (IORef, modifyIORef, newIORef, readIORef, writeIORef, atomicModifyIORef)

126126import Data.List ((\\))

127127import Data.Maybe (fromJust)

128+import Data.Semigroup ((<>))

128129import Data.Set (Set)

129130import GHC.Conc (ThreadId(..))

130131import GHC.Exts

@@ -621,34 +622,34 @@ dumpSVarStats sv ss style = do

621622 else return (0, 0, 0)

622623

623624 return $ unlines

624− [ "total dispatches = " ++ show dispatches

625− , "max workers = " ++ show maxWrk

626− , "max outQSize = " ++ show maxOq

627− ++ (if style == AheadVar

628− then "\nheap max size = " ++ show maxHp

625+ [ "total dispatches = " <> show dispatches

626+ , "max workers = " <> show maxWrk

627+ , "max outQSize = " <> show maxOq

628+ <> (if style == AheadVar

629+ then "\nheap max size = " <> show maxHp

629630 else "")

630− ++ (if minLat > 0

631+ <> (if minLat > 0

631632 then "\nmin worker latency = "

632− ++ secs (fromIntegral minLat * 1e-9)

633+ <> secs (fromIntegral minLat * 1e-9)

633634 else "")

634− ++ (if maxLat > 0

635+ <> (if maxLat > 0

635636 then "\nmax worker latency = "

636− ++ secs (fromIntegral maxLat * 1e-9)

637+ <> secs (fromIntegral maxLat * 1e-9)

637638 else "")

638− ++ (if avgCnt > 0

639+ <> (if avgCnt > 0

639640 then let lat = avgTime `div` fromIntegral avgCnt

640641 in "\navg worker latency = "

641− ++ secs (fromIntegral lat * 1e-9)

642+ <> secs (fromIntegral lat * 1e-9)

642643 else "")

643− ++ (if svarLat > 0

644+ <> (if svarLat > 0

644645 then "\nSVar latency = "

645− ++ secs (fromIntegral svarLat * 1e-9)

646+ <> secs (fromIntegral svarLat * 1e-9)

646647 else "")

647− ++ (if svarCnt > 0

648− then "\nSVar yield count = " ++ show svarCnt

648+ <> (if svarCnt > 0

649+ then "\nSVar yield count = " <> show svarCnt

649650 else "")

650− ++ (if svarGainLossCnt > 0

651− then "\nSVar gain/loss yield count = " ++ show svarGainLossCnt

651+ <> (if svarGainLossCnt > 0

652+ then "\nSVar gain/loss yield count = " <> show svarGainLossCnt

652653 else "")

653654 ]

654655

@@ -663,10 +664,10 @@ dumpSVar sv = do

663664 (oheap, oheapSeq) <- readIORef $ outputHeap sv

664665 (wq, wqSeq) <- readIORef $ aheadWorkQueue sv

665666 return $ unlines

666− [ "heap length = " ++ show (H.size oheap)

667− , "heap seqeunce = " ++ show oheapSeq

668− , "work queue length = " ++ show (length wq)

669− , "work queue sequence = " ++ show wqSeq

667+ [ "heap length = " <> show (H.size oheap)

668+ , "heap seqeunce = " <> show oheapSeq

669+ , "work queue length = " <> show (length wq)

670+ , "work queue sequence = " <> show wqSeq

670671 ]

671672 else return []

672673

@@ -681,23 +682,23 @@ dumpSVar sv = do

681682

682683 return $ unlines

683684 [

684− "Creator tid = " ++ show (svarCreator sv),

685− "style = " ++ show (svarStyle sv)

685+ "Creator tid = " <> show (svarCreator sv),

686+ "style = " <> show (svarStyle sv)

686687 , "---------CURRENT STATE-----------"

687− , "outputQueue length computed = " ++ show (length oqList)

688− , "outputQueue length maintained = " ++ show oqLen

688+ , "outputQueue length computed = " <> show (length oqList)

689+ , "outputQueue length maintained = " <> show oqLen

689690 -- XXX print the types of events in the outputQueue, first 5

690− , "outputDoorBell = " ++ show db

691+ , "outputDoorBell = " <> show db

691692 ]

692− ++ aheadDump

693− ++ unlines

694− [ "needDoorBell = " ++ show waiting

695− , "running threads = " ++ show rthread

693+ <> aheadDump

694+ <> unlines

695+ [ "needDoorBell = " <> show waiting

696+ , "running threads = " <> show rthread

696697 -- XXX print the status of first 5 threads

697− , "running thread count = " ++ show workers

698+ , "running thread count = " <> show workers

698699 ]

699− ++ "---------STATS-----------\n"

700− ++ stats

700+ <> "---------STATS-----------\n"

701+ <> stats

701702

702703-- MVar diagnostics has some overhead - around 5% on asyncly null benchmark, we

703704-- can keep it on in production to debug problems quickly if and when they

@@ -708,14 +709,14 @@ dumpSVar sv = do

708709mvarExcHandler :: SVar t m a -> String -> BlockedIndefinitelyOnMVar -> IO ()

709710mvarExcHandler sv label e@BlockedIndefinitelyOnMVar = do

710711 svInfo <- dumpSVar sv

711− hPutStrLn stderr $ label ++ " " ++ "BlockedIndefinitelyOnMVar\n" ++ svInfo

712+ hPutStrLn stderr $ label <> " " <> "BlockedIndefinitelyOnMVar\n" <> svInfo

712713 throwIO e

713714

714715{-# NOINLINE stmExcHandler #-}

715716stmExcHandler :: SVar t m a -> String -> BlockedIndefinitelyOnSTM -> IO ()

716717stmExcHandler sv label e@BlockedIndefinitelyOnSTM = do

717718 svInfo <- dumpSVar sv

718− hPutStrLn stderr $ label ++ " " ++ "BlockedIndefinitelyOnSTM\n" ++ svInfo

719+ hPutStrLn stderr $ label <> " " <> "BlockedIndefinitelyOnSTM\n" <> svInfo

719720 throwIO e

720721

721722withDiagMVar :: SVar t m a -> String -> IO () -> IO ()

src/Streamly/Streams/Parallel.hs−1

@@ -5,7 +5,6 @@

55{-# LANGUAGE GeneralizedNewtypeDeriving#-}

66{-# LANGUAGE InstanceSigs #-}

77{-# LANGUAGE MultiParamTypeClasses #-}

8−{-# LANGUAGE StandaloneDeriving #-}

98{-# LANGUAGE UndecidableInstances #-} -- XXX

109

1110-- |

src/Streamly/Streams/Prelude.hs−2

@@ -2,11 +2,9 @@

22{-# LANGUAGE ConstraintKinds #-}

33{-# LANGUAGE FlexibleContexts #-}

44{-# LANGUAGE FlexibleInstances #-}

5−{-# LANGUAGE GeneralizedNewtypeDeriving#-}

65{-# LANGUAGE InstanceSigs #-}

76{-# LANGUAGE MultiParamTypeClasses #-}

87{-# LANGUAGE RankNTypes #-}

9−{-# LANGUAGE StandaloneDeriving #-}

108{-# LANGUAGE UndecidableInstances #-} -- XXX

119

1210-- |

src/Streamly/Streams/SVar.hs+4−7

@@ -2,11 +2,8 @@

22{-# LANGUAGE ConstraintKinds #-}

33{-# LANGUAGE FlexibleContexts #-}

44{-# LANGUAGE FlexibleInstances #-}

5−{-# LANGUAGE LambdaCase #-}

6−{-# LANGUAGE MagicHash #-}

75{-# LANGUAGE MultiParamTypeClasses #-}

86{-# LANGUAGE RankNTypes #-}

9−{-# LANGUAGE UnboxedTuples #-}

107{-# LANGUAGE UndecidableInstances #-} -- XXX

118

129#include "inline.h"

@@ -43,9 +40,9 @@ import Control.Monad (when)

4340import Control.Monad.Catch (throwM)

4441import Control.Monad.IO.Class (MonadIO(liftIO))

4542import Data.Int (Int64)

46−import Data.IORef (newIORef, readIORef, mkWeakIORef)

47−import Data.IORef (writeIORef)

43+import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)

4844import Data.Maybe (isNothing)

45+import Data.Semigroup ((<>))

4946import System.IO (hPutStrLn, stderr)

5047import System.Clock (Clock(Monotonic), getTime)

5148import System.Mem (performMajorGC)

@@ -57,7 +54,7 @@ import Streamly.Streams.Serial (SerialT)

5754printSVar :: SVar t m a -> String -> IO ()

5855printSVar sv how = do

5956 svInfo <- dumpSVar sv

60− hPutStrLn stderr $ "\n" ++ how ++ "\n" ++ svInfo

57+ hPutStrLn stderr $ "\n" <> how <> "\n" <> svInfo

6158

6259printState :: MonadIO m => State Stream m a -> m ()

6360printState st = liftIO $ do

@@ -305,5 +302,5 @@ maxYieldsSerial _ = id

305302

306303-- | Print debug information about an SVar when the stream ends

307304inspectMode :: IsStream t => t m a -> t m a

308−inspectMode m = fromStream $ Stream $ \st stp sng yld -> do

305+inspectMode m = fromStream $ Stream $ \st stp sng yld ->

309306 unStream (toStream m) (setInspectMode st) stp sng yld

src/Streamly/Streams/Serial.hs−1

@@ -5,7 +5,6 @@

55{-# LANGUAGE GeneralizedNewtypeDeriving#-}

66{-# LANGUAGE InstanceSigs #-}

77{-# LANGUAGE MultiParamTypeClasses #-}

8−{-# LANGUAGE StandaloneDeriving #-}

98{-# LANGUAGE UndecidableInstances #-} -- XXX

109

1110-- |

src/Streamly/Streams/StreamD.hs−3

@@ -4,11 +4,8 @@

44{-# LANGUAGE ExistentialQuantification #-}

55{-# LANGUAGE FlexibleContexts #-}

66{-# LANGUAGE FlexibleInstances #-}

7−{-# LANGUAGE LambdaCase #-}

8−{-# LANGUAGE MagicHash #-}

97{-# LANGUAGE MultiParamTypeClasses #-}

108{-# LANGUAGE RankNTypes #-}

11−{-# LANGUAGE UnboxedTuples #-}

129

1310#include "inline.h"

1411

src/Streamly/Streams/StreamK.hs−3

@@ -4,11 +4,8 @@

44{-# LANGUAGE FlexibleContexts #-}

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE InstanceSigs #-}

7−{-# LANGUAGE LambdaCase #-}

8−{-# LANGUAGE MagicHash #-}

97{-# LANGUAGE MultiParamTypeClasses #-}

108{-# LANGUAGE RankNTypes #-}

11−{-# LANGUAGE UnboxedTuples #-}

129{-# LANGUAGE UndecidableInstances #-} -- XXX

1310

1411-- |

src/Streamly/Streams/Zip.hs−1

@@ -5,7 +5,6 @@

55{-# LANGUAGE GeneralizedNewtypeDeriving#-}

66{-# LANGUAGE InstanceSigs #-}

77{-# LANGUAGE MultiParamTypeClasses #-}

8−{-# LANGUAGE StandaloneDeriving #-}

98{-# LANGUAGE UndecidableInstances #-} -- XXX

109

1110-- |