@@ -9,8 +9,6 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiParamTypeClasses #-}
13−{-# LANGUAGE MultiWayIf #-}
1412{-# LANGUAGE RankNTypes #-}
1513{-# LANGUAGE RoleAnnotations #-}
1614{-# LANGUAGE ScopedTypeVariables #-}
@@ -21,6 +19,7 @@
2119{-# LANGUAGE DeriveFunctor #-}
2220{-# LANGUAGE StandaloneDeriving #-}
2321{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
2423
2524#ifdef USE_REFLEX_OPTIMIZER
2625{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -39,15 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3938import Control.Monad.Exception
4039import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4140import Control.Monad.Primitive
42−--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4341import Control.Monad.Reader.Class
4442import Control.Monad.IO.Class
4543import Control.Monad.ReaderIO
4644import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4747import Data.Align
4848import Data.Coerce
49−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
5050import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
5152import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5253import qualified Data.FastMutableIntMap as FastMutableIntMap
5354import Data.Foldable hiding (concat, elem, sequence_)
@@ -60,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
6061import Data.IORef
6162import Data.Kind (Type)
6263import Data.Maybe hiding (mapMaybe)
63−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
6465import Data.Proxy
6566import Data.These
6667import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
6769import Data.Witherable (Filterable, mapMaybe)
68−import GHC.Exts
70+import GHC.Exts hiding (toList)
6971import GHC.IORef (IORef (..))
7072import GHC.Stack
7173import Reflex.FastWeak
@@ -73,16 +75,27 @@ import System.IO.Unsafe
7375import System.Mem.Weak
7476import Unsafe.Coerce
7577
78+#ifdef MIN_VERSION_semialign
79+#if MIN_VERSION_these(0,8,0)
80+import Data.These.Combinators (justThese)
81+#endif
82+#if MIN_VERSION_semialign(1,1,0)
83+import Data.Zip (Zip (..))
84+#endif
85+#endif
86+
7687#ifdef DEBUG_CYCLES
7788import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7891import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7992import qualified Data.List.NonEmpty as NonEmpty
80−import Data.Monoid (mempty)
8193import Data.Tree (Forest, Tree (..), drawForest)
82−#endif
94+import Data.List (isPrefixOf)
8395
84−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
8597import qualified Data.FastWeakBag as FastWeakBag
98+
8699import Data.Reflection
87100import Data.Some (Some(Some))
88101import Data.Type.Coercion
@@ -93,36 +106,72 @@ import qualified Reflex.Class
93106import qualified Reflex.Class as R
94107import qualified Reflex.Host.Class
95108import Reflex.NotReady.Class
96−import Reflex.Patch
97−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
98112
99113#ifdef DEBUG_TRACE_EVENTS
100114import qualified Data.ByteString.Char8 as BS8
101115import System.IO (stderr)
116+import Data.List (isPrefixOf)
102117#endif
103118
104−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
105122
123+#ifdef DEBUG_TRACE_EVENTS
106124withStackOneLine :: (BS8.ByteString -> a) -> a
107125withStackOneLine expr = unsafePerformIO $ do
108126 stack <- currentCallStack
109− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
110129
111130#endif
112131
132+debugPropagate :: Bool
133+
134+debugInvalidateHeight :: Bool
135+
136+debugInvalidate :: Bool
137+
113138#ifdef DEBUG
114139#define DEBUG_NODEIDS
115140
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+
116159class HasNodeId a where
117160 getNodeId :: a -> Int
118161
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
119168instance HasNodeId (Hold x p) where
120169 getNodeId = holdNodeId
121170
122171instance HasNodeId (SwitchSubscribed x a) where
123172 getNodeId = switchSubscribedNodeId
124173
125−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
126175 getNodeId = fanSubscribedNodeId
127176
128177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -136,16 +185,27 @@ instance HasNodeId (Pull x a) where
136185
137186{-# INLINE showNodeId #-}
138187showNodeId :: HasNodeId a => a -> String
139−showNodeId = ("#"<>) . show . getNodeId
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
140192
141193
142194#else
143195
196+debugPropagate = False
197+debugInvalidateHeight = False
198+debugInvalidate = False
199+
144200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
145201{-# INLINE showNodeId #-}
146202showNodeId :: a -> String
147203showNodeId _ = ""
148204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
149209#endif
150210
151211#ifdef DEBUG_NODEIDS
@@ -191,9 +251,9 @@ subscribeAndRead = unEvent
191251-- caching; if the computation function is very cheap, this is (much) more
192252-- efficient than 'push'
193253{-# INLINE [1] pushCheap #-}
194−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
195255pushCheap !f e = Event $ \sub -> do
196− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
197257 { subscriberPropagate = \a -> do
198258 mb <- f a
199259 mapM_ (subscriberPropagate sub) mb
@@ -212,10 +272,10 @@ terminalSubscriber p = Subscriber
212272
213273-- | Subscribe to an Event only for the duration of one occurrence
214274{-# INLINE subscribeAndReadHead #-}
215−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
216276subscribeAndReadHead e sub = do
217277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
218− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
219279 { subscriberPropagate = \a -> do
220280 liftIO $ unsubscribe =<< readIORef subscriptionRef
221281 subscriberPropagate sub a
@@ -226,24 +286,42 @@ subscribeAndReadHead e sub = do
226286 return (subscription, occ)
227287
228288--TODO: Make this lazy in its input event
229−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
230290headE originalE = do
231291 parent <- liftIO $ newIORef $ Just originalE
232292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
233293 let clearParent = liftIO $ writeIORef parent Nothing
234− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
235295 when (isJust occ) clearParent
236− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
237297 liftIO (readIORef parent) >>= \case
238− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
239299 Just e -> subscribeAndReadHead e sub
240300
241301data CacheSubscribed x a
242302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
243303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
244304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
245308 }
246309
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+
247325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
248326-- repeatedly
249327--
@@ -268,18 +346,23 @@ cacheEvent e =
268346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
269347 Just subscribedTicket -> return subscribedTicket
270348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
271352 subscribers <- liftIO FastWeakBag.empty
272353 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
273357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
274− { subscriberPropagate = \a -> do
275− liftIO $ writeIORef occRef $ Just a
276− scheduleClear occRef
277− propagateFast a subscribers
278− , subscriberInvalidateHeight = \old -> do
279− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
280− , subscriberRecalculateHeight = \new -> do
281− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
282− }
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+ }
283366 when (isJust occ) $ do
284367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
285368 scheduleClear occRef
@@ -287,29 +370,45 @@ cacheEvent e =
287370 { _cacheSubscribed_subscribers = subscribers
288371 , _cacheSubscribed_parent = parentSub
289372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
290376 }
291377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
292378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
293379 return subscribedTicket
294− liftIO $ do
295− subscribed <- getFastWeakTicketValue subscribedTicket
296− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
297− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
298− let es = EventSubscription
299− { _eventSubscription_unsubscribe = do
300− FastWeakBag.remove ticket
301− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
302− when isEmpty $ do
303− writeIORef mSubscribedRef emptyFastWeak
304− unsubscribe $ _cacheSubscribed_parent subscribed
305− touch ticket
306− touch subscribedTicket
307− , _eventSubscription_subscribed = EventSubscribed
308− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
309− , eventSubscribedRetained = toAny subscribedTicket
310− }
311− }
312− return (es, occ)
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+
313412
314413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
315414subscribe e s = fst <$> subscribeAndRead e s
@@ -324,8 +423,11 @@ wrap tag getSpecificSubscribed sub = do
324423eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
325424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
326425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
327429eventNever :: Event x a
328−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
329431
330432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
331433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -362,16 +464,6 @@ data Subscriber x a = Subscriber
362464 , subscriberRecalculateHeight :: !(Height -> IO ())
363465 }
364466
365−--TODO: Move this comment to WeakBag
366−-- These function are constructor functions that are marked NOINLINE so they are
367−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
368−-- so any weak references that are attached to the constructors will have their
369−-- finalizer run. Using the opaque constructor, does not see the
370−-- constructor application, so it behaves like an IORef and cannot be fused away.
371−--
372−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
373−-- the weak pointer to it in some cases.
374−
375467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
376468newSubscriberHold h = return $ Subscriber
377469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -393,14 +485,12 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
393485 return ()
394486 , subscriberInvalidateHeight = \old -> do
395487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
396− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
397−
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
398489 , subscriberRecalculateHeight = \new -> do
399490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
400− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
401492 }
402493
403−
404494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
405495newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
406496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
@@ -411,7 +501,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
411501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
412502 when (oldHeight /= invalidHeight) $ do
413503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
414− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
415505 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
416506 }
417507
@@ -427,17 +517,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
427517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
428518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
429519 case occ of
430− Nothing -> do
520+ Nothing ->
431521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
432522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
433− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
434− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
435525 Just o -> do -- Since it's already firing, no need to adjust height
436526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
437527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
438528 propagate o $ coincidenceSubscribedSubscribers subscribed
439529 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
440− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
441531 }
442532
443533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -461,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
461551recalculateSubscriberHeight = flip subscriberRecalculateHeight
462552
463553-- | Propagate everything at the current height
464−propagate :: forall a x. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
465−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
466556 -- 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
467557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
468− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
469559
470560-- | Propagate everything at the current height
471−propagateFast :: forall a x. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
472−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
473563 -- 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
474564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
475− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
476566
477567--------------------------------------------------------------------------------
478568-- EventSubscribed
@@ -490,7 +580,7 @@ data EventSubscribed x = EventSubscribed
490580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
491581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
492582#ifdef DEBUG_CYCLES
493− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
494584 , eventSubscribedHasOwnHeightRef :: !Bool
495585 , eventSubscribedWhoCreated :: !(IO [String])
496586#endif
@@ -517,13 +607,23 @@ eventSubscribedNever = EventSubscribed
517607 , eventSubscribedWhoCreated = return ["never"]
518608#endif
519609 }
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+ }
520620
521621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
522622eventSubscribedFan !subscribed = EventSubscribed
523623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
524624 , eventSubscribedRetained = toAny subscribed
525625#ifdef DEBUG_CYCLES
526− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
527627 , eventSubscribedHasOwnHeightRef = False
528628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
529629#endif
@@ -536,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
536636#ifdef DEBUG_CYCLES
537637 , eventSubscribedGetParents = do
538638 s <- readIORef $ switchSubscribedCurrentParent subscribed
539− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
540640 , eventSubscribedHasOwnHeightRef = True
541641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
542642#endif
@@ -549,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
549649#ifdef DEBUG_CYCLES
550650 , eventSubscribedGetParents = do
551651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
552− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
553− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
554654 return $ outerParent : innerParents
555655 , eventSubscribedHasOwnHeightRef = True
556656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -564,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
564664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
565665whoCreatedEventSubscribed = eventSubscribedWhoCreated
566666
567−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
568668walkInvalidHeightParents s0 = do
569− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
570670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
571671 when (h == invalidHeight) $ do
572672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
573− modify (Some s :)
673+ modify (s :)
574674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
575− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
576676 return subscribers
577677#endif
578678
@@ -894,8 +994,10 @@ instance Monad (BehaviorM x) where
894994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
895995 {-# INLINE return #-}
896996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
897998 {-# INLINE fail #-}
898999 fail s = BehaviorM $ fail s
1000+#endif
8991001
9001002data BehaviorSubscribed x a
9011003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -955,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
9551057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
9561058
9571059-- EventM can do everything BehaviorM can, plus create holds
958−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9591061
9601062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9611063
@@ -980,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
9801082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
9811083
9821084heightBagAdd :: Height -> HeightBag -> HeightBag
983−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
9841087
9851088heightBagRemove :: Height -> HeightBag -> HeightBag
9861089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -989,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
9891092 0 -> IntMap.delete h c
9901093 _ -> IntMap.insert h (pred old) c
9911094
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+
9921102heightBagMax :: HeightBag -> Height
9931103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
9941104 Just ((h, _), _) -> Height h
@@ -1089,6 +1199,13 @@ instance HasSpiderTimeline x => Semialign (Event x) where
10891199 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
10901200 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
10911201
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
1208+
10921209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
10931210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
10941211 | HoldDyn !(Hold x p)
@@ -1229,7 +1346,7 @@ mkWeakPtrWithDebug x debugNote = do
12291346 x' <- evaluate x
12301347 mkWeakPtr x' $
12311348 if debugFinalize
1232− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12331350 else Nothing
12341351
12351352type WeakList a = [Weak a]
@@ -1242,19 +1359,22 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12421359#ifdef DEBUG
12431360
12441361debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1245−debugSubscriber description subscribed = return $ Subscriber
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
12461366 {
12471367 subscriberPropagate = \m -> do
12481368 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
12491369 subscriberPropagate subscribed m
12501370 , subscriberInvalidateHeight = \old -> do
1251− putStrLn $ "invalidateSubscriberHeight: " <> description
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
12521372 subscriberInvalidateHeight subscribed old
1253− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
12541374 , subscriberRecalculateHeight = \new -> do
1255− putStrLn $ "subscriberRecalculateHeight: " <> description
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
12561376 subscriberRecalculateHeight subscribed new
1257− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
12581378 }
12591379
12601380
@@ -1268,11 +1388,15 @@ withIncreasedDepth _ a = do
12681388
12691389{-# INLINE tracePropagate #-}
12701390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1271−tracePropagate p = trace p
1391+tracePropagate p = when debugPropagate . trace p
12721392
12731393{-# INLINE traceInvalidate #-}
12741394traceInvalidate :: String -> IO ()
1275−traceInvalidate = liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
12761400
12771401{-# INLINE trace #-}
12781402trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1283,12 +1407,12 @@ traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
12831407traceM _ getMessage = do
12841408 message <- getMessage
12851409 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1286− liftIO $ putStrLn $ replicate d ' ' <> message
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
12871411
12881412#else
12891413
12901414{-# INLINE withIncreasedDepth #-}
1291−withIncreasedDepth :: forall x m proxy a. HasSpiderTimeline x => proxy x -> m a -> m a
1415+withIncreasedDepth :: proxy x -> m a -> m a
12921416withIncreasedDepth _ = id
12931417
12941418{-# INLINE tracePropagate #-}
@@ -1299,10 +1423,20 @@ tracePropagate _ _ = return ()
12991423traceInvalidate :: String -> IO ()
13001424traceInvalidate _ = return ()
13011425
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
13021430{-# INLINE debugSubscriber #-}
1303−debugSubscriber :: HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
13041432debugSubscriber _ = return
13051433
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
13061440{-# INLINE trace #-}
13071441trace :: (CanTrace x m) => proxy x -> String -> m ()
13081442trace _ _ = return ()
@@ -1313,13 +1447,9 @@ traceM _ _ = return ()
13131447
13141448#endif
13151449
1316−
1317−
1318−
13191450whoCreatedIORef :: IORef a -> IO [String]
13201451whoCreatedIORef (IORef a) = whoCreated $! a
13211452
1322−#ifdef DEBUG_CYCLES
13231453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13241454groupByHead = \case
13251455 [] -> []
@@ -1330,13 +1460,45 @@ groupByHead = \case
13301460 | otherwise -> (x, xs :| []) : l
13311461
13321462listsToForest :: Eq a => [[a]] -> Forest a
1333−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
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
13341474#endif
13351475
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+
1495+#endif
1496+
1497+
13361498{-# INLINE propagateSubscriberHold #-}
13371499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13381500propagateSubscriberHold h a = do
1339− traceM (Proxy :: Proxy x) $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13401502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13411503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
13421504
@@ -1344,7 +1506,7 @@ propagateSubscriberHold h a = do
13441506 case {-# SCC "apply" #-} apply a v of
13451507 Nothing -> return ()
13461508 Just v' -> do
1347− withIncreasedDepth (Proxy :: Proxy x) $
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
13481510 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13491511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13501512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1465,6 +1627,9 @@ data FanInt x a = FanInt
14651627 { _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
14661628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14671629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14681633 }
14691634
14701635newFanInt :: IO (FanInt x a)
@@ -1472,10 +1637,16 @@ newFanInt = do
14721637 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
14731638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14741639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14751643 return $ FanInt
14761644 { _fanInt_subscribers = subscribers
14771645 , _fanInt_subscriptionRef = subscriptionRef
14781646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14791650 }
14801651
14811652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1484,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
14841655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14851656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14861657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1487− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14881660 { subscriberPropagate = \m -> do
14891661 liftIO $ writeIORef (_fanInt_occRef self) m
14901662 scheduleIntClear $ _fanInt_occRef self
1491− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1492− FastWeakBag.traverse b $ \s -> do
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 ->
14931665 subscriberPropagate s v
1494− , subscriberInvalidateHeight = \old -> do
1495− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1496− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
14971669 subscriberInvalidateHeight s old
1498− , subscriberRecalculateHeight = \new -> do
1499− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1500− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15011673 subscriberRecalculateHeight s new
15021674 }
15031675 liftIO $ do
@@ -1511,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15111683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15121684 return b
15131685 Just b -> return b
1514− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15151687 currentOcc <- readIORef (_fanInt_occRef self)
1516− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1517− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
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+
15181705
15191706{-# INLINABLE getFanSubscribed #-}
15201707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1712,7 +1899,7 @@ mergeCheap
17121899 => (forall a. q a -> Event x (v a))
17131900 -> DynamicS x (PatchDMap k q)
17141901 -> Event x (DMap k v)
1715−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17161903 where
17171904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17181905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1727,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17271914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17281915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17291916 forM_ mOldSubd $ \oldSubd -> do
1730− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17311920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17321921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17331922 foldM f ([], oldParents) $ DMap.toList p
@@ -1738,7 +1927,7 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17381927 let s = subscriber $ return k
17391928 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17401929 height <- liftIO $ getEventSubscribedHeight parentSubd
1741− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17421931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17431932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17441933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1752,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17521941 => (forall a. q a -> Event x (v a))
17531942 -> DynamicS x (PatchDMapWithMove k q)
17541943 -> Event x (DMap k v)
1755−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17561945 where
17571946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17581947 updateMe subscriber heightBagRef oldParents p = do
@@ -1771,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17711960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
17721961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17731962 Nothing -> do
1774− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17751966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17761967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17771968 Just toKey -> do
17781969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17791970 return Nothing
1780− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973+
17811974 return (toDelete, applyAlways p' oldParents)
17821975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17831976 getInitialSubscribers initialParents subscriber = do
@@ -1786,7 +1979,7 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17861979 let s = subscriber $ liftIO $ readIORef keyRef
17871980 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17881981 height <- liftIO $ getEventSubscribedHeight parentSubd
1789− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17901983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17911984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17921985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1802,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18021995 -> p
18031996 -> EventM x ([EventSubscription x], DMap k s)
18041997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18052000type MergeInitFunc k v q x s
18062001 = DMap k q
18072002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1825,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18252020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18262021invalidateMergeHeight' heightRef sub = do
18272022 oldHeight <- readIORef heightRef
1828− 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
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
18292025 writeIORef heightRef $! invalidHeight
18302026 subscriberInvalidateHeight sub oldHeight
18312027
18322028revalidateMergeHeight :: Merge x k v s -> IO ()
18332029revalidateMergeHeight m = do
18342030 currentHeight <- readIORef $ _merge_heightRef m
1835− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
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
18362034 heights <- readIORef $ _merge_heightBagRef m
18372035 parents <- readIORef $ _merge_parentsRef m
18382036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1840,7 +2038,7 @@ revalidateMergeHeight m = do
18402038 LT -> return ()
18412039 EQ -> do
18422040 let height = succHeight $ heightBagMax heights
1843− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18442042 writeIORef (_merge_heightRef m) $! height
18452043 subscriberRecalculateHeight (_merge_sub m) height
18462044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1848,36 +2046,45 @@ revalidateMergeHeight m = do
18482046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18492047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18502048 vals <- liftIO $ readIORef $ _merge_accumRef m
1851− 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
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
18522052 --TODO: Assert that m is not empty
18532053 subscriberPropagate (_merge_sub m) vals
18542054
1855−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1856−mergeSubscriber m getKey = Subscriber
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
18572078 { subscriberPropagate = \a -> do
18582079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18592080 k <- getKey
1860− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18612082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18622083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18632084 when (DMap.null oldM) $ do -- Only schedule the firing once
18642085 height <- liftIO $ readIORef $ _merge_heightRef m
1865− --TODO: assertions about height
1866− currentHeight <- getCurrentHeight
1867− when (height <= currentHeight) $ do
1868− if height /= invalidHeight
1869− then do
1870− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1871− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1872− else liftIO $ do
1873−#ifdef DEBUG_CYCLES
1874− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1875− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1876− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1877−#else
1878− let cycleInfo = ""
1879−#endif
1880− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18812088 scheduleMergeSelf m height
18822089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18832090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1888,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18882095 }
18892096
18902097--TODO: Be able to run as much of this as possible promptly
1891−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1892−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
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)
18932100 where updateMe = do
18942101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1895− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18962103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18972104 return subscriptionsToKill
18982105
18992106{-# INLINE mergeGCheap' #-}
19002107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1901− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1902−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
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
19032110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19042111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19052112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19062113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19072114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1908− let m = Merge
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
19092130 { _merge_parentsRef = parentsRef
19102131 , _merge_heightBagRef = heightBagRef
19112132 , _merge_heightRef = heightRef
19122133 , _merge_sub = sub
19132134 , _merge_accumRef = accumRef
19142135 }
1915− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19162137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19172138 myHeight = if invalidHeight `elem` heights
19182139 then invalidHeight
@@ -1921,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19212142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19222143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19232144 else (Nothing, dm)
1924− unless (DMap.null accum) $ do
1925− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19262146 liftIO $ writeIORef accumRef $! accum
19272147 liftIO $ writeIORef heightRef $! myHeight
19282148 liftIO $ writeIORef heightBagRef $! myHeightBag
1929− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19302149 liftIO $ writeIORef parentsRef $! initialParentState
19312150 defer $ SomeMergeInit $ do
1932− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19332152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1934− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1935− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19362155 , subscriberInvalidateHeight = \_ -> return ()
19372156 , subscriberRecalculateHeight = \_ -> return ()
19382157 }
1939− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1940− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
19412160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19422161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19432162 -- its subscription.
1944− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19452164 let unsubscribeAll = destroy =<< readIORef parentsRef
1946− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1947− , occ
1948− )
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
19492168
19502169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19512170mergeInt = cacheEvent . mergeIntCheap
@@ -1958,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
19582177 heightRef <- liftIO $ newIORef zeroHeight
19592178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19602179 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+ }
19612190 let scheduleSelf = do
19622191 height <- liftIO $ readIORef $ heightRef
19632192 scheduleMerge' height heightRef $ do
19642193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19652194 subscriberPropagate sub vals
1966− invalidateMyHeight = do
1967− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19682196 recalculateMyHeight = do
19692197 currentHeight <- readIORef heightRef
19702198 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?
@@ -1974,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19742202 LT -> return ()
19752203 EQ -> do
19762204 let height = succHeight $ heightBagMax heights
1977− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19782206 writeIORef heightRef $! height
19792207 subscriberRecalculateHeight sub height
19802208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19812209 mySubscriber k = Subscriber
19822210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19832213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19842214 liftIO $ FastMutableIntMap.insert accum k a
19852215 when wasEmpty scheduleSelf
@@ -2013,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20132243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20142244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20152245 return Nothing
2016− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20172246 defer $ SomeMergeInit $ do
20182247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20192248 where
@@ -2027,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20272256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20282257 liftIO $ for_ oldParents $ \oldParent -> do
20292258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20302261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20312262 return $ IntMap.elems oldParents
2032− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20332264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20342265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20352266 defer $ updateMe a
20362267 , subscriberInvalidateHeight = \_ -> return ()
20372268 , subscriberRecalculateHeight = \_ -> return ()
20382269 }
2039− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20402271 forM_ change $ \c -> defer $ updateMe c
20412272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20422273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20432274 -- its subscription.
2044− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20452276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2046− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2047− , occ
2048− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20492280
20502281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20512282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2154,7 +2385,7 @@ runFrame a = SpiderHost $ do
21542385 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
21552386 {-
21562387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2157− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21582389 EventRoot _ -> "EventRoot"
21592390 EventNever -> "EventNever"
21602391 _ -> "something else"
@@ -2169,7 +2400,7 @@ runFrame a = SpiderHost $ do
21692400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21702401 when (parentHeight /= myHeight) $ do
21712402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2172− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21732404 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
21742405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21752406 unsubscribe subscription
@@ -2210,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
22102441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
22112442 when (oldHeight /= invalidHeight) $ do
22122443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2213− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
22142445
22152446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
22162447updateSwitchHeight new subscribed = do
@@ -2218,7 +2449,7 @@ updateSwitchHeight new subscribed = do
22182449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22192450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22202451 writeIORef (switchSubscribedHeight subscribed) $! new
2221− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
22222453
22232454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22242455recalculateCoincidenceHeight subscribed = do
@@ -2227,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22272458 height <- calculateCoincidenceHeight subscribed
22282459 when (height /= invalidHeight) $ do
22292460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2230− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22312462
22322463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22332464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2289,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22892520 {-# INLINABLE headE #-}
22902521 headE = R.slowHeadE
22912522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22922525
22932526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22942527 {-# INLINABLE sample #-}
@@ -2310,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23102543 {-# INLINABLE headE #-}
23112544 headE = R.slowHeadE
23122545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23132549
23142550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23152551 {-# INLINE return #-}
@@ -2318,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23182554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23192555 {-# INLINE (>>) #-}
23202556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
23212558 {-# INLINE fail #-}
23222559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23232561
23242562{-# INLINABLE newJoinDyn #-}
23252563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2371,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23712609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23722610 {-# INLINABLE headE #-}
23732611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23742615
23752616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23762617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2387,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23872628 {-# INLINABLE headE #-}
23882629 headE = R.slowHeadE
23892630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23902633
23912634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23922635 {-# INLINABLE sample #-}
@@ -2407,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24072650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24082651 {-# INLINABLE headE #-}
24092652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24102655
24112656--------------------------------------------------------------------------------
24122657-- Deprecated items
@@ -2530,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25302775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25312776 {-# INLINABLE mergeG #-}
25322777 mergeG
2533− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25342779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25352780 -> DMap k q
25362781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2598,8 +2843,14 @@ instance Monad (SpiderHost x) where
25982843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25992844 {-# INLINABLE return #-}
26002845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
26012847 {-# INLINABLE fail #-}
2602− fail s = SpiderHost $ fail s
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2853+ fail s = SpiderHost $ MonadFail.fail s
26032854
26042855-- | Run an action affecting the global Spider timeline; this will be guarded by
26052856-- a mutex for that timeline
@@ -2621,8 +2872,10 @@ instance Monad (SpiderHostFrame x) where
26212872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26222873 {-# INLINABLE return #-}
26232874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
26242876 {-# INLINABLE fail #-}
26252877 fail s = SpiderHostFrame $ fail s
2878+#endif
26262879
26272880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26282881 notReadyUntil _ = pure ()
@@ -2667,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26672920instance PrimMonad (SpiderHostFrame x) where
26682921 type PrimState (SpiderHostFrame x) = PrimState IO
26692922 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 ()