@@ -9,6 +9,7 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
1213{-# LANGUAGE RankNTypes #-}
1314{-# LANGUAGE RoleAnnotations #-}
1415{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,7 +20,6 @@
1920{-# LANGUAGE DeriveFunctor #-}
2021{-# LANGUAGE StandaloneDeriving #-}
2122{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
2323
2424#ifdef USE_REFLEX_OPTIMIZER
2525{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +38,15 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3838import Control.Monad.Exception
3939import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4040import Control.Monad.Primitive
41+--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4142import Control.Monad.Reader.Class
4243import Control.Monad.IO.Class
4344import Control.Monad.ReaderIO
4445import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4746import Data.Align
4847import Data.Coerce
49−import Data.Dependent.Map (DMap)
48+import Data.Dependent.Map (DMap, DSum (..))
5049import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5250import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5351import qualified Data.FastMutableIntMap as FastMutableIntMap
5452import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,11 +59,10 @@ import qualified Data.IntMap.Strict as IntMap
6159import Data.IORef
6260import Data.Kind (Type)
6361import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
62+import Data.Monoid ((<>))
6563import Data.Proxy
6664import Data.These
6765import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6966import Data.Witherable (Filterable, mapMaybe)
7067import GHC.Exts hiding (toList)
7168import GHC.IORef (IORef (..))
@@ -75,23 +72,19 @@ import System.IO.Unsafe
7572import System.Mem.Weak
7673import Unsafe.Coerce
7774
78−#ifdef MIN_VERSION_semialign
75+#if defined(MIN_VERSION_semialign)
7976#if MIN_VERSION_these(0,8,0)
8077import Data.These.Combinators (justThese)
8178#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
8579#endif
8680
8781#ifdef DEBUG_CYCLES
8882import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9183import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9284import qualified Data.List.NonEmpty as NonEmpty
85+import Data.Monoid (mempty)
9386import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
87+#endif
9588
9689import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9790import qualified Data.FastWeakBag as FastWeakBag
@@ -106,65 +99,28 @@ import qualified Reflex.Class
10699import qualified Reflex.Class as R
107100import qualified Reflex.Host.Class
108101import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
102+import Reflex.Patch
103+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
112104
113105#ifdef DEBUG_TRACE_EVENTS
114106import qualified Data.ByteString.Char8 as BS8
115107import System.IO (stderr)
116108import Data.List (isPrefixOf)
117−#endif
118−
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122109
123−#ifdef DEBUG_TRACE_EVENTS
124110withStackOneLine :: (BS8.ByteString -> a) -> a
125111withStackOneLine expr = unsafePerformIO $ do
126112 stack <- currentCallStack
127113 return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
114+ where dropInternal = filter (not . isPrefixOf "Reflex.Spider.Internal")
129115
130116#endif
131117
132−debugPropagate :: Bool
133−
134−debugInvalidateHeight :: Bool
135−
136−debugInvalidate :: Bool
137−
138118#ifdef DEBUG
139119#define DEBUG_NODEIDS
140120
141−#ifdef DEBUG_TRACE_PROPAGATION
142−debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146−
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150−debugInvalidateHeight = False
151−#endif
152−
153−#ifdef DEBUG_TRACE_INVALIDATION
154−debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158−
159121class HasNodeId a where
160122 getNodeId :: a -> Int
161123
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168124instance HasNodeId (Hold x p) where
169125 getNodeId = holdNodeId
170126
@@ -185,27 +141,16 @@ instance HasNodeId (Pull x a) where
185141
186142{-# INLINE showNodeId #-}
187143showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
144+showNodeId = ("#"<>) . show . getNodeId
192145
193146
194147#else
195148
196−debugPropagate = False
197−debugInvalidateHeight = False
198−debugInvalidate = False
199−
200149-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
201150{-# INLINE showNodeId #-}
202151showNodeId :: a -> String
203152showNodeId _ = ""
204153
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209154#endif
210155
211156#ifdef DEBUG_NODEIDS
@@ -251,9 +196,9 @@ subscribeAndRead = unEvent
251196-- caching; if the computation function is very cheap, this is (much) more
252197-- efficient than 'push'
253198{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
199+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255200pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
201+ (subscription, occ) <- subscribeAndRead e $ sub
257202 { subscriberPropagate = \a -> do
258203 mb <- f a
259204 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +217,10 @@ terminalSubscriber p = Subscriber
272217
273218-- | Subscribe to an Event only for the duration of one occurrence
274219{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
220+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276221subscribeAndReadHead e sub = do
277222 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
223+ (subscription, occ) <- subscribeAndRead e $ sub
279224 { subscriberPropagate = \a -> do
280225 liftIO $ unsubscribe =<< readIORef subscriptionRef
281226 subscriberPropagate sub a
@@ -286,42 +231,24 @@ subscribeAndReadHead e sub = do
286231 return (subscription, occ)
287232
288233--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
234+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290235headE originalE = do
291236 parent <- liftIO $ newIORef $ Just originalE
292237 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293238 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
239+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295240 when (isJust occ) clearParent
296− return $ Event $ \sub ->
241+ return $ Event $ \sub -> do
297242 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
243+ Nothing -> subscribeAndReadNever
299244 Just e -> subscribeAndReadHead e sub
300245
301246data CacheSubscribed x a
302247 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303248 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304249 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308250 }
309251
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
311−nowSpiderEventM =
312− SpiderEvent <$> now
313−
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
315− ) => m (Event x ())
316−now = do
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
322− , occ
323− )
324−
325252-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326253-- repeatedly
327254--
@@ -346,23 +273,16 @@ cacheEvent e =
346273 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347274 Just subscribedTicket -> return subscribedTicket
348275 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352276 subscribers <- liftIO FastWeakBag.empty
353277 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
354−#ifdef DEBUG_NODEIDS
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
356−#else
357278 (parentSub, occ) <- subscribeAndRead e $ Subscriber
358−#endif
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365− }
279+ { subscriberPropagate = \a -> do
280+ liftIO $ writeIORef occRef (Just a)
281+ scheduleClear occRef
282+ propagateFast a subscribers
283+ , subscriberInvalidateHeight = FastWeakBag.traverse subscribers . invalidateSubscriberHeight
284+ , subscriberRecalculateHeight = FastWeakBag.traverse subscribers . recalculateSubscriberHeight
285+ }
366286 when (isJust occ) $ do
367287 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368288 scheduleClear occRef
@@ -370,22 +290,19 @@ cacheEvent e =
370290 { _cacheSubscribed_subscribers = subscribers
371291 , _cacheSubscribed_parent = parentSub
372292 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376293 }
377294 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378295 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379296 return subscribedTicket
380297 liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381298
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
299+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383300 -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
301+cacheSubscription sub mSubscribedRef subscribedTicket = do
385302 subscribed <- getFastWeakTicketValue subscribedTicket
386303 ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387304 occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
305+
389306 let parentSub = _cacheSubscribed_parent subscribed
390307 es = EventSubscription
391308 { _eventSubscription_unsubscribe = do
@@ -404,9 +321,9 @@ cacheSubscription sub mSubscribedRef subscribedTicket = do
404321 , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405322 , eventSubscribedHasOwnHeightRef = False
406323 , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408324 }
409− }
325+#endif
326+ }
410327 return (es, occ)
411328
412329
@@ -464,6 +381,16 @@ data Subscriber x a = Subscriber
464381 , subscriberRecalculateHeight :: !(Height -> IO ())
465382 }
466383
384+--TODO: Move this comment to WeakBag
385+-- These function are constructor functions that are marked NOINLINE so they are
386+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
387+-- so any weak references that are attached to the constructors will have their
388+-- finalizer run. Using the opaque constructor, does not see the
389+-- constructor application, so it behaves like an IORef and cannot be fused away.
390+--
391+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
392+-- the weak pointer to it in some cases.
393+
467394newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468395newSubscriberHold h = return $ Subscriber
469396 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -485,12 +412,14 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
485412 return ()
486413 , subscriberInvalidateHeight = \old -> do
487414 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
415+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
416+
489417 , subscriberRecalculateHeight = \new -> do
490418 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
419+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
492420 }
493421
422+
494423newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495424newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
496425 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
@@ -501,7 +430,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
501430 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502431 when (oldHeight /= invalidHeight) $ do
503432 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
433+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505434 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506435 }
507436
@@ -517,17 +446,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
517446 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518447 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519448 case occ of
520− Nothing ->
449+ Nothing -> do
521450 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522451 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
452+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
453+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525454 Just o -> do -- Since it's already firing, no need to adjust height
526455 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527456 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528457 propagate o $ coincidenceSubscribedSubscribers subscribed
529458 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
459+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
531460 }
532461
533462newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -551,18 +480,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551480recalculateSubscriberHeight = flip subscriberRecalculateHeight
552481
553482-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
483+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
484+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
556485 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
557486 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
487+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559488
560489-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
490+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
491+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
563492 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
564493 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
494+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566495
567496--------------------------------------------------------------------------------
568497-- EventSubscribed
@@ -607,16 +536,6 @@ eventSubscribedNever = EventSubscribed
607536 , eventSubscribedWhoCreated = return ["never"]
608537#endif
609538 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620539
621540eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622541eventSubscribedFan !subscribed = EventSubscribed
@@ -994,10 +913,8 @@ instance Monad (BehaviorM x) where
994913 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995914 {-# INLINE return #-}
996915 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998916 {-# INLINE fail #-}
999917 fail s = BehaviorM $ fail s
1000−#endif
1001918
1002919data BehaviorSubscribed x a
1003920 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +974,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057974newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058975
1059976-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
977+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1061978
1062979newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1063980
@@ -1082,8 +999,7 @@ heightBagFromList :: [Height] -> HeightBag
1082999heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831000
10841001heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1002+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871003
10881004heightBagRemove :: Height -> HeightBag -> HeightBag
10891005heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1008,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921008 0 -> IntMap.delete h c
10931009 _ -> IntMap.insert h (pred old) c
10941010
1095−heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1096−heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1097− removed old = HeightBag (pred s) $ case old of
1098− 0 -> IntMap.delete h c
1099− _ -> IntMap.insert h (pred old) c
1100−
1101−
11021011heightBagMax :: HeightBag -> Height
11031012heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041013 Just ((h, _), _) -> Height h
@@ -1199,10 +1108,7 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991108 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001109 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011110
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1111+#if defined(MIN_VERSION_semialign)
12061112 zip x y = mapMaybe justThese $ align x y
12071113#endif
12081114
@@ -1346,7 +1252,7 @@ mkWeakPtrWithDebug x debugNote = do
13461252 x' <- evaluate x
13471253 mkWeakPtr x' $
13481254 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1255+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501256 else Nothing
13511257
13521258type WeakList a = [Weak a]
@@ -1359,22 +1265,19 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13591265#ifdef DEBUG
13601266
13611267debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1268+debugSubscriber description subscribed = return $ Subscriber
13661269 {
13671270 subscriberPropagate = \m -> do
13681271 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
13691272 subscriberPropagate subscribed m
13701273 , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1274+ putStrLn $ "invalidateSubscriberHeight: " <> description
13721275 subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1276+ putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
13741277 , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1278+ putStrLn $ "subscriberRecalculateHeight: " <> description
13761279 subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1280+ putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
13781281 }
13791282
13801283
@@ -1388,15 +1291,11 @@ withIncreasedDepth _ a = do
13881291
13891292{-# INLINE tracePropagate #-}
13901293tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1294+tracePropagate p = trace p
13921295
13931296{-# INLINE traceInvalidate #-}
13941297traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1298+traceInvalidate = liftIO . putStrLn
14001299
14011300{-# INLINE trace #-}
14021301trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1407,7 +1306,7 @@ traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
14071306traceM _ getMessage = do
14081307 message <- getMessage
14091308 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1309+ liftIO $ putStrLn $ replicate d ' ' <> message
14111310
14121311#else
14131312
@@ -1423,20 +1322,10 @@ tracePropagate _ _ = return ()
14231322traceInvalidate :: String -> IO ()
14241323traceInvalidate _ = return ()
14251324
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
14301325{-# INLINE debugSubscriber #-}
14311326debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
14321327debugSubscriber _ = return
14331328
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
14401329{-# INLINE trace #-}
14411330trace :: (CanTrace x m) => proxy x -> String -> m ()
14421331trace _ _ = return ()
@@ -1447,9 +1336,18 @@ traceM _ _ = return ()
14471336
14481337#endif
14491338
1339+
14501340whoCreatedIORef :: IORef a -> IO [String]
14511341whoCreatedIORef (IORef a) = whoCreated $! a
14521342
1343+#ifdef DEBUG_CYCLES
1344+
1345+data EventLoopException = EventLoopException (Forest String)
1346+instance Exception EventLoopException
1347+
1348+instance Show EventLoopException where
1349+ show (EventLoopException stacks) = "Causality loop detected:\n" <> drawForest stacks
1350+
14531351groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541352groupByHead = \case
14551353 [] -> []
@@ -1460,28 +1358,7 @@ groupByHead = \case
14601358 | otherwise -> (x, xs :| []) : l
14611359
14621360listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1361+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14851362
14861363#else
14871364
@@ -1489,8 +1366,8 @@ data EventLoopException = EventLoopException
14891366instance Exception EventLoopException
14901367
14911368instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1369+ show EventLoopException = "Causality loop detected: \n" <>
1370+ "no location information, compile with --enable-profiling and reflex with flag 'debug-cycles'"
14941371
14951372#endif
14961373
@@ -1498,7 +1375,7 @@ instance Show EventLoopException where
14981375{-# INLINE propagateSubscriberHold #-}
14991376propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001377propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1378+ traceM (Proxy :: Proxy x) $ liftIO $ do
15021379 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031380 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
15041381
@@ -1506,7 +1383,7 @@ propagateSubscriberHold h a = do
15061383 case {-# SCC "apply" #-} apply a v of
15071384 Nothing -> return ()
15081385 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1386+ withIncreasedDepth (Proxy :: Proxy x) $
15101387 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
15111388 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121389 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1627,9 +1504,6 @@ data FanInt x a = FanInt
16271504 { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
16281505 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291506 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331507 }
16341508
16351509newFanInt :: IO (FanInt x a)
@@ -1637,16 +1511,10 @@ newFanInt = do
16371511 subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
16381512 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391513 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431514 return $ FanInt
16441515 { _fanInt_subscribers = subscribers
16451516 , _fanInt_subscriptionRef = subscriptionRef
16461517 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501518 }
16511519
16521520fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1523,20 @@ fanInt p = unsafePerformIO $ do
16551523 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561524 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571525 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1526+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601527 { subscriberPropagate = \m -> do
16611528 liftIO $ writeIORef (_fanInt_occRef self) m
16621529 scheduleIntClear $ _fanInt_occRef self
16631530 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1531+ FastWeakBag.traverse b $ \s ->
16651532 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1533+ , subscriberInvalidateHeight = \old ->
1534+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1535+ FastWeakBag.traverse b $ \s ->
16691536 subscriberInvalidateHeight s old
16701537 , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1538+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1539+ FastWeakBag.traverse b $ \s ->
16731540 subscriberRecalculateHeight s new
16741541 }
16751542 liftIO $ do
@@ -1685,14 +1552,14 @@ fanInt p = unsafePerformIO $ do
16851552 Just b -> return b
16861553 ticket <- liftIO $ FastWeakBag.insert sub b
16871554 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1555+
16891556 subscribed <- fanIntSubscribed ticket self
16901557 return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
16911558
16921559fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1560+fanIntSubscribed ticket self = do
16941561 subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1562+ return $ EventSubscribed
16961563 { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
16971564 , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
16981565#ifdef DEBUG_CYCLES
@@ -1701,7 +1568,7 @@ fanIntSubscribed ticket self = do
17011568 , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
17021569#endif
17031570 }
1704−
1571+
17051572
17061573{-# INLINABLE getFanSubscribed #-}
17071574getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1914,7 +1781,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141781 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151782 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161783 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1784+ oldHeight <- liftIO $ getEventSubscribedHeight $
19181785 _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19191786
19201787 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
@@ -1960,7 +1827,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601827 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611828 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621829 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1830+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
19641831 _mergeSubscribedParentWithMove_subscription parent
19651832
19661833 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
@@ -1968,7 +1835,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19681835 Just toKey -> do
19691836 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701837 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1838+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
19721839 DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19731840
19741841 return (toDelete, applyAlways p' oldParents)
@@ -2021,16 +1888,16 @@ invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211888invalidateMergeHeight' heightRef sub = do
20221889 oldHeight <- readIORef heightRef
20231890 -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024− when (oldHeight /= invalidHeight) $ do
1891+ when (oldHeight /= invalidHeight) $ do
20251892 writeIORef heightRef $! invalidHeight
20261893 subscriberInvalidateHeight sub oldHeight
20271894
20281895revalidateMergeHeight :: Merge x k v s -> IO ()
20291896revalidateMergeHeight m = do
20301897 currentHeight <- readIORef $ _merge_heightRef m
2031−
1898+
20321899 -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
1900+ when (currentHeight == invalidHeight) $ do
20341901 heights <- readIORef $ _merge_heightBagRef m
20351902 parents <- readIORef $ _merge_parentsRef m
20361903 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1905,7 @@ revalidateMergeHeight m = do
20381905 LT -> return ()
20391906 EQ -> do
20401907 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1908+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
20421909 writeIORef (_merge_heightRef m) $! height
20431910 subscriberRecalculateHeight (_merge_sub m) height
20441911 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,35 +1913,32 @@ revalidateMergeHeight m = do
20461913scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471914scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481915 vals <- liftIO $ readIORef $ _merge_accumRef m
2049− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
1916+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
20501917 -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
1918+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
20521919 --TODO: Assert that m is not empty
20531920 subscriberPropagate (_merge_sub m) vals
20541921
2055−checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056−checkCycle subscribed = liftIO $ do
2057− height <- readIORef (eventSubscribedHeightRef subscribed)
2058−
2059− -- currentHeight <- getCurrentHeight
2060− -- when (height <= currentHeight) $ if height /= invalidHeight
2061− -- then do
2062− -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063− -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2064− -- else liftIO $
2065− when (height == invalidHeight) $
1922+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> Height -> EventM x ()
1923+checkCycle subscribed height = do
1924+ currentHeight <- getCurrentHeight
1925+ when (height <= currentHeight) $ if height /= invalidHeight
1926+ then do
1927+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1928+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1929+ else liftIO $
20661930#ifdef DEBUG_CYCLES
2067− do
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
1931+ do
1932+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
1933+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
1934+ throwIO (EventLoopException (listsToForest stacks))
20711935#else
2072− throwIO EventLoopException
1936+ throwIO EventLoopException
20731937#endif
1938+
20741939
2075−
2076−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077−mergeSubscriber subscribed m getKey = Subscriber
1940+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1941+mergeSubscriber m getKey = Subscriber
20781942 { subscriberPropagate = \a -> do
20791943 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801944 k <- getKey
@@ -2083,7 +1947,7 @@ mergeSubscriber subscribed m getKey = Subscriber
20831947 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841948 when (DMap.null oldM) $ do -- Only schedule the firing once
20851949 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
1950+ -- checkCycle (_merge_sub m) height --TODO: assertions about height
20871951
20881952 scheduleMergeSelf m height
20891953 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
@@ -2095,11 +1959,11 @@ mergeSubscriber subscribed m getKey = Subscriber
20951959 }
20961960
20971961--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
1962+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1963+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001964 where updateMe = do
21011965 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1966+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031967 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041968 return subscriptionsToKill
21051969
@@ -2112,28 +1976,14 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21121976 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131977 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141978 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120−#ifdef DEBUG_CYCLES
2121− , eventSubscribedGetParents = do
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123− fmap getParent' . DMap.toList <$> readIORef parentsRef
2124− , eventSubscribedHasOwnHeightRef = False
2125− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126−#endif
2127− }
2128−
2129− m = Merge
1979+ let m = Merge
21301980 { _merge_parentsRef = parentsRef
21311981 , _merge_heightBagRef = heightBagRef
21321982 , _merge_heightRef = heightRef
21331983 , _merge_sub = sub
21341984 , _merge_accumRef = accumRef
21351985 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1986+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371987 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381988 myHeight = if invalidHeight `elem` heights
21391989 then invalidHeight
@@ -2142,29 +1992,40 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421992 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431993 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441994 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1995+ unless (DMap.null accum) $ do
1996+ scheduleMergeSelf m myHeight
21461997 liftIO $ writeIORef accumRef $! accum
21471998 liftIO $ writeIORef heightRef $! myHeight
21481999 liftIO $ writeIORef heightBagRef $! myHeightBag
2000+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21492001 liftIO $ writeIORef parentsRef $! initialParentState
21502002 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
2003+ let s = Subscriber
21522004 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
2005+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2006+ defer $ updateMerge m updateFunc a
21552007 , subscriberInvalidateHeight = \_ -> return ()
21562008 , subscriberRecalculateHeight = \_ -> return ()
21572009 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2010+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2011+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21602012 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21612013 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21622014 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2015+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21642016 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2017+ getParent' = \(_ :=> v) -> _eventSubscription_subscribed (getParent v)
2018+ subscribed = EventSubscribed
2019+ { eventSubscribedHeightRef = heightRef
2020+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2021+#ifdef DEBUG_CYCLES
2022+ , eventSubscribedGetParents = fmap getParent' . DMap.toList <$> readIORef parentsRef
2023+ , eventSubscribedHasOwnHeightRef = False
2024+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2025+ }
2026+#endif
21662027 return (EventSubscription unsubscribeAll subscribed, occ)
2167−
2028+
21682029
21692030mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21702031mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +2038,13 @@ mergeIntCheap d = Event $ \sub -> do
21772038 heightRef <- liftIO $ newIORef zeroHeight
21782039 heightBagRef <- liftIO $ newIORef heightBagEmpty
21792040 parents <- liftIO $ FastMutableIntMap.newEmpty
2180− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181− let subscribed = EventSubscribed
2182− { eventSubscribedHeightRef = heightRef
2183− , eventSubscribedRetained = toAny (parents, changeSubdRef)
2184−#ifdef DEBUG_CYCLES
2185− , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186− , eventSubscribedHasOwnHeightRef = False
2187− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188−#endif
2189− }
21902041 let scheduleSelf = do
21912042 height <- liftIO $ readIORef $ heightRef
21922043 scheduleMerge' height heightRef $ do
21932044 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21942045 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2046+ invalidateMyHeight = do
2047+ invalidateMergeHeight' heightRef sub
21962048 recalculateMyHeight = do
21972049 currentHeight <- readIORef heightRef
21982050 when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
@@ -2202,14 +2054,14 @@ mergeIntCheap d = Event $ \sub -> do
22022054 LT -> return ()
22032055 EQ -> do
22042056 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2057+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
22062058 writeIORef heightRef $! height
22072059 subscriberRecalculateHeight sub height
22082060 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22092061 mySubscriber k = Subscriber
22102062 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
2063+ -- liftIO (readIORef heightRef) >>= checkCycle
2064+
22132065 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22142066 liftIO $ FastMutableIntMap.insert accum k a
22152067 when wasEmpty scheduleSelf
@@ -2243,6 +2095,7 @@ mergeIntCheap d = Event $ \sub -> do
22432095 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442096 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452097 return Nothing
2098+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462099 defer $ SomeMergeInit $ do
22472100 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482101 where
@@ -2256,25 +2109,31 @@ mergeIntCheap d = Event $ \sub -> do
22562109 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572110 liftIO $ for_ oldParents $ \oldParent -> do
22582111 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612112 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622113 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2114+ let s = Subscriber
22642115 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652116 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662117 defer $ updateMe a
22672118 , subscriberInvalidateHeight = \_ -> return ()
22682119 , subscriberRecalculateHeight = \_ -> return ()
22692120 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2121+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712122 forM_ change $ \c -> defer $ updateMe c
22722123 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732124 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742125 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2126+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762127 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2128+ subscribed = EventSubscribed
2129+ { eventSubscribedHeightRef = heightRef
2130+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2131+#ifdef DEBUG_CYCLES
2132+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2133+ , eventSubscribedHasOwnHeightRef = False
2134+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2135+ }
2136+#endif
22782137
22792138 return (EventSubscription unsubscribeAll subscribed, occ)
22802139
@@ -2385,7 +2244,7 @@ runFrame a = SpiderHost $ do
23852244 subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
23862245 {-
23872246 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2247+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892248 EventRoot _ -> "EventRoot"
23902249 EventNever -> "EventNever"
23912250 _ -> "something else"
@@ -2400,7 +2259,7 @@ runFrame a = SpiderHost $ do
24002259 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012260 when (parentHeight /= myHeight) $ do
24022261 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2262+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042263 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
24052264 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062265 unsubscribe subscription
@@ -2441,7 +2300,7 @@ invalidateCoincidenceHeight subscribed = do
24412300 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422301 when (oldHeight /= invalidHeight) $ do
24432302 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2303+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452304
24462305updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472306updateSwitchHeight new subscribed = do
@@ -2449,7 +2308,7 @@ updateSwitchHeight new subscribed = do
24492308 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502309 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512310 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2311+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532312
24542313recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552314recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2317,7 @@ recalculateCoincidenceHeight subscribed = do
24582317 height <- calculateCoincidenceHeight subscribed
24592318 when (height /= invalidHeight) $ do
24602319 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2320+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622321
24632322calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642323calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2379,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202379 {-# INLINABLE headE #-}
25212380 headE = R.slowHeadE
25222381-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252382
25262383instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272384 {-# INLINABLE sample #-}
@@ -2543,9 +2400,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432400 {-# INLINABLE headE #-}
25442401 headE = R.slowHeadE
25452402-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492403
25502404instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512405 {-# INLINE return #-}
@@ -2554,10 +2408,8 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542408 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552409 {-# INLINE (>>) #-}
25562410 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582411 {-# INLINE fail #-}
25592412 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612413
25622414{-# INLINABLE newJoinDyn #-}
25632415newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2609,9 +2461,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092461 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102462 {-# INLINABLE headE #-}
26112463 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152464
26162465instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172466 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2477,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282477 {-# INLINABLE headE #-}
26292478 headE = R.slowHeadE
26302479-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332480
26342481instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352482 {-# INLINABLE sample #-}
@@ -2650,8 +2497,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502497 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512498 {-# INLINABLE headE #-}
26522499 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552500
26562501--------------------------------------------------------------------------------
26572502-- Deprecated items
@@ -2775,7 +2620,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752620 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762621 {-# INLINABLE mergeG #-}
27772622 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2623+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792624 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802625 -> DMap k q
27812626 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2843,14 +2688,8 @@ instance Monad (SpiderHost x) where
28432688 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442689 {-# INLINABLE return #-}
28452690 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847− {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
28522691 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2692+ fail s = SpiderHost $ fail s
28542693
28552694-- | Run an action affecting the global Spider timeline; this will be guarded by
28562695-- a mutex for that timeline
@@ -2872,10 +2711,8 @@ instance Monad (SpiderHostFrame x) where
28722711 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732712 {-# INLINABLE return #-}
28742713 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762714 {-# INLINABLE fail #-}
28772715 fail s = SpiderHostFrame $ fail s
2878−#endif
28792716
28802717instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812718 notReadyUntil _ = pure ()
@@ -2920,11 +2757,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202757instance PrimMonad (SpiderHostFrame x) where
29212758 type PrimState (SpiderHostFrame x) = PrimState IO
29222759 primitive = SpiderHostFrame . EventM . primitive
2923−
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2927−
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()