@@ -38,11 +38,12 @@ 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_)
4241import Control.Monad.Reader.Class
4342import Control.Monad.IO.Class
4443import Control.Monad.ReaderIO
4544import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4647import Data.Align
4748import Data.Coerce
4849import Data.Dependent.Map (DMap, DSum (..))
@@ -59,12 +60,13 @@ import qualified Data.IntMap.Strict as IntMap
5960import Data.IORef
6061import Data.Kind (Type)
6162import Data.Maybe hiding (mapMaybe)
62−import Data.Monoid ((<>))
63+import Data.Monoid (mempty, (<>))
6364import Data.Proxy
6465import Data.These
6566import Data.Traversable
67+import Data.Type.Equality ((:~:)(Refl))
6668import Data.Witherable (Filterable, mapMaybe)
67−import GHC.Exts
69+import GHC.Exts hiding (toList)
6870import GHC.IORef (IORef (..))
6971import GHC.Stack
7072import Reflex.FastWeak
@@ -83,14 +85,16 @@ import Data.Zip (Zip (..))
8385
8486#ifdef DEBUG_CYCLES
8587import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88+#endif
89+
8690import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
8791import qualified Data.List.NonEmpty as NonEmpty
88−import Data.Monoid (mempty)
8992import Data.Tree (Forest, Tree (..), drawForest)
90−#endif
93+import Data.List (isPrefixOf)
9194
92−import Data.FastWeakBag (FastWeakBag)
95+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9396import qualified Data.FastWeakBag as FastWeakBag
97+
9498import Data.Reflection
9599import Data.Some (Some(Some))
96100import Data.Type.Coercion
@@ -101,20 +105,26 @@ import qualified Reflex.Class
101105import qualified Reflex.Class as R
102106import qualified Reflex.Host.Class
103107import Reflex.NotReady.Class
104−import Reflex.Patch
105−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
108+import Data.Patch
109+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
110+import Reflex.PerformEvent.Base (PerformEventT)
106111
107112#ifdef DEBUG_TRACE_EVENTS
108113import qualified Data.ByteString.Char8 as BS8
109114import System.IO (stderr)
115+import Data.List (isPrefixOf)
110116#endif
111117
112−#ifdef DEBUG_TRACE_EVENTS
118+-- TODO stdout might not be the best channel for debug output
119+debugStrLn :: String -> IO ()
120+debugStrLn = putStrLn
113121
122+#ifdef DEBUG_TRACE_EVENTS
114123withStackOneLine :: (BS8.ByteString -> a) -> a
115124withStackOneLine expr = unsafePerformIO $ do
116125 stack <- currentCallStack
117− return (expr (BS8.pack (unwords (reverse stack))))
126+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
127+ where dropInternal = filterStack "Reflex.Spider.Internal"
118128
119129#endif
120130
@@ -125,28 +135,42 @@ debugInvalidateHeight :: Bool
125135debugInvalidate :: Bool
126136
127137#ifdef DEBUG
128−
129138#define DEBUG_NODEIDS
130139
140+#ifdef DEBUG_TRACE_PROPAGATION
131141debugPropagate = True
142+#else
143+debugPropagate = False
144+#endif
132145
146+#ifdef DEBUG_TRACE_HEIGHT
147+debugInvalidateHeight = True
148+#else
133149debugInvalidateHeight = False
150+#endif
134151
152+#ifdef DEBUG_TRACE_INVALIDATION
135153debugInvalidate = True
154+#else
155+debugInvalidate = False
156+#endif
136157
137158class HasNodeId a where
138159 getNodeId :: a -> Int
139160
140−instance HasNodeId (Hold x p a) where
141− getNodeId = holdNodeId
161+instance HasNodeId (CacheSubscribed x a) where
162+ getNodeId = _cacheSubscribed_nodeId
142163
143−instance HasNodeId (PushSubscribed x a b) where
144− getNodeId = pushSubscribedNodeId
164+instance HasNodeId (FanInt x a) where
165+ getNodeId = _fanInt_nodeId
166+
167+instance HasNodeId (Hold x p) where
168+ getNodeId = holdNodeId
145169
146170instance HasNodeId (SwitchSubscribed x a) where
147171 getNodeId = switchSubscribedNodeId
148172
149−instance HasNodeId (FanSubscribed x a) where
173+instance HasNodeId (FanSubscribed x v a) where
150174 getNodeId = fanSubscribedNodeId
151175
152176instance HasNodeId (CoincidenceSubscribed x a) where
@@ -160,41 +184,16 @@ instance HasNodeId (Pull x a) where
160184
161185{-# INLINE showNodeId #-}
162186showNodeId :: HasNodeId a => a -> String
163−showNodeId = ("#"<>) . show . getNodeId
164−
165−showSubscriberType :: Subscriber x a -> String
166−showSubscriberType = \case
167− SubscriberPush _ _ -> "SubscriberPush"
168− SubscriberMerge _ _ -> "SubscriberMerge"
169− SubscriberFan _ -> "SubscriberFan"
170− SubscriberMergeChange _ -> "SubscriberMergeChange"
171− SubscriberHold _ -> "SubscriberHold"
172− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
173− SubscriberSwitch _ -> "SubscriberSwitch"
174− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
175− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
176− SubscriberHandle -> "SubscriberHandle"
177−
178−showEventType :: Event x a -> String
179−showEventType = \case
180− EventRoot _ _ -> "EventRoot"
181− EventNever -> "EventNever"
182− EventPush _ -> "EventPush"
183− EventMerge _ -> "EventMerge"
184− EventFan _ _ -> "EventFan"
185− EventSwitch _ -> "EventSwitch"
186− EventCoincidence _ -> "EventCoincidence"
187− EventHold _ -> "EventHold"
188− EventDyn _ -> "EventDyn"
189− EventHoldIdentity _ -> "EventHoldIdentity"
190− EventDynIdentity _ -> "EventDynIdentity"
187+showNodeId = showNodeId' . getNodeId
188+
189+showNodeId' :: Int -> String
190+showNodeId' = ("#"<>) . show
191+
191192
192193#else
193194
194195debugPropagate = False
195−
196196debugInvalidateHeight = False
197−
198197debugInvalidate = False
199198
200199-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,6 +201,10 @@ debugInvalidate = False
202201showNodeId :: a -> String
203202showNodeId _ = ""
204203
204+{-# INLINE showNodeId' #-}
205+showNodeId' :: Int -> String
206+showNodeId' _ = ""
207+
205208#endif
206209
207210#ifdef DEBUG_NODEIDS
@@ -247,9 +250,9 @@ subscribeAndRead = unEvent
247250-- caching; if the computation function is very cheap, this is (much) more
248251-- efficient than 'push'
249252{-# INLINE [1] pushCheap #-}
250−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
253+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
251254pushCheap !f e = Event $ \sub -> do
252− (subscription, occ) <- subscribeAndRead e $ sub
255+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
253256 { subscriberPropagate = \a -> do
254257 mb <- f a
255258 mapM_ (subscriberPropagate sub) mb
@@ -268,10 +271,10 @@ terminalSubscriber p = Subscriber
268271
269272-- | Subscribe to an Event only for the duration of one occurrence
270273{-# INLINE subscribeAndReadHead #-}
271−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
274+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
272275subscribeAndReadHead e sub = do
273276 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
274− (subscription, occ) <- subscribeAndRead e $ sub
277+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
275278 { subscriberPropagate = \a -> do
276279 liftIO $ unsubscribe =<< readIORef subscriptionRef
277280 subscriberPropagate sub a
@@ -282,24 +285,29 @@ subscribeAndReadHead e sub = do
282285 return (subscription, occ)
283286
284287--TODO: Make this lazy in its input event
285−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
288+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
286289headE originalE = do
287290 parent <- liftIO $ newIORef $ Just originalE
288291 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
289292 let clearParent = liftIO $ writeIORef parent Nothing
290− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
293+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
291294 when (isJust occ) clearParent
292− return $ Event $ \sub -> do
295+ return $ Event $ \sub ->
293296 liftIO (readIORef parent) >>= \case
294− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
297+ Nothing -> subscribeAndReadNever
295298 Just e -> subscribeAndReadHead e sub
296299
297300data CacheSubscribed x a
298301 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
299302 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
300303 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
304+#ifdef DEBUG_NODEIDS
305+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
306+#endif
301307 }
302308
309+
310+
303311-- | Construct an 'Event' whose value is guaranteed not to be recomputed
304312-- repeatedly
305313--
@@ -324,18 +332,23 @@ cacheEvent e =
324332 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
325333 Just subscribedTicket -> return subscribedTicket
326334 Nothing -> do
335+#ifdef DEBUG_NODEIDS
336+ nodeId <- liftIO newNodeId
337+#endif
327338 subscribers <- liftIO FastWeakBag.empty
328339 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
340+#ifdef DEBUG_NODEIDS
341+ (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
342+#else
329343 (parentSub, occ) <- subscribeAndRead e $ Subscriber
330− { subscriberPropagate = \a -> do
331− liftIO $ writeIORef occRef $ Just a
332− scheduleClear occRef
333− propagateFast a subscribers
334− , subscriberInvalidateHeight = \old -> do
335− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
336− , subscriberRecalculateHeight = \new -> do
337− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
338− }
344+#endif
345+ { subscriberPropagate = \a -> do
346+ liftIO $ writeIORef occRef (Just a)
347+ scheduleClear occRef
348+ propagateFast a subscribers
349+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
350+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
351+ }
339352 when (isJust occ) $ do
340353 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
341354 scheduleClear occRef
@@ -343,29 +356,45 @@ cacheEvent e =
343356 { _cacheSubscribed_subscribers = subscribers
344357 , _cacheSubscribed_parent = parentSub
345358 , _cacheSubscribed_occurrence = occRef
359+#ifdef DEBUG_NODEIDS
360+ , _cacheSubscribed_nodeId = nodeId
361+#endif
346362 }
347363 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
348364 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
349365 return subscribedTicket
350− liftIO $ do
351− subscribed <- getFastWeakTicketValue subscribedTicket
352− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
353− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
354− let es = EventSubscription
355− { _eventSubscription_unsubscribe = do
356− FastWeakBag.remove ticket
357− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
358− when isEmpty $ do
359− writeIORef mSubscribedRef emptyFastWeak
360− unsubscribe $ _cacheSubscribed_parent subscribed
361− touch ticket
362− touch subscribedTicket
363− , _eventSubscription_subscribed = EventSubscribed
364− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
365− , eventSubscribedRetained = toAny subscribedTicket
366− }
367− }
368− return (es, occ)
366+ liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
367+
368+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
369+ -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
370+cacheSubscription sub mSubscribedRef subscribedTicket = do
371+ subscribed <- getFastWeakTicketValue subscribedTicket
372+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
373+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
374+
375+ let parentSub = _cacheSubscribed_parent subscribed
376+ es = EventSubscription
377+ { _eventSubscription_unsubscribe = do
378+ FastWeakBag.remove ticket
379+
380+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
381+ when isEmpty $ do
382+ writeIORef mSubscribedRef emptyFastWeak
383+ unsubscribe parentSub
384+ touch ticket
385+ touch subscribedTicket
386+ , _eventSubscription_subscribed = EventSubscribed
387+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
388+ , eventSubscribedRetained = toAny subscribedTicket
389+#ifdef DEBUG_CYCLES
390+ , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
391+ , eventSubscribedHasOwnHeightRef = False
392+ , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
393+#endif
394+ }
395+ }
396+ return (es, occ)
397+
369398
370399subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
371400subscribe e s = fst <$> subscribeAndRead e s
@@ -377,11 +406,14 @@ wrap tag getSpecificSubscribed sub = do
377406 let es = tag subd
378407 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
379408
380−eventRoot :: GCompare k => k a -> Root x k -> Event x a
409+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
381410eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
382411
412+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
413+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
414+
383415eventNever :: Event x a
384−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
416+eventNever = Event $ const subscribeAndReadNever
385417
386418eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
387419eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -436,10 +468,10 @@ newSubscriberHold h = return $ Subscriber
436468 }
437469
438470newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
439−newSubscriberFan subscribed = return $ Subscriber
471+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
440472 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
441473 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
442− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
474+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
443475 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
444476 scheduleClear $ fanSubscribedOccurrence subscribed
445477 let f _ (Pair v subsubs) = do
@@ -448,72 +480,55 @@ newSubscriberFan subscribed = return $ Subscriber
448480 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
449481 return ()
450482 , subscriberInvalidateHeight = \old -> do
451− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
452483 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
453− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
454− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
484+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
455485 , subscriberRecalculateHeight = \new -> do
456− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
457486 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
458− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
459− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
487+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
460488 }
461489
462490newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
463−newSubscriberSwitch subscribed = return $ Subscriber
491+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
464492 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
465− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
466493 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
467494 scheduleClear $ switchSubscribedOccurrence subscribed
468495 propagate a $ switchSubscribedSubscribers subscribed
469496 , subscriberInvalidateHeight = \_ -> do
470− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
471497 oldHeight <- readIORef $ switchSubscribedHeight subscribed
472498 when (oldHeight /= invalidHeight) $ do
473499 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
474− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
475− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
476− , subscriberRecalculateHeight = \new -> do
477− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
478− updateSwitchHeight new subscribed
479− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
480− }
500+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
501+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
502+ }
481503
482504newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
483−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
505+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
484506 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
485− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
486507 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
487508 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
488509 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
489510 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
490511 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
512+
491513 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
492514 scheduleClear $ coincidenceSubscribedInnerParent subscribed
493515 case occ of
494− Nothing -> do
516+ Nothing ->
495517 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
496518 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
497− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
498− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
519+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
520+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
499521 Just o -> do -- Since it's already firing, no need to adjust height
500522 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
501523 scheduleClear $ coincidenceSubscribedOccurrence subscribed
502524 propagate o $ coincidenceSubscribedSubscribers subscribed
503− , subscriberInvalidateHeight = \_ -> do
504− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
505− invalidateCoincidenceHeight subscribed
506− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
507− , subscriberRecalculateHeight = \_ -> do
508− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
509− recalculateCoincidenceHeight subscribed
510− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
525+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
526+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
511527 }
512528
513529newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
514−newSubscriberCoincidenceInner subscribed = return $ Subscriber
530+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
515531 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
516− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
517532 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
518533 case occ of
519534 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -521,14 +536,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
521536 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
522537 scheduleClear $ coincidenceSubscribedOccurrence subscribed
523538 propagate a $ coincidenceSubscribedSubscribers subscribed
524− , subscriberInvalidateHeight = \_ -> do
525− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
526− invalidateCoincidenceHeight subscribed
527− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
528− , subscriberRecalculateHeight = \_ -> do
529− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
530− recalculateCoincidenceHeight subscribed
531− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
539+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
540+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
532541 }
533542
534543invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -538,18 +547,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
538547recalculateSubscriberHeight = flip subscriberRecalculateHeight
539548
540549-- | Propagate everything at the current height
541−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
542−propagate a subscribers = withIncreasedDepth $ do
550+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
551+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
543552 -- 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
544553 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
545− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
554+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
546555
547556-- | Propagate everything at the current height
548−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
549−propagateFast a subscribers = withIncreasedDepth $ do
557+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
558+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
550559 -- 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
551560 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
552− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
561+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
553562
554563--------------------------------------------------------------------------------
555564-- EventSubscribed
@@ -567,7 +576,7 @@ data EventSubscribed x = EventSubscribed
567576 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
568577 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
569578#ifdef DEBUG_CYCLES
570− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
579+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
571580 , eventSubscribedHasOwnHeightRef :: !Bool
572581 , eventSubscribedWhoCreated :: !(IO [String])
573582#endif
@@ -600,7 +609,7 @@ eventSubscribedFan !subscribed = EventSubscribed
600609 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
601610 , eventSubscribedRetained = toAny subscribed
602611#ifdef DEBUG_CYCLES
603− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
612+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
604613 , eventSubscribedHasOwnHeightRef = False
605614 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
606615#endif
@@ -613,7 +622,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
613622#ifdef DEBUG_CYCLES
614623 , eventSubscribedGetParents = do
615624 s <- readIORef $ switchSubscribedCurrentParent subscribed
616− return [Some $ _eventSubscription_subscribed s]
625+ return [_eventSubscription_subscribed s]
617626 , eventSubscribedHasOwnHeightRef = True
618627 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
619628#endif
@@ -626,8 +635,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
626635#ifdef DEBUG_CYCLES
627636 , eventSubscribedGetParents = do
628637 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
629− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
630− innerParents = maybeToList $ fmap Some innerSubscription
638+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
639+ innerParents = maybeToList $ innerSubscription
631640 return $ outerParent : innerParents
632641 , eventSubscribedHasOwnHeightRef = True
633642 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -641,15 +650,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
641650whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
642651whoCreatedEventSubscribed = eventSubscribedWhoCreated
643652
644−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
653+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
645654walkInvalidHeightParents s0 = do
646− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
655+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
647656 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
648657 when (h == invalidHeight) $ do
649658 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
650− modify (Some s :)
659+ modify (s :)
651660 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
652− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
661+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
653662 return subscribers
654663#endif
655664
@@ -971,8 +980,10 @@ instance Monad (BehaviorM x) where
971980 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
972981 {-# INLINE return #-}
973982 return x = BehaviorM $ return x
983+#if !MIN_VERSION_base(4,13,0)
974984 {-# INLINE fail #-}
975985 fail s = BehaviorM $ fail s
986+#endif
976987
977988data BehaviorSubscribed x a
978989 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1032,7 +1043,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10321043newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10331044
10341045-- EventM can do everything BehaviorM can, plus create holds
1035−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1046+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10361047
10371048newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10381049
@@ -1057,7 +1068,8 @@ heightBagFromList :: [Height] -> HeightBag
10571068heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10581069
10591070heightBagAdd :: Height -> HeightBag -> HeightBag
1060−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1071+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1072+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10611073
10621074heightBagRemove :: Height -> HeightBag -> HeightBag
10631075heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1066,6 +1078,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10661078 0 -> IntMap.delete h c
10671079 _ -> IntMap.insert h (pred old) c
10681080
1081+heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1082+heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1083+ removed old = HeightBag (pred s) $ case old of
1084+ 0 -> IntMap.delete h c
1085+ _ -> IntMap.insert h (pred old) c
1086+
1087+
10691088heightBagMax :: HeightBag -> Height
10701089heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10711090 Just ((h, _), _) -> Height h
@@ -1313,55 +1332,110 @@ mkWeakPtrWithDebug x debugNote = do
13131332 x' <- evaluate x
13141333 mkWeakPtr x' $
13151334 if debugFinalize
1316− then Just $ putStrLn $ "finalizing: " ++ debugNote
1335+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13171336 else Nothing
13181337
13191338type WeakList a = [Weak a]
13201339
1321−{-# INLINE withIncreasedDepth #-}
1340+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1341+
1342+
1343+
1344+
13221345#ifdef DEBUG
1323−withIncreasedDepth :: CanTrace x m => m a -> m a
1324−withIncreasedDepth a = do
1325− spiderTimeline <- askSpiderTimelineEnv
1326− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
1346+
1347+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1348+debugSubscriber description = return . debugSubscriber' description
1349+
1350+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1351+debugSubscriber' description subscribed = Subscriber
1352+ {
1353+ subscriberPropagate = \m -> do
1354+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1355+ subscriberPropagate subscribed m
1356+ , subscriberInvalidateHeight = \old -> do
1357+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1358+ subscriberInvalidateHeight subscribed old
1359+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1360+ , subscriberRecalculateHeight = \new -> do
1361+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1362+ subscriberRecalculateHeight subscribed new
1363+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1364+ }
1365+
1366+
1367+{-# INLINE withIncreasedDepth #-}
1368+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1369+withIncreasedDepth _ a = do
1370+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
13271371 result <- a
1328− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1372+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13291373 return result
1330−#else
1331−withIncreasedDepth :: m a -> m a
1332−withIncreasedDepth = id
1333−#endif
1334−
1335−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13361374
13371375{-# INLINE tracePropagate #-}
13381376tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1339−tracePropagate p = traceWhen p debugPropagate
1377+tracePropagate p = when debugPropagate . trace p
13401378
13411379{-# INLINE traceInvalidate #-}
13421380traceInvalidate :: String -> IO ()
1343−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1381+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1382+
1383+{-# INLINE traceInvalidateHeight #-}
1384+traceInvalidateHeight :: String -> IO ()
1385+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13441386
1345−{-# INLINE traceWhen #-}
1346−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1347−traceWhen p b message = traceMWhen p b $ return message
1387+{-# INLINE trace #-}
1388+trace :: (CanTrace x m) => proxy x -> String -> m ()
1389+trace p message = traceM p $ return message
13481390
1349−{-# INLINE traceMWhen #-}
1350−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1351−traceMWhen _ b getMessage = when b $ do
1391+{-# INLINE traceM #-}
1392+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1393+traceM _ getMessage = do
13521394 message <- getMessage
1353−#ifdef DEBUG
1354− spiderTimeline <- askSpiderTimelineEnv
1355− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1395+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1396+ liftIO $ debugStrLn $ replicate d ' ' <> message
1397+
13561398#else
1357− let d = 0
1399+
1400+{-# INLINE withIncreasedDepth #-}
1401+withIncreasedDepth :: proxy x -> m a -> m a
1402+withIncreasedDepth _ = id
1403+
1404+{-# INLINE tracePropagate #-}
1405+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1406+tracePropagate _ _ = return ()
1407+
1408+{-# INLINE traceInvalidate #-}
1409+traceInvalidate :: String -> IO ()
1410+traceInvalidate _ = return ()
1411+
1412+{-# INLINE traceInvalidateHeight #-}
1413+traceInvalidateHeight :: String -> IO ()
1414+traceInvalidateHeight _ = return ()
1415+
1416+{-# INLINE debugSubscriber #-}
1417+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1418+debugSubscriber _ = return
1419+
1420+{-# INLINE debugSubscriber' #-}
1421+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1422+debugSubscriber' _ = id
1423+
1424+
1425+
1426+{-# INLINE trace #-}
1427+trace :: (CanTrace x m) => proxy x -> String -> m ()
1428+trace _ _ = return ()
1429+
1430+{-# INLINE traceM #-}
1431+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1432+traceM _ _ = return ()
1433+
13581434#endif
1359− liftIO $ putStrLn $ replicate d ' ' <> message
13601435
13611436whoCreatedIORef :: IORef a -> IO [String]
13621437whoCreatedIORef (IORef a) = whoCreated $! a
13631438
1364−#ifdef DEBUG_CYCLES
13651439groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13661440groupByHead = \case
13671441 [] -> []
@@ -1372,20 +1446,54 @@ groupByHead = \case
13721446 | otherwise -> (x, xs :| []) : l
13731447
13741448listsToForest :: Eq a => [[a]] -> Forest a
1375−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1449+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1450+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1451+
1452+showStacks :: [[String]] -> String
1453+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1454+
1455+filterStack :: String -> [String] -> [String]
1456+#ifdef DEBUG_HIDE_INTERNALS
1457+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1458+#else
1459+filterStack prefix = id
13761460#endif
13771461
1462+#ifdef DEBUG_CYCLES
1463+
1464+data EventLoopException = EventLoopException [[String]]
1465+instance Exception EventLoopException
1466+
1467+instance Show EventLoopException where
1468+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1469+ then "no location information, compile with profiling enabled for stack tree"
1470+ else showStacks stacks
1471+
1472+#else
1473+
1474+data EventLoopException = EventLoopException
1475+instance Exception EventLoopException
1476+
1477+instance Show EventLoopException where
1478+ show EventLoopException = "causality loop detected: \n" <>
1479+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1480+
1481+#endif
1482+
1483+
13781484{-# INLINE propagateSubscriberHold #-}
13791485propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13801486propagateSubscriberHold h a = do
1381− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1487+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13821488 invalidators <- liftIO $ readIORef $ holdInvalidators h
13831489 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1490+
13841491 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13851492 case {-# SCC "apply" #-} apply a v of
13861493 Nothing -> return ()
13871494 Just v' -> do
1388− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1495+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1496+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13891497 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13901498 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13911499 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1439,7 +1547,7 @@ getDynHold d = do
14391547zeroRef :: IORef Height
14401548zeroRef = unsafePerformIO $ newIORef zeroHeight
14411549
1442−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1550+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14431551getRootSubscribed k r sub = do
14441552 mSubscribed <- readIORef $ rootSubscribed r
14451553 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1453,7 +1561,9 @@ getRootSubscribed k r sub = do
14531561 let !cached = rootSubscribed r
14541562 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14551563 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1456− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1564+
1565+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1566+
14571567 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14581568 writeIORef uninitRef $! uninit
14591569#ifdef DEBUG_NODEIDS
@@ -1503,6 +1613,9 @@ data FanInt x a = FanInt
15031613 { _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
15041614 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15051615 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1616+#ifdef DEBUG_NODEIDS
1617+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1618+#endif
15061619 }
15071620
15081621newFanInt :: IO (FanInt x a)
@@ -1510,10 +1623,16 @@ newFanInt = do
15101623 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
15111624 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15121625 occRef <- newIORef $ error "fanInt: no occurrence"
1626+#ifdef DEBUG_NODEIDS
1627+ nodeId <- newNodeId
1628+#endif
15131629 return $ FanInt
15141630 { _fanInt_subscribers = subscribers
15151631 , _fanInt_subscriptionRef = subscriptionRef
15161632 , _fanInt_occRef = occRef
1633+#ifdef DEBUG_NODEIDS
1634+ , _fanInt_nodeId = nodeId
1635+#endif
15171636 }
15181637
15191638fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1522,20 +1641,21 @@ fanInt p = unsafePerformIO $ do
15221641 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15231642 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15241643 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1525− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1644+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1645+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15261646 { subscriberPropagate = \m -> do
15271647 liftIO $ writeIORef (_fanInt_occRef self) m
15281648 scheduleIntClear $ _fanInt_occRef self
1529− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1530− FastWeakBag.traverse b $ \s -> do
1649+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1650+ FastWeakBag.traverse_ b $ \s ->
15311651 subscriberPropagate s v
1532− , subscriberInvalidateHeight = \old -> do
1533− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1534− FastWeakBag.traverse b $ \s -> do
1652+ , subscriberInvalidateHeight = \old ->
1653+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1654+ FastWeakBag.traverse_ b $ \s ->
15351655 subscriberInvalidateHeight s old
1536− , subscriberRecalculateHeight = \new -> do
1537− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1538− FastWeakBag.traverse b $ \s -> do
1656+ , subscriberRecalculateHeight = \new ->
1657+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1658+ FastWeakBag.traverse_ b $ \s ->
15391659 subscriberRecalculateHeight s new
15401660 }
15411661 liftIO $ do
@@ -1549,10 +1669,25 @@ fanInt p = unsafePerformIO $ do
15491669 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15501670 return b
15511671 Just b -> return b
1552− t <- liftIO $ FastWeakBag.insert sub b
1672+ ticket <- liftIO $ FastWeakBag.insert sub b
15531673 currentOcc <- readIORef (_fanInt_occRef self)
1554− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1555− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
1674+
1675+ subscribed <- fanIntSubscribed ticket self
1676+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1677+
1678+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1679+fanIntSubscribed ticket self = do
1680+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1681+ return $ EventSubscribed
1682+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1683+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1684+#ifdef DEBUG_CYCLES
1685+ , eventSubscribedGetParents = return [subscribedParent]
1686+ , eventSubscribedHasOwnHeightRef = False
1687+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1688+#endif
1689+ }
1690+
15561691
15571692{-# INLINABLE getFanSubscribed #-}
15581693getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1750,7 +1885,7 @@ mergeCheap
17501885 => (forall a. q a -> Event x (v a))
17511886 -> DynamicS x (PatchDMap k q)
17521887 -> Event x (DMap k v)
1753−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1888+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17541889 where
17551890 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17561891 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1765,7 +1900,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17651900 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17661901 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17671902 forM_ mOldSubd $ \oldSubd -> do
1768− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1903+ oldHeight <- liftIO $ getEventSubscribedHeight $
1904+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1905+
17691906 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17701907 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17711908 foldM f ([], oldParents) $ DMap.toList p
@@ -1790,7 +1927,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17901927 => (forall a. q a -> Event x (v a))
17911928 -> DynamicS x (PatchDMapWithMove k q)
17921929 -> Event x (DMap k v)
1793−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1930+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17941931 where
17951932 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17961933 updateMe subscriber heightBagRef oldParents p = do
@@ -1809,13 +1946,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18091946 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18101947 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18111948 Nothing -> do
1812− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1949+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1950+ _mergeSubscribedParentWithMove_subscription parent
1951+
18131952 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18141953 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18151954 Just toKey -> do
18161955 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18171956 return Nothing
1818− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1957+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1958+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1959+
18191960 return (toDelete, applyAlways p' oldParents)
18201961 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18211962 getInitialSubscribers initialParents subscriber = do
@@ -1840,6 +1981,8 @@ type MergeUpdateFunc k v x p s
18401981 -> p
18411982 -> EventM x ([EventSubscription x], DMap k s)
18421983
1984+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1985+
18431986type MergeInitFunc k v q x s
18441987 = DMap k q
18451988 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1863,14 +2006,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18632006invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18642007invalidateMergeHeight' heightRef sub = do
18652008 oldHeight <- readIORef heightRef
1866− 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
2009+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2010+ when (oldHeight /= invalidHeight) $ do
18672011 writeIORef heightRef $! invalidHeight
18682012 subscriberInvalidateHeight sub oldHeight
18692013
18702014revalidateMergeHeight :: Merge x k v s -> IO ()
18712015revalidateMergeHeight m = do
18722016 currentHeight <- readIORef $ _merge_heightRef m
1873− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2017+
2018+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2019+ when (currentHeight == invalidHeight) $ do
18742020 heights <- readIORef $ _merge_heightBagRef m
18752021 parents <- readIORef $ _merge_parentsRef m
18762022 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1878,7 +2024,7 @@ revalidateMergeHeight m = do
18782024 LT -> return ()
18792025 EQ -> do
18802026 let height = succHeight $ heightBagMax heights
1881− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2027+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18822028 writeIORef (_merge_heightRef m) $! height
18832029 subscriberRecalculateHeight (_merge_sub m) height
18842030 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1886,36 +2032,45 @@ revalidateMergeHeight m = do
18862032scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18872033scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18882034 vals <- liftIO $ readIORef $ _merge_accumRef m
1889− 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
2035+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2036+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2037+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
18902038 --TODO: Assert that m is not empty
18912039 subscriberPropagate (_merge_sub m) vals
18922040
1893−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1894−mergeSubscriber m getKey = Subscriber
2041+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2042+checkCycle subscribed = liftIO $ do
2043+ height <- readIORef (eventSubscribedHeightRef subscribed)
2044+
2045+ -- currentHeight <- getCurrentHeight
2046+ -- when (height <= currentHeight) $ if height /= invalidHeight
2047+ -- then do
2048+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2049+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2050+ -- else liftIO $
2051+ when (height == invalidHeight) $
2052+#ifdef DEBUG_CYCLES
2053+ do
2054+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2055+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2056+ throwIO (EventLoopException stacks)
2057+#else
2058+ throwIO EventLoopException
2059+#endif
2060+
2061+
2062+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)
2063+mergeSubscriber subscribed m getKey = Subscriber
18952064 { subscriberPropagate = \a -> do
18962065 oldM <- liftIO $ readIORef $ _merge_accumRef m
18972066 k <- getKey
1898− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2067+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18992068 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19002069 liftIO $ writeIORef (_merge_accumRef m) $! newM
19012070 when (DMap.null oldM) $ do -- Only schedule the firing once
19022071 height <- liftIO $ readIORef $ _merge_heightRef m
1903− --TODO: assertions about height
1904− currentHeight <- getCurrentHeight
1905− when (height <= currentHeight) $ do
1906− if height /= invalidHeight
1907− then do
1908− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1909− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1910− else liftIO $ do
1911−#ifdef DEBUG_CYCLES
1912− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1913− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1914− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1915−#else
1916− let cycleInfo = ""
1917−#endif
1918− error $ "Causality loop found" <> cycleInfo
2072+ checkCycle subscribed
2073+
19192074 scheduleMergeSelf m height
19202075 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19212076 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1926,31 +2081,45 @@ mergeSubscriber m getKey = Subscriber
19262081 }
19272082
19282083--TODO: Be able to run as much of this as possible promptly
1929−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1930−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2084+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2085+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
19312086 where updateMe = do
19322087 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1933− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2088+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19342089 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19352090 return subscriptionsToKill
19362091
19372092{-# INLINE mergeGCheap' #-}
19382093mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1939− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1940−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2094+ => 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)
2095+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19412096 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19422097 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19432098 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19442099 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19452100 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1946− let m = Merge
2101+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2102+
2103+ let subscribed = EventSubscribed
2104+ { eventSubscribedHeightRef = heightRef
2105+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2106+#ifdef DEBUG_CYCLES
2107+ , eventSubscribedGetParents = do
2108+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2109+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2110+ , eventSubscribedHasOwnHeightRef = False
2111+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2112+#endif
2113+ }
2114+
2115+ m = Merge
19472116 { _merge_parentsRef = parentsRef
19482117 , _merge_heightBagRef = heightBagRef
19492118 , _merge_heightRef = heightRef
19502119 , _merge_sub = sub
19512120 , _merge_accumRef = accumRef
19522121 }
1953− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2122+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19542123 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19552124 myHeight = if invalidHeight `elem` heights
19562125 then invalidHeight
@@ -1959,31 +2128,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19592128 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19602129 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19612130 else (Nothing, dm)
1962− unless (DMap.null accum) $ do
1963− scheduleMergeSelf m myHeight
2131+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19642132 liftIO $ writeIORef accumRef $! accum
19652133 liftIO $ writeIORef heightRef $! myHeight
19662134 liftIO $ writeIORef heightBagRef $! myHeightBag
1967− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19682135 liftIO $ writeIORef parentsRef $! initialParentState
19692136 defer $ SomeMergeInit $ do
1970− let s = Subscriber
2137+ let changeSubscriber = Subscriber
19712138 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1972− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1973− defer $ updateMerge m updateFunc a
2139+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2140+ defer $ updateMerge subscribed m updateFunc a
19742141 , subscriberInvalidateHeight = \_ -> return ()
19752142 , subscriberRecalculateHeight = \_ -> return ()
19762143 }
1977− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1978− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2144+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2145+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
19792146 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19802147 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19812148 -- its subscription.
1982− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2149+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19832150 let unsubscribeAll = destroy =<< readIORef parentsRef
1984− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1985− , occ
1986− )
2151+
2152+ return (EventSubscription unsubscribeAll subscribed, occ)
2153+
19872154
19882155mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19892156mergeInt = cacheEvent . mergeIntCheap
@@ -1996,13 +2163,22 @@ mergeIntCheap d = Event $ \sub -> do
19962163 heightRef <- liftIO $ newIORef zeroHeight
19972164 heightBagRef <- liftIO $ newIORef heightBagEmpty
19982165 parents <- liftIO $ FastMutableIntMap.newEmpty
2166+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2167+ let subscribed = EventSubscribed
2168+ { eventSubscribedHeightRef = heightRef
2169+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2170+#ifdef DEBUG_CYCLES
2171+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2172+ , eventSubscribedHasOwnHeightRef = False
2173+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2174+#endif
2175+ }
19992176 let scheduleSelf = do
20002177 height <- liftIO $ readIORef $ heightRef
20012178 scheduleMerge' height heightRef $ do
20022179 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20032180 subscriberPropagate sub vals
2004− invalidateMyHeight = do
2005− invalidateMergeHeight' heightRef sub
2181+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20062182 recalculateMyHeight = do
20072183 currentHeight <- readIORef heightRef
20082184 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?
@@ -2012,12 +2188,14 @@ mergeIntCheap d = Event $ \sub -> do
20122188 LT -> return ()
20132189 EQ -> do
20142190 let height = succHeight $ heightBagMax heights
2015− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2191+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20162192 writeIORef heightRef $! height
20172193 subscriberRecalculateHeight sub height
20182194 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20192195 mySubscriber k = Subscriber
20202196 { subscriberPropagate = \a -> do
2197+ checkCycle subscribed
2198+
20212199 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20222200 liftIO $ FastMutableIntMap.insert accum k a
20232201 when wasEmpty scheduleSelf
@@ -2051,7 +2229,6 @@ mergeIntCheap d = Event $ \sub -> do
20512229 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20522230 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20532231 return Nothing
2054− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20552232 defer $ SomeMergeInit $ do
20562233 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20572234 where
@@ -2065,25 +2242,27 @@ mergeIntCheap d = Event $ \sub -> do
20652242 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20662243 liftIO $ for_ oldParents $ \oldParent -> do
20672244 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2245+
2246+ print ("updateMe", oldParentHeight)
20682247 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20692248 return $ IntMap.elems oldParents
2070− let s = Subscriber
2249+ let changeSubscriber = Subscriber
20712250 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20722251 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20732252 defer $ updateMe a
20742253 , subscriberInvalidateHeight = \_ -> return ()
20752254 , subscriberRecalculateHeight = \_ -> return ()
20762255 }
2077− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2256+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20782257 forM_ change $ \c -> defer $ updateMe c
20792258 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20802259 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20812260 -- its subscription.
2082− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2261+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20832262 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2084− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2085− , occ
2086− )
2263+
2264+
2265+ return (EventSubscription unsubscribeAll subscribed, occ)
20872266
20882267newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20892268newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2166,19 +2345,19 @@ runFrame a = SpiderHost $ do
21662345 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21672346 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21682347 writeIORef vRef v
2169− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2348+ traceInvalidate $ "Invalidating Hold"
21702349 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21712350 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21722351 writeIORef (eventEnvMergeUpdates env) []
2173− when debugPropagate $ putStrLn "Updating merges"
2352+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21742353 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2175− when debugPropagate $ putStrLn "Updating merges done"
2354+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21762355 toReconnect <- readIORef toReconnectRef
21772356 clearEventEnv env
21782357 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21792358 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21802359 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2181− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2360+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21822361 finalize wi
21832362 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21842363 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2192,7 +2371,7 @@ runFrame a = SpiderHost $ do
21922371 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
21932372 {-
21942373 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2195− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2374+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21962375 EventRoot _ -> "EventRoot"
21972376 EventNever -> "EventNever"
21982377 _ -> "something else"
@@ -2207,7 +2386,7 @@ runFrame a = SpiderHost $ do
22072386 myHeight <- readIORef $ switchSubscribedHeight subscribed
22082387 when (parentHeight /= myHeight) $ do
22092388 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2210− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2389+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
22112390 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
22122391 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
22132392 unsubscribe subscription
@@ -2248,7 +2427,7 @@ invalidateCoincidenceHeight subscribed = do
22482427 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
22492428 when (oldHeight /= invalidHeight) $ do
22502429 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2251− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2430+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
22522431
22532432updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
22542433updateSwitchHeight new subscribed = do
@@ -2256,7 +2435,7 @@ updateSwitchHeight new subscribed = do
22562435 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22572436 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22582437 writeIORef (switchSubscribedHeight subscribed) $! new
2259− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2438+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
22602439
22612440recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22622441recalculateCoincidenceHeight subscribed = do
@@ -2265,7 +2444,7 @@ recalculateCoincidenceHeight subscribed = do
22652444 height <- calculateCoincidenceHeight subscribed
22662445 when (height /= invalidHeight) $ do
22672446 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2268− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2447+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22692448
22702449calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22712450calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2356,8 +2535,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23562535 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23572536 {-# INLINE (>>) #-}
23582537 (>>) = (*>)
2538+#if !MIN_VERSION_base(4,13,0)
23592539 {-# INLINE fail #-}
23602540 fail _ = error "Dynamic does not support 'fail'"
2541+#endif
23612542
23622543{-# INLINABLE newJoinDyn #-}
23632544newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2482,13 +2663,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24822663 touch h
24832664 return result
24842665
2485−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2666+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24862667 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24872668 newFanEventWithTrigger f = SpiderHost $ do
24882669 es <- newFanEventWithTriggerIO f
24892670 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24902671
2491−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2672+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24922673 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24932674 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24942675 es <- newFanEventWithTriggerIO f
@@ -2636,8 +2817,14 @@ instance Monad (SpiderHost x) where
26362817 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
26372818 {-# INLINABLE return #-}
26382819 return x = SpiderHost $ return x
2820+#if !MIN_VERSION_base(4,13,0)
2821+ {-# INLINABLE fail #-}
2822+ fail = MonadFail.fail
2823+#endif
2824+
2825+instance MonadFail (SpiderHost x) where
26392826 {-# INLINABLE fail #-}
2640− fail s = SpiderHost $ fail s
2827+ fail s = SpiderHost $ MonadFail.fail s
26412828
26422829-- | Run an action affecting the global Spider timeline; this will be guarded by
26432830-- a mutex for that timeline
@@ -2659,19 +2846,21 @@ instance Monad (SpiderHostFrame x) where
26592846 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26602847 {-# INLINABLE return #-}
26612848 return x = SpiderHostFrame $ return x
2849+#if !MIN_VERSION_base(4,13,0)
26622850 {-# INLINABLE fail #-}
26632851 fail s = SpiderHostFrame $ fail s
2852+#endif
26642853
26652854instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26662855 notReadyUntil _ = pure ()
26672856 notReady = pure ()
26682857
2669−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2858+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26702859newEventWithTriggerIO f = do
26712860 es <- newFanEventWithTriggerIO $ \Refl -> f
26722861 return $ select es Refl
26732862
2674−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2863+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26752864newFanEventWithTriggerIO f = do
26762865 occRef <- newIORef DMap.empty
26772866 subscribedRef <- newIORef DMap.empty
@@ -2705,3 +2894,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
27052894instance PrimMonad (SpiderHostFrame x) where
27062895 type PrimState (SpiderHostFrame x) = PrimState IO
27072896 primitive = SpiderHostFrame . EventM . primitive
2897+
2898+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2899+ notReadyUntil _ = return ()
2900+ notReady = return ()
2901+
2902+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2903+ notReadyUntil _ = return ()
2904+ notReady = return ()