@@ -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,13 +59,12 @@ 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)
70−import GHC.Exts hiding (toList)
67+import GHC.Exts
7168import GHC.IORef (IORef (..))
7269import GHC.Stack
7370import Reflex.FastWeak
@@ -75,27 +72,22 @@ 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
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
89+import Data.FastWeakBag (FastWeakBag)
9790import qualified Data.FastWeakBag as FastWeakBag
98−
9991import Data.Reflection
10092import Data.Some (Some(Some))
10193import Data.Type.Coercion
@@ -106,65 +98,29 @@ import qualified Reflex.Class
10698import qualified Reflex.Class as R
10799import qualified Reflex.Host.Class
108100import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
101+import Reflex.Patch
102+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
112103
113104#ifdef DEBUG_TRACE_EVENTS
114105import qualified Data.ByteString.Char8 as BS8
115106import System.IO (stderr)
116−import Data.List (isPrefixOf)
117107#endif
118108
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123109#ifdef DEBUG_TRACE_EVENTS
110+
124111withStackOneLine :: (BS8.ByteString -> a) -> a
125112withStackOneLine expr = unsafePerformIO $ do
126113 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
114+ return (expr (BS8.pack (unwords (reverse stack))))
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 -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
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,18 @@ 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 = \old -> do
284+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
285+ , subscriberRecalculateHeight = \new -> do
286+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
287+ }
366288 when (isJust occ) $ do
367289 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368290 scheduleClear occRef
@@ -370,45 +292,29 @@ cacheEvent e =
370292 { _cacheSubscribed_subscribers = subscribers
371293 , _cacheSubscribed_parent = parentSub
372294 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376295 }
377296 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378297 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379298 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
411−
299+ liftIO $ do
300+ subscribed <- getFastWeakTicketValue subscribedTicket
301+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
302+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
303+ let es = EventSubscription
304+ { _eventSubscription_unsubscribe = do
305+ FastWeakBag.remove ticket
306+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
307+ when isEmpty $ do
308+ writeIORef mSubscribedRef emptyFastWeak
309+ unsubscribe $ _cacheSubscribed_parent subscribed
310+ touch ticket
311+ touch subscribedTicket
312+ , _eventSubscription_subscribed = EventSubscribed
313+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
314+ , eventSubscribedRetained = toAny subscribedTicket
315+ }
316+ }
317+ return (es, occ)
412318
413319subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414320subscribe e s = fst <$> subscribeAndRead e s
@@ -423,11 +329,8 @@ wrap tag getSpecificSubscribed sub = do
423329eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
424330eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425331
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429332eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
333+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431334
432335eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433336eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +367,16 @@ data Subscriber x a = Subscriber
464367 , subscriberRecalculateHeight :: !(Height -> IO ())
465368 }
466369
370+--TODO: Move this comment to WeakBag
371+-- These function are constructor functions that are marked NOINLINE so they are
372+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
373+-- so any weak references that are attached to the constructors will have their
374+-- finalizer run. Using the opaque constructor, does not see the
375+-- constructor application, so it behaves like an IORef and cannot be fused away.
376+--
377+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
378+-- the weak pointer to it in some cases.
379+
467380newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468381newSubscriberHold h = return $ Subscriber
469382 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -485,12 +398,14 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
485398 return ()
486399 , subscriberInvalidateHeight = \old -> do
487400 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
401+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
402+
489403 , subscriberRecalculateHeight = \new -> do
490404 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
405+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
492406 }
493407
408+
494409newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495410newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
496411 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
@@ -501,7 +416,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
501416 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502417 when (oldHeight /= invalidHeight) $ do
503418 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
419+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505420 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506421 }
507422
@@ -517,17 +432,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
517432 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518433 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519434 case occ of
520− Nothing ->
435+ Nothing -> do
521436 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522437 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
438+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
439+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525440 Just o -> do -- Since it's already firing, no need to adjust height
526441 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527442 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528443 propagate o $ coincidenceSubscribedSubscribers subscribed
529444 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
445+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
531446 }
532447
533448newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -551,18 +466,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551466recalculateSubscriberHeight = flip subscriberRecalculateHeight
552467
553468-- | 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) $
469+propagate :: forall a x. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
470+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
556471 -- 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
557472 --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
473+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559474
560475-- | 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) $
476+propagateFast :: forall a x. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
477+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
563478 -- 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
564479 --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
480+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566481
567482--------------------------------------------------------------------------------
568483-- EventSubscribed
@@ -580,7 +495,7 @@ data EventSubscribed x = EventSubscribed
580495 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581496 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582497#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
498+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584499 , eventSubscribedHasOwnHeightRef :: !Bool
585500 , eventSubscribedWhoCreated :: !(IO [String])
586501#endif
@@ -607,23 +522,13 @@ eventSubscribedNever = EventSubscribed
607522 , eventSubscribedWhoCreated = return ["never"]
608523#endif
609524 }
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− }
620525
621526eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622527eventSubscribedFan !subscribed = EventSubscribed
623528 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624529 , eventSubscribedRetained = toAny subscribed
625530#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
531+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627532 , eventSubscribedHasOwnHeightRef = False
628533 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629534#endif
@@ -636,7 +541,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636541#ifdef DEBUG_CYCLES
637542 , eventSubscribedGetParents = do
638543 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
544+ return [Some $ _eventSubscription_subscribed s]
640545 , eventSubscribedHasOwnHeightRef = True
641546 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642547#endif
@@ -649,8 +554,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649554#ifdef DEBUG_CYCLES
650555 , eventSubscribedGetParents = do
651556 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
557+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
558+ innerParents = maybeToList $ fmap Some innerSubscription
654559 return $ outerParent : innerParents
655560 , eventSubscribedHasOwnHeightRef = True
656561 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +569,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664569whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665570whoCreatedEventSubscribed = eventSubscribedWhoCreated
666571
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
572+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668573walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
574+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670575 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671576 when (h == invalidHeight) $ do
672577 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
578+ modify (Some s :)
674579 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
580+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676581 return subscribers
677582#endif
678583
@@ -994,10 +899,8 @@ instance Monad (BehaviorM x) where
994899 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995900 {-# INLINE return #-}
996901 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998902 {-# INLINE fail #-}
999903 fail s = BehaviorM $ fail s
1000−#endif
1001904
1002905data BehaviorSubscribed x a
1003906 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +960,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057960newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058961
1059962-- 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)
963+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1061964
1062965newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1063966
@@ -1082,8 +985,7 @@ heightBagFromList :: [Height] -> HeightBag
1082985heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083986
1084987heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
988+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087989
1088990heightBagRemove :: Height -> HeightBag -> HeightBag
1089991heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +994,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092994 0 -> IntMap.delete h c
1093995 _ -> IntMap.insert h (pred old) c
1094996
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−
1102997heightBagMax :: HeightBag -> Height
1103998heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104999 Just ((h, _), _) -> Height h
@@ -1199,10 +1094,7 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991094 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001095 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011096
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1097+#if defined(MIN_VERSION_semialign)
12061098 zip x y = mapMaybe justThese $ align x y
12071099#endif
12081100
@@ -1346,7 +1238,7 @@ mkWeakPtrWithDebug x debugNote = do
13461238 x' <- evaluate x
13471239 mkWeakPtr x' $
13481240 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1241+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501242 else Nothing
13511243
13521244type WeakList a = [Weak a]
@@ -1359,22 +1251,19 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13591251#ifdef DEBUG
13601252
13611253debugSubscriber :: 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
1254+debugSubscriber description subscribed = return $ Subscriber
13661255 {
13671256 subscriberPropagate = \m -> do
13681257 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
13691258 subscriberPropagate subscribed m
13701259 , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1260+ putStrLn $ "invalidateSubscriberHeight: " <> description
13721261 subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1262+ putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
13741263 , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1264+ putStrLn $ "subscriberRecalculateHeight: " <> description
13761265 subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1266+ putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
13781267 }
13791268
13801269
@@ -1388,15 +1277,11 @@ withIncreasedDepth _ a = do
13881277
13891278{-# INLINE tracePropagate #-}
13901279tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1280+tracePropagate p = trace p
13921281
13931282{-# INLINE traceInvalidate #-}
13941283traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1284+traceInvalidate = liftIO . putStrLn
14001285
14011286{-# INLINE trace #-}
14021287trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1407,12 +1292,12 @@ traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
14071292traceM _ getMessage = do
14081293 message <- getMessage
14091294 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1295+ liftIO $ putStrLn $ replicate d ' ' <> message
14111296
14121297#else
14131298
14141299{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1300+withIncreasedDepth :: forall x m proxy a. HasSpiderTimeline x => proxy x -> m a -> m a
14161301withIncreasedDepth _ = id
14171302
14181303{-# INLINE tracePropagate #-}
@@ -1423,20 +1308,10 @@ tracePropagate _ _ = return ()
14231308traceInvalidate :: String -> IO ()
14241309traceInvalidate _ = return ()
14251310
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
14301311{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1312+debugSubscriber :: HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
14321313debugSubscriber _ = return
14331314
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
14401315{-# INLINE trace #-}
14411316trace :: (CanTrace x m) => proxy x -> String -> m ()
14421317trace _ _ = return ()
@@ -1447,9 +1322,13 @@ traceM _ _ = return ()
14471322
14481323#endif
14491324
1325+
1326+
1327+
14501328whoCreatedIORef :: IORef a -> IO [String]
14511329whoCreatedIORef (IORef a) = whoCreated $! a
14521330
1331+#ifdef DEBUG_CYCLES
14531332groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541333groupByHead = \case
14551334 [] -> []
@@ -1460,45 +1339,13 @@ groupByHead = \case
14601339 | otherwise -> (x, xs :| []) : l
14611340
14621341listsToForest :: 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
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance 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"
1494−
1342+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951343#endif
14961344
1497−
14981345{-# INLINE propagateSubscriberHold #-}
14991346propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001347propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1348+ traceM (Proxy :: Proxy x) $ liftIO $ do
15021349 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031350 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
15041351
@@ -1506,7 +1353,7 @@ propagateSubscriberHold h a = do
15061353 case {-# SCC "apply" #-} apply a v of
15071354 Nothing -> return ()
15081355 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1356+ withIncreasedDepth (Proxy :: Proxy x) $
15101357 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
15111358 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121359 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1627,9 +1474,6 @@ data FanInt x a = FanInt
16271474 { _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
16281475 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291476 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331477 }
16341478
16351479newFanInt :: IO (FanInt x a)
@@ -1637,16 +1481,10 @@ newFanInt = do
16371481 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
16381482 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391483 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431484 return $ FanInt
16441485 { _fanInt_subscribers = subscribers
16451486 , _fanInt_subscriptionRef = subscriptionRef
16461487 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501488 }
16511489
16521490fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1493,20 @@ fanInt p = unsafePerformIO $ do
16551493 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561494 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571495 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
1496+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601497 { subscriberPropagate = \m -> do
16611498 liftIO $ writeIORef (_fanInt_occRef self) m
16621499 scheduleIntClear $ _fanInt_occRef self
1663− 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 ->
1500+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1501+ FastWeakBag.traverse b $ \s -> do
16651502 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1503+ , subscriberInvalidateHeight = \old -> do
1504+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1505+ FastWeakBag.traverse b $ \s -> do
16691506 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1507+ , subscriberRecalculateHeight = \new -> do
1508+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1509+ FastWeakBag.traverse b $ \s -> do
16731510 subscriberRecalculateHeight s new
16741511 }
16751512 liftIO $ do
@@ -1683,25 +1520,10 @@ fanInt p = unsafePerformIO $ do
16831520 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841521 return b
16851522 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1523+ t <- liftIO $ FastWeakBag.insert sub b
16871524 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691−
1692−fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1694− subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1696− { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697− , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698−#ifdef DEBUG_CYCLES
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702−#endif
1703− }
1704−
1525+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1526+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051527
17061528{-# INLINABLE getFanSubscribed #-}
17071529getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1899,7 +1721,7 @@ mergeCheap
18991721 => (forall a. q a -> Event x (v a))
19001722 -> DynamicS x (PatchDMap k q)
19011723 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1724+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031725 where
19041726 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051727 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1736,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141736 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151737 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161738 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1739+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201740 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211741 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221742 foldM f ([], oldParents) $ DMap.toList p
@@ -1941,7 +1761,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411761 => (forall a. q a -> Event x (v a))
19421762 -> DynamicS x (PatchDMapWithMove k q)
19431763 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1764+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451765 where
19461766 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471767 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1780,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601780 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611781 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621782 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1783+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661784 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671785 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681786 Just toKey -> do
19691787 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701788 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1789+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741790 return (toDelete, applyAlways p' oldParents)
19751791 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761792 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1811,6 @@ type MergeUpdateFunc k v x p s
19951811 -> p
19961812 -> EventM x ([EventSubscription x], DMap k s)
19971813
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001814type MergeInitFunc k v q x s
20011815 = DMap k q
20021816 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1834,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201834invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211835invalidateMergeHeight' heightRef sub = do
20221836 oldHeight <- readIORef heightRef
2023− -- 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
1837+ when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
20251838 writeIORef heightRef $! invalidHeight
20261839 subscriberInvalidateHeight sub oldHeight
20271840
20281841revalidateMergeHeight :: Merge x k v s -> IO ()
20291842revalidateMergeHeight m = do
20301843 currentHeight <- readIORef $ _merge_heightRef m
2031−
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
1844+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341845 heights <- readIORef $ _merge_heightBagRef m
20351846 parents <- readIORef $ _merge_parentsRef m
20361847 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1849,7 @@ revalidateMergeHeight m = do
20381849 LT -> return ()
20391850 EQ -> do
20401851 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1852+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
20421853 writeIORef (_merge_heightRef m) $! height
20431854 subscriberRecalculateHeight (_merge_sub m) height
20441855 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1857,36 @@ revalidateMergeHeight m = do
20461857scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471858scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481859 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,
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
1860+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
20521861 --TODO: Assert that m is not empty
20531862 subscriberPropagate (_merge_sub m) vals
20541863
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) $
2066−#ifdef DEBUG_CYCLES
2067− do
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
2071−#else
2072− throwIO EventLoopException
2073−#endif
2074−
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
1864+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1865+mergeSubscriber m getKey = Subscriber
20781866 { subscriberPropagate = \a -> do
20791867 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801868 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1869+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821870 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831871 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841872 when (DMap.null oldM) $ do -- Only schedule the firing once
20851873 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1874+ --TODO: assertions about height
1875+ currentHeight <- getCurrentHeight
1876+ when (height <= currentHeight) $ do
1877+ if height /= invalidHeight
1878+ then do
1879+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1880+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1881+ else liftIO $ do
1882+#ifdef DEBUG_CYCLES
1883+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1884+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1885+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1886+#else
1887+ let cycleInfo = ""
1888+#endif
1889+ error $ "Causality loop found" <> cycleInfo
20881890 scheduleMergeSelf m height
20891891 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901892 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1897,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951897 }
20961898
20971899--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)
1900+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1901+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001902 where updateMe = do
21011903 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1904+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031905 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041906 return subscriptionsToKill
21051907
21061908{-# INLINE mergeGCheap' #-}
21071909mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1910+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1911+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101912 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111913 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121914 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131915 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141916 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
1917+ let m = Merge
21301918 { _merge_parentsRef = parentsRef
21311919 , _merge_heightBagRef = heightBagRef
21321920 , _merge_heightRef = heightRef
21331921 , _merge_sub = sub
21341922 , _merge_accumRef = accumRef
21351923 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1924+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371925 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381926 myHeight = if invalidHeight `elem` heights
21391927 then invalidHeight
@@ -2142,29 +1930,31 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421930 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431931 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441932 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1933+ unless (DMap.null accum) $ do
1934+ scheduleMergeSelf m myHeight
21461935 liftIO $ writeIORef accumRef $! accum
21471936 liftIO $ writeIORef heightRef $! myHeight
21481937 liftIO $ writeIORef heightBagRef $! myHeightBag
1938+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491939 liftIO $ writeIORef parentsRef $! initialParentState
21501940 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1941+ let s = Subscriber
21521942 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1943+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1944+ defer $ updateMerge m updateFunc a
21551945 , subscriberInvalidateHeight = \_ -> return ()
21561946 , subscriberRecalculateHeight = \_ -> return ()
21571947 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1948+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1949+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601950 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611951 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621952 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1953+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641954 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
1955+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1956+ , occ
1957+ )
21681958
21691959mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701960mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +1967,13 @@ mergeIntCheap d = Event $ \sub -> do
21771967 heightRef <- liftIO $ newIORef zeroHeight
21781968 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791969 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− }
21901970 let scheduleSelf = do
21911971 height <- liftIO $ readIORef $ heightRef
21921972 scheduleMerge' height heightRef $ do
21931973 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941974 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1975+ invalidateMyHeight = do
1976+ invalidateMergeHeight' heightRef sub
21961977 recalculateMyHeight = do
21971978 currentHeight <- readIORef heightRef
21981979 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 +1983,12 @@ mergeIntCheap d = Event $ \sub -> do
22021983 LT -> return ()
22031984 EQ -> do
22041985 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1986+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
22061987 writeIORef heightRef $! height
22071988 subscriberRecalculateHeight sub height
22081989 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091990 mySubscriber k = Subscriber
22101991 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131992 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141993 liftIO $ FastMutableIntMap.insert accum k a
22151994 when wasEmpty scheduleSelf
@@ -2243,6 +2022,7 @@ mergeIntCheap d = Event $ \sub -> do
22432022 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442023 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452024 return Nothing
2025+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462026 defer $ SomeMergeInit $ do
22472027 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482028 where
@@ -2256,27 +2036,25 @@ mergeIntCheap d = Event $ \sub -> do
22562036 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572037 liftIO $ for_ oldParents $ \oldParent -> do
22582038 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612039 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622040 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2041+ let s = Subscriber
22642042 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652043 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662044 defer $ updateMe a
22672045 , subscriberInvalidateHeight = \_ -> return ()
22682046 , subscriberRecalculateHeight = \_ -> return ()
22692047 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2048+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712049 forM_ change $ \c -> defer $ updateMe c
22722050 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732051 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742052 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2053+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762054 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2055+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2056+ , occ
2057+ )
22802058
22812059newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
22822060newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2385,7 +2163,7 @@ runFrame a = SpiderHost $ do
23852163 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
23862164 {-
23872165 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2166+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892167 EventRoot _ -> "EventRoot"
23902168 EventNever -> "EventNever"
23912169 _ -> "something else"
@@ -2400,7 +2178,7 @@ runFrame a = SpiderHost $ do
24002178 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012179 when (parentHeight /= myHeight) $ do
24022180 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2181+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042182 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
24052183 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062184 unsubscribe subscription
@@ -2441,7 +2219,7 @@ invalidateCoincidenceHeight subscribed = do
24412219 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422220 when (oldHeight /= invalidHeight) $ do
24432221 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2222+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452223
24462224updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472225updateSwitchHeight new subscribed = do
@@ -2449,7 +2227,7 @@ updateSwitchHeight new subscribed = do
24492227 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502228 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512229 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2230+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532231
24542232recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552233recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2236,7 @@ recalculateCoincidenceHeight subscribed = do
24582236 height <- calculateCoincidenceHeight subscribed
24592237 when (height /= invalidHeight) $ do
24602238 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2239+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622240
24632241calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642242calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2298,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202298 {-# INLINABLE headE #-}
25212299 headE = R.slowHeadE
25222300-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252301
25262302instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272303 {-# INLINABLE sample #-}
@@ -2543,9 +2319,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432319 {-# INLINABLE headE #-}
25442320 headE = R.slowHeadE
25452321-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492322
25502323instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512324 {-# INLINE return #-}
@@ -2554,10 +2327,8 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542327 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552328 {-# INLINE (>>) #-}
25562329 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582330 {-# INLINE fail #-}
25592331 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612332
25622333{-# INLINABLE newJoinDyn #-}
25632334newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2609,9 +2380,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092380 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102381 {-# INLINABLE headE #-}
26112382 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152383
26162384instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172385 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2396,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282396 {-# INLINABLE headE #-}
26292397 headE = R.slowHeadE
26302398-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332399
26342400instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352401 {-# INLINABLE sample #-}
@@ -2650,8 +2416,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502416 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512417 {-# INLINABLE headE #-}
26522418 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552419
26562420--------------------------------------------------------------------------------
26572421-- Deprecated items
@@ -2775,7 +2539,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752539 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762540 {-# INLINABLE mergeG #-}
27772541 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2542+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792543 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802544 -> DMap k q
27812545 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2843,14 +2607,8 @@ instance Monad (SpiderHost x) where
28432607 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442608 {-# INLINABLE return #-}
28452609 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472610 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2611+ fail s = SpiderHost $ fail s
28542612
28552613-- | Run an action affecting the global Spider timeline; this will be guarded by
28562614-- a mutex for that timeline
@@ -2872,10 +2630,8 @@ instance Monad (SpiderHostFrame x) where
28722630 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732631 {-# INLINABLE return #-}
28742632 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762633 {-# INLINABLE fail #-}
28772634 fail s = SpiderHostFrame $ fail s
2878−#endif
28792635
28802636instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812637 notReadyUntil _ = pure ()
@@ -2920,11 +2676,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202676instance PrimMonad (SpiderHostFrame x) where
29212677 type PrimState (SpiderHostFrame x) = PrimState IO
29222678 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 ()