Nonidem -- it's time already

haskell/DEVLOG.md

@@ -594,6 +594,42 @@ Haven't seen this one before, a compile failure on the cfa package:
           ...
     ld: symbol(s) not found for architecture x86_64
 
+
+[2014.01.24] {Failure after recent nonidem merge}
+-------------------------------------------------
+
+    Failed to install lvish-1.2.0.0
+    Last 10 lines of the build log ( /ffh/ryan/cloud_drive/working_copies/lvars/lvars/haskell/.cabal-sandbox/logs/lvish-1.2.0.0.log ):
+     Passed  5           64           69
+     Failed  0           1            1
+     Total   5           65           70
+     [*] test-framework exiting with: ExitFailure 1
+     [*] GC finished on main thread.
+     [*] Main thread exiting.
+    Test suite test-lvish: FAIL
+    Test suite logged to:
+    dist/dist-sandbox-38f74c87/test/lvish-1.2.0.0-test-lvish.log
+    0 of 1 test suites (0 of 1 test cases) passed.
+
+Specifically, the failure is:
+
+    ThreadKilled exception inside child thread, ThreadId 79270 (not propagating!): "worker thread"
+      v4: [Failed]
+    Bad test outcome--exception: PutAfterFreezeExn "Attempt to change a frozen LVar"
+
+It's proving a bit hard to reproduce, however.
+
+Also... test after i9h is apparently deadlocking on -N4.  Hmm.. why
+are timeouts not working? 
+  (And I'm getting plenty of the blocked-indefinitely errors in
+  various papers... these are probably the same failure but sometimes
+  the GC turns it into an exception.  Not sure why timeouts aren't 
+  working consistently on this branch.  I see them sometimes.)
+
+Ah, ok, I can get failures on AddRemoveSetTests 
+
+
+
 [2014.01.24] {More scheduler debugging}
 ----------------------------------------
 

haskell/lvish/Control/LVish.hs

@@ -102,8 +102,8 @@ import           Control.LVish.Types
 import           Control.LVish.Internal as I
 import           Control.LVish.Basics as B
 import           Control.LVish.Logical
-import qualified Control.LVish.SchedIdempotent as L
-import           Control.LVish.SchedIdempotentInternal (State)
+import qualified Control.LVish.Sched as L
+import           Control.LVish.SchedQueue (State)
 
 import           Control.LVish.Logging (OutDest(..))
 import           Data.LVar.IVar 

haskell/lvish/Control/LVish/Basics.hs

@@ -37,7 +37,7 @@ import qualified Data.Foldable    as F
 import           Control.Exception (Exception, SomeException)
 import           Control.LVish.Internal as I
 import           Control.LVish.DeepFrz.Internal (Frzn, Trvrsbl)
-import qualified Control.LVish.SchedIdempotent as L
+import qualified Control.LVish.Sched as L
 import qualified Control.LVish.Logging as Lg
 import           Control.LVish.Types
 import           System.IO.Unsafe (unsafePerformIO, unsafeDupablePerformIO)

haskell/lvish/Control/LVish/DeepFrz.hs

@@ -53,7 +53,7 @@ import GHC.Prim (unsafeCoerce#)
 -- import Control.LVish (LVarData1(..))
 import Control.LVish.DeepFrz.Internal (DeepFrz(..), NonFrzn, Frzn, Trvrsbl)
 import Control.LVish.Internal (Determinism(..), Par(WrapPar))
-import Control.LVish.SchedIdempotent (runPar, runParIO)
+import Control.LVish.Sched (runPar, runParIO)
 --------------------------------------------------------------------------------
 
 -- | Under normal conditions, calling a `freeze` operation inside a

haskell/lvish/Control/LVish/Internal.hs

@@ -34,7 +34,7 @@ module Control.LVish.Internal
 
 import           Control.LVish.MonadToss
 import           Control.Applicative
-import qualified Control.LVish.SchedIdempotent as L
+import qualified Control.LVish.Sched as L
 import           Control.LVish.DeepFrz.Internal (Frzn, Trvrsbl)
 import qualified Data.Foldable    as F
 import           Data.List (sort)
@@ -69,7 +69,7 @@ type QPar = Par QuasiDet
 -- to.
 
 -- LK: I don't care if we use `a` and `d` or `all` and `delt`, but why
--- not be consistent between here and SchedIdempotent.hs?  Also, what
+-- not be consistent between here and Sched.hs?  Also, what
 -- does `all` mean?
 newtype LVar s all delt = WrapLVar { unWrapLVar :: L.LVar all delt }
 

haskell/lvish/Control/LVish/Logical.hs

@@ -5,7 +5,7 @@ module Control.LVish.Logical (asyncAnd, asyncOr, andMap, orMap) where
 
 import Control.LVish.Basics
 import Control.LVish.Internal (Par(WrapPar), unsafeDet)
-import Control.LVish.SchedIdempotent (liftIO, HandlerPool)
+import Control.LVish.Sched    (liftIO, HandlerPool)
 import Data.LVar.IVar    as IV
 
 import qualified Data.Atomics.Counter as C