Merge branch 'remove-logger' into wip/ctrie

Also, update submods.

.gitignore

@@ -13,3 +13,4 @@ docs_examples
 test-results.xml
 tags
 *.stack-work
+untracked_junk

haskell/lvish/Control/LVish.hs

@@ -123,8 +123,9 @@ import           Control.LVish.Internal.Logging          (LogMsg (..),
 import           Control.LVish.Internal.Logical
 import           Control.LVish.Internal.Types
 import           Control.Par.EffectSigs
-import           Data.LVar.IVar
 import qualified Control.LVish.Internal.SchedIdempotent as L
+import           Data.LVar.IVar 
+import           System.Log.TSLogger (LogMsg(..), OutDest(..), DbgCfg(..), defaultMemDbgRange, logOn)
 
 --------------------------------------------------------------------------------
 

haskell/lvish/Control/LVish/Internal/Basics.hs

@@ -45,6 +45,7 @@ import           Control.Monad                          (forM_)
 import           Control.Par.EffectSigs
 import qualified Control.LVish.Internal.SchedIdempotent as L
 import           Prelude                                hiding (rem)
+import qualified System.Log.TSLogger as Lg
 
 import qualified Control.Par.Class     as PC
 import qualified Data.Splittable.Class as SC
@@ -153,9 +154,9 @@ runParLogged (WrapPar p) = L.runParLogged p
 --   This version of runPar catches ALL exceptions that occur within the runPar, and
 --   returns them via an Either.  The reason for this is that even if an error
 --   occurs, it is still useful to observe the log messages that lead to the failure.
---
-runParDetailed :: DbgCfg        -- ^ Debugging configuration
-               -> Int           -- ^ How many worker threads to use.
+--   
+runParDetailed :: Lg.DbgCfg        -- ^ Debugging configuration
+               -> Int           -- ^ How many worker threads to use. 
                -> (forall s . Par e s a) -- ^ The computation to run.
                -> IO ([String], Either SomeException a)
 runParDetailed dc nw (WrapPar p) = L.runParDetailed dc nw p
@@ -208,7 +209,7 @@ getLogger = WrapPar $ L.getLogger
 {-# INLINE parForL #-}
 -- | Left-biased parallel for loop.  As worker threads beyond the first are added,
 -- this hews closer to the sequential iteration order than an unbiased parallel loop.
---
+--y
 -- Takes a range as inclusive-start, exclusive-end.
 parForL :: (Int,Int) -> (Int -> Par e s ()) -> Par e s ()
 parForL (start,end) _ | start > end = error$"parForL: start is greater than end: "++show (start,end)

haskell/lvish/Control/LVish/Internal/SchedIdempotent.hs

@@ -53,9 +53,9 @@ import qualified Control.Exception as E
 import qualified Control.Concurrent.Async as A
 import           Control.DeepSeq
 import           Control.Applicative
-import           Control.LVish.Internal.Logging as L
--- import           Debug.Trace(trace)
+-- import           Control.LVish.Internal.Logging as L
 import           Data.Concurrent.Internal.MonadToss
+import           Debug.Trace(trace)
 import           Data.IORef
 import           Data.Atomics
 -- import           Data.Typeable
@@ -70,6 +70,7 @@ import           System.Mem.StableName (makeStableName, hashStableName)
 import           Prelude  hiding (mapM, sequence, head, tail)
 import qualified Prelude
 import           System.Random (random)
+import           System.Log.TSLogger as L
 import           Text.Printf (printf, hPrintf)
 
 -- import Control.Compose ((:.), unO)

haskell/lvish/Control/LVish/Internal/SchedUtils.hs

@@ -18,8 +18,8 @@ import Data.Atomics (atomicModifyIORefCAS)
 import System.Random (StdGen, mkStdGen)
 import Text.Printf
 
-import qualified Control.LVish.Internal.Logging as L
-import Control.LVish.Internal.Types (DbgCfg(..))
+import System.Log.TSLogger (DbgCfg(..))
+import qualified System.Log.TSLogger as L
 
 #ifdef CHASE_LEV
 #warning "Compiling with Chase-Lev work-stealing deque"

haskell/lvish/Control/LVish/Internal/Types.hs

@@ -2,9 +2,7 @@
 
 -- | A simple internal module to factor out types that are used in many places.
 module Control.LVish.Internal.Types
-       ( LVishException(..)
-       , OutDest (..)
-       , DbgCfg(..))
+       ( LVishException(..) )
      where
 
 import Data.Typeable (Typeable)
@@ -20,22 +18,3 @@ data LVishException = ConflictingPutExn String
   deriving (Show, Read, Eq, Ord, Typeable)
 
 instance Exception LVishException 
-
--- | A destination for log messages
-data OutDest = -- NoOutput -- ^ Drop them entirely.
-               OutputEvents    -- ^ Output via GHC's `traceEvent` runtime events.
-             | OutputTo Handle -- ^ Printed human-readable output to a handle.
-             | OutputInMemory  -- ^ Accumulate output in memory and flush when appropriate.
-
--- | DebugConfig: what level of debugging support is activated?
-data DbgCfg = 
-     DbgCfg { dbgRange :: Maybe (Int,Int) 
-                -- ^ Inclusive range of debug messages to accept
-                --   (i.e. filter on priority level).  If Nothing, use the default level,
-                --   which is (0,N) where N is controlled by the DEBUG environment variable.
-                --   The convention is to use Just (0,0) to disable logging.
-            , dbgDests :: [OutDest] -- ^ Destinations for debug log messages.
-            , dbgScheduling :: Bool
-                -- ^ In additional to logging debug messages, control
-                --   thread interleaving at these points when this is True.
-           }

haskell/lvish/lvish.cabal

@@ -146,7 +146,7 @@ library
                     -- Package-internal and should not be exposed:
                     Control.LVish.Internal.SchedIdempotent
                     Control.LVish.Internal.Logging
-
+--                    Internal.Data.Concurrent.LinkedMap
 
   -- Internal modules included in this library but not exported:
   other-modules:
@@ -188,9 +188,11 @@ library
   build-depends: containers >= 0.5.4.0
 
   build-depends: par-classes     >= 1.1 && < 2.0,
-                 par-collections >= 1.1 && < 2.0
-
+                 par-collections >= 1.1 && < 2.0,
+                 tslogger >= 0.1
+
   ghc-options: -rtsopts -Wall -fno-warn-orphans
+
   if flag(useopt)
     ghc-options: -O2
 
@@ -242,6 +244,8 @@ test-suite test-lvish
 
     ghc-options: -Wall -fno-warn-orphans
 
+    build-depends: tslogger >= 0.1
+
     -- For we duplicate these flag-dependent options:
     if flag(useopt)
       ghc-options: -O2

haskell/lvish/tests/BulkRetryTests.hs

@@ -19,7 +19,6 @@ import GHC.Conc (numCapabilities)
 import           Control.LVish
 import           Control.LVish.DeepFrz (DeepFrz(..), Frzn, Trvrsbl, runParThenFreeze, runParThenFreezeIO)
 import           Control.LVish.BulkRetry
-import qualified Control.LVish.Logging as L
 import qualified Data.LVar.Generic as G
 import           Data.LVar.PureSet as IS
 import qualified Data.LVar.SLSet as SS
@@ -29,6 +28,8 @@ import           Data.LVar.NatArray as NA
 import Data.Par.Splittable (pforEach)
 import Data.Par.Range (range, fullpar)
 
+import qualified System.Log.TSLogger as L
+
 --------------------------------------------------------------------------------
 
 tests :: TestTree

haskell/lvish/tests/SetTests.hs

@@ -26,9 +26,9 @@ import qualified Data.LVar.IVar as IV
 
 import           Control.LVish
 import           Control.LVish.DeepFrz (DeepFrz(..), Frzn, Trvrsbl, runParThenFreeze, runParThenFreezeIO)
-import qualified Control.LVish.Internal.Logging as L
 import           Control.LVish.Internal (liftIO)
-
+import qualified System.Log.TSLogger as L
+
 --------------------------------------------------------------------------------
 
 runTests :: IO ()

stack.yaml

@@ -30,5 +30,6 @@ extra-deps:
  - chaselev-deque-0.5.0.5
  - bits-atomic-0.1.3
  - thread-local-storage-0.1.0.3
+ - tslogger-0.1.0.0
 
 resolver: lts-5.11