@@ -9,7 +9,6 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiWayIf #-}
1312{-# LANGUAGE RankNTypes #-}
1413{-# LANGUAGE RoleAnnotations #-}
1514{-# LANGUAGE ScopedTypeVariables #-}
@@ -20,6 +19,7 @@
2019{-# LANGUAGE DeriveFunctor #-}
2120{-# LANGUAGE StandaloneDeriving #-}
2221{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
2323
2424#ifdef USE_REFLEX_OPTIMIZER
2525{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,16 +38,17 @@ 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)
4646import 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
@@ -84,14 +86,16 @@ import Data.Zip (Zip (..))
8486
8587#ifdef DEBUG_CYCLES
8688import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
8791import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
8892import qualified Data.List.NonEmpty as NonEmpty
89−import Data.Monoid (mempty)
9093import Data.Tree (Forest, Tree (..), drawForest)
91−#endif
94+import Data.List (isPrefixOf)
9295
93−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9497import qualified Data.FastWeakBag as FastWeakBag
98+
9599import Data.Reflection
96100import Data.Some (Some(Some))
97101import Data.Type.Coercion
@@ -102,21 +106,26 @@ import qualified Reflex.Class
102106import qualified Reflex.Class as R
103107import qualified Reflex.Host.Class
104108import Reflex.NotReady.Class
105−import Reflex.Patch
106−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
107111import Reflex.PerformEvent.Base (PerformEventT)
108112
109113#ifdef DEBUG_TRACE_EVENTS
110114import qualified Data.ByteString.Char8 as BS8
111115import System.IO (stderr)
116+import Data.List (isPrefixOf)
112117#endif
113118
114−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
115122
123+#ifdef DEBUG_TRACE_EVENTS
116124withStackOneLine :: (BS8.ByteString -> a) -> a
117125withStackOneLine expr = unsafePerformIO $ do
118126 stack <- currentCallStack
119− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
120129
121130#endif
122131
@@ -127,28 +136,42 @@ debugInvalidateHeight :: Bool
127136debugInvalidate :: Bool
128137
129138#ifdef DEBUG
130−
131139#define DEBUG_NODEIDS
132140
141+#ifdef DEBUG_TRACE_PROPAGATION
133142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
134146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
135150debugInvalidateHeight = False
151+#endif
136152
153+#ifdef DEBUG_TRACE_INVALIDATION
137154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
138158
139159class HasNodeId a where
140160 getNodeId :: a -> Int
141161
142−instance HasNodeId (Hold x p a) where
143− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
144167
145−instance HasNodeId (PushSubscribed x a b) where
146− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
147170
148171instance HasNodeId (SwitchSubscribed x a) where
149172 getNodeId = switchSubscribedNodeId
150173
151−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
152175 getNodeId = fanSubscribedNodeId
153176
154177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -162,41 +185,16 @@ instance HasNodeId (Pull x a) where
162185
163186{-# INLINE showNodeId #-}
164187showNodeId :: HasNodeId a => a -> String
165−showNodeId = ("#"<>) . show . getNodeId
166−
167−showSubscriberType :: Subscriber x a -> String
168−showSubscriberType = \case
169− SubscriberPush _ _ -> "SubscriberPush"
170− SubscriberMerge _ _ -> "SubscriberMerge"
171− SubscriberFan _ -> "SubscriberFan"
172− SubscriberMergeChange _ -> "SubscriberMergeChange"
173− SubscriberHold _ -> "SubscriberHold"
174− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
175− SubscriberSwitch _ -> "SubscriberSwitch"
176− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
177− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
178− SubscriberHandle -> "SubscriberHandle"
179−
180−showEventType :: Event x a -> String
181−showEventType = \case
182− EventRoot _ _ -> "EventRoot"
183− EventNever -> "EventNever"
184− EventPush _ -> "EventPush"
185− EventMerge _ -> "EventMerge"
186− EventFan _ _ -> "EventFan"
187− EventSwitch _ -> "EventSwitch"
188− EventCoincidence _ -> "EventCoincidence"
189− EventHold _ -> "EventHold"
190− EventDyn _ -> "EventDyn"
191− EventHoldIdentity _ -> "EventHoldIdentity"
192− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
193193
194194#else
195195
196196debugPropagate = False
197−
198197debugInvalidateHeight = False
199−
200198debugInvalidate = False
201199
202200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -204,6 +202,10 @@ debugInvalidate = False
204202showNodeId :: a -> String
205203showNodeId _ = ""
206204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
207209#endif
208210
209211#ifdef DEBUG_NODEIDS
@@ -249,9 +251,9 @@ subscribeAndRead = unEvent
249251-- caching; if the computation function is very cheap, this is (much) more
250252-- efficient than 'push'
251253{-# INLINE [1] pushCheap #-}
252−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
253255pushCheap !f e = Event $ \sub -> do
254− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
255257 { subscriberPropagate = \a -> do
256258 mb <- f a
257259 mapM_ (subscriberPropagate sub) mb
@@ -270,10 +272,10 @@ terminalSubscriber p = Subscriber
270272
271273-- | Subscribe to an Event only for the duration of one occurrence
272274{-# INLINE subscribeAndReadHead #-}
273−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)
274276subscribeAndReadHead e sub = do
275277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
276− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
277279 { subscriberPropagate = \a -> do
278280 liftIO $ unsubscribe =<< readIORef subscriptionRef
279281 subscriberPropagate sub a
@@ -284,24 +286,42 @@ subscribeAndReadHead e sub = do
284286 return (subscription, occ)
285287
286288--TODO: Make this lazy in its input event
287−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)
288290headE originalE = do
289291 parent <- liftIO $ newIORef $ Just originalE
290292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
291293 let clearParent = liftIO $ writeIORef parent Nothing
292− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
293295 when (isJust occ) clearParent
294− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
295297 liftIO (readIORef parent) >>= \case
296− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
297299 Just e -> subscribeAndReadHead e sub
298300
299301data CacheSubscribed x a
300302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
301303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
302304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
303308 }
304309
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+
305325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
306326-- repeatedly
307327--
@@ -326,18 +346,23 @@ cacheEvent e =
326346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
327347 Just subscribedTicket -> return subscribedTicket
328348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
329352 subscribers <- liftIO FastWeakBag.empty
330353 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
331357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
332− { subscriberPropagate = \a -> do
333− liftIO $ writeIORef occRef $ Just a
334− scheduleClear occRef
335− propagateFast a subscribers
336− , subscriberInvalidateHeight = \old -> do
337− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
338− , subscriberRecalculateHeight = \new -> do
339− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
340− }
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+ }
341366 when (isJust occ) $ do
342367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
343368 scheduleClear occRef
@@ -345,29 +370,45 @@ cacheEvent e =
345370 { _cacheSubscribed_subscribers = subscribers
346371 , _cacheSubscribed_parent = parentSub
347372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
348376 }
349377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
350378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
351379 return subscribedTicket
352− liftIO $ do
353− subscribed <- getFastWeakTicketValue subscribedTicket
354− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
355− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
356− let es = EventSubscription
357− { _eventSubscription_unsubscribe = do
358− FastWeakBag.remove ticket
359− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
360− when isEmpty $ do
361− writeIORef mSubscribedRef emptyFastWeak
362− unsubscribe $ _cacheSubscribed_parent subscribed
363− touch ticket
364− touch subscribedTicket
365− , _eventSubscription_subscribed = EventSubscribed
366− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
367− , eventSubscribedRetained = toAny subscribedTicket
368− }
369− }
370− 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+
371412
372413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
373414subscribe e s = fst <$> subscribeAndRead e s
@@ -379,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
379420 let es = tag subd
380421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
381422
382−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
383424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
384425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
385429eventNever :: Event x a
386−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
387431
388432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
389433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -420,16 +464,6 @@ data Subscriber x a = Subscriber
420464 , subscriberRecalculateHeight :: !(Height -> IO ())
421465 }
422466
423−--TODO: Move this comment to WeakBag
424−-- These function are constructor functions that are marked NOINLINE so they are
425−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
426−-- so any weak references that are attached to the constructors will have their
427−-- finalizer run. Using the opaque constructor, does not see the
428−-- constructor application, so it behaves like an IORef and cannot be fused away.
429−--
430−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
431−-- the weak pointer to it in some cases.
432−
433467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
434468newSubscriberHold h = return $ Subscriber
435469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -438,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
438472 }
439473
440474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
441−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
442476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
443477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
444− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
445479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
446480 scheduleClear $ fanSubscribedOccurrence subscribed
447481 let f _ (Pair v subsubs) = do
@@ -450,50 +484,40 @@ newSubscriberFan subscribed = return $ Subscriber
450484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
451485 return ()
452486 , subscriberInvalidateHeight = \old -> do
453− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
454487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
455488 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
456− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
457489 , subscriberRecalculateHeight = \new -> do
458− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
459490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
460491 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
461− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
462492 }
463493
464494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
465−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
466496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
467− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
468497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
469498 scheduleClear $ switchSubscribedOccurrence subscribed
470499 propagate a $ switchSubscribedSubscribers subscribed
471500 , subscriberInvalidateHeight = \_ -> do
472− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
473501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
474502 when (oldHeight /= invalidHeight) $ do
475503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
476504 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
477− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
478− , subscriberRecalculateHeight = \new -> do
479− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
480− updateSwitchHeight new subscribed
481− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
482− }
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
483507
484508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
485−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
486510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
487− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
488511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
489512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
490513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
491514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
492515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
493517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
494518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
495519 case occ of
496− Nothing -> do
520+ Nothing ->
497521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
498522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
499523 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -502,20 +526,13 @@ newSubscriberCoincidenceOuter subscribed = return $ Subscriber
502526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
503527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
504528 propagate o $ coincidenceSubscribedSubscribers subscribed
505− , subscriberInvalidateHeight = \_ -> do
506− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
507− invalidateCoincidenceHeight subscribed
508− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
509− , subscriberRecalculateHeight = \_ -> do
510− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
511− recalculateCoincidenceHeight subscribed
512− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
513531 }
514532
515533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
516−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
517535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
518− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
519536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
520537 case occ of
521538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -523,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
523540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
524541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
525542 propagate a $ coincidenceSubscribedSubscribers subscribed
526− , subscriberInvalidateHeight = \_ -> do
527− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
528− invalidateCoincidenceHeight subscribed
529− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
530− , subscriberRecalculateHeight = \_ -> do
531− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
532− recalculateCoincidenceHeight subscribed
533− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
534545 }
535546
536547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -540,15 +551,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
540551recalculateSubscriberHeight = flip subscriberRecalculateHeight
541552
542553-- | Propagate everything at the current height
543−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
544−propagate a subscribers = withIncreasedDepth $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
545556 -- 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
546557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
547558 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
548559
549560-- | Propagate everything at the current height
550−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
551−propagateFast a subscribers = withIncreasedDepth $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
552563 -- 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
553564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
554565 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -569,7 +580,7 @@ data EventSubscribed x = EventSubscribed
569580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
570581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
571582#ifdef DEBUG_CYCLES
572− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
573584 , eventSubscribedHasOwnHeightRef :: !Bool
574585 , eventSubscribedWhoCreated :: !(IO [String])
575586#endif
@@ -596,13 +607,23 @@ eventSubscribedNever = EventSubscribed
596607 , eventSubscribedWhoCreated = return ["never"]
597608#endif
598609 }
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+ }
599620
600621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
601622eventSubscribedFan !subscribed = EventSubscribed
602623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
603624 , eventSubscribedRetained = toAny subscribed
604625#ifdef DEBUG_CYCLES
605− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
606627 , eventSubscribedHasOwnHeightRef = False
607628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
608629#endif
@@ -615,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
615636#ifdef DEBUG_CYCLES
616637 , eventSubscribedGetParents = do
617638 s <- readIORef $ switchSubscribedCurrentParent subscribed
618− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
619640 , eventSubscribedHasOwnHeightRef = True
620641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
621642#endif
@@ -628,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
628649#ifdef DEBUG_CYCLES
629650 , eventSubscribedGetParents = do
630651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
631− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
632− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
633654 return $ outerParent : innerParents
634655 , eventSubscribedHasOwnHeightRef = True
635656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -643,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
643664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
644665whoCreatedEventSubscribed = eventSubscribedWhoCreated
645666
646−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
647668walkInvalidHeightParents s0 = do
648− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
649670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
650671 when (h == invalidHeight) $ do
651672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
652− modify (Some s :)
673+ modify (s :)
653674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
654− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
655676 return subscribers
656677#endif
657678
@@ -975,12 +996,8 @@ instance Monad (BehaviorM x) where
975996 return x = BehaviorM $ return x
976997#if !MIN_VERSION_base(4,13,0)
977998 {-# INLINE fail #-}
978− fail s = MonadFail.fail
979−#endif
980−
981−instance MonadFail (SpiderHost x) where
982− {-# INLINABLE fail #-}
983999 fail s = BehaviorM $ fail s
1000+#endif
9841001
9851002data BehaviorSubscribed x a
9861003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1040,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10401057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10411058
10421059-- EventM can do everything BehaviorM can, plus create holds
1043−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
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10441061
10451062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10461063
@@ -1065,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10651082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10661083
10671084heightBagAdd :: Height -> HeightBag -> HeightBag
1068−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
10691087
10701088heightBagRemove :: Height -> HeightBag -> HeightBag
10711089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1074,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10741092 0 -> IntMap.delete h c
10751093 _ -> IntMap.insert h (pred old) c
10761094
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+
10771102heightBagMax :: HeightBag -> Height
10781103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10791104 Just ((h, _), _) -> Height h
@@ -1321,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
13211346 x' <- evaluate x
13221347 mkWeakPtr x' $
13231348 if debugFinalize
1324− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13251350 else Nothing
13261351
13271352type WeakList a = [Weak a]
13281353
1329−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
13301359#ifdef DEBUG
1331−withIncreasedDepth :: CanTrace x m => m a -> m a
1332−withIncreasedDepth a = do
1333− spiderTimeline <- askSpiderTimelineEnv
1334− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
1360+
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1363+
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
1366+ {
1367+ subscriberPropagate = \m -> do
1368+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369+ subscriberPropagate subscribed m
1370+ , subscriberInvalidateHeight = \old -> do
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372+ subscriberInvalidateHeight subscribed old
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374+ , subscriberRecalculateHeight = \new -> do
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376+ subscriberRecalculateHeight subscribed new
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378+ }
1379+
1380+
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383+withIncreasedDepth _ a = do
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
13351385 result <- a
1336− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13371387 return result
1338−#else
1339−withIncreasedDepth :: m a -> m a
1340−withIncreasedDepth = id
1341−#endif
1342−
1343−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13441388
13451389{-# INLINE tracePropagate #-}
13461390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1347−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13481392
13491393{-# INLINE traceInvalidate #-}
13501394traceInvalidate :: String -> IO ()
1351−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13521400
1353−{-# INLINE traceWhen #-}
1354−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1355−traceWhen p b message = traceMWhen p b $ return message
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
13561404
1357−{-# INLINE traceMWhen #-}
1358−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1359−traceMWhen _ b getMessage = when b $ do
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13601408 message <- getMessage
1361−#ifdef DEBUG
1362− spiderTimeline <- askSpiderTimelineEnv
1363− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13641412#else
1365− let d = 0
1413+
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1417+
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1421+
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1425+
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1433+
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1443+
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1447+
13661448#endif
1367− liftIO $ putStrLn $ replicate d ' ' <> message
13681449
13691450whoCreatedIORef :: IORef a -> IO [String]
13701451whoCreatedIORef (IORef a) = whoCreated $! a
13711452
1372−#ifdef DEBUG_CYCLES
13731453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13741454groupByHead = \case
13751455 [] -> []
@@ -1380,20 +1460,54 @@ groupByHead = \case
13801460 | otherwise -> (x, xs :| []) : l
13811461
13821462listsToForest :: Eq a => [[a]] -> Forest a
1383−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
13841474#endif
13851475
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+
13861498{-# INLINE propagateSubscriberHold #-}
13871499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13881500propagateSubscriberHold h a = do
1389− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13901502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13911503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13921505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13931506 case {-# SCC "apply" #-} apply a v of
13941507 Nothing -> return ()
13951508 Just v' -> do
1396− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13971511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13981512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13991513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1447,7 +1561,7 @@ getDynHold d = do
14471561zeroRef :: IORef Height
14481562zeroRef = unsafePerformIO $ newIORef zeroHeight
14491563
1450−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14511565getRootSubscribed k r sub = do
14521566 mSubscribed <- readIORef $ rootSubscribed r
14531567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1461,7 +1575,9 @@ getRootSubscribed k r sub = do
14611575 let !cached = rootSubscribed r
14621576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14631577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1464− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14651581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14661582 writeIORef uninitRef $! uninit
14671583#ifdef DEBUG_NODEIDS
@@ -1511,6 +1627,9 @@ data FanInt x a = FanInt
15111627 { _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
15121628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15131629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
15141633 }
15151634
15161635newFanInt :: IO (FanInt x a)
@@ -1518,10 +1637,16 @@ newFanInt = do
15181637 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
15191638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15201639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
15211643 return $ FanInt
15221644 { _fanInt_subscribers = subscribers
15231645 , _fanInt_subscriptionRef = subscriptionRef
15241646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
15251650 }
15261651
15271652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1530,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
15301655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15311656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15321657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1533− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15341660 { subscriberPropagate = \m -> do
15351661 liftIO $ writeIORef (_fanInt_occRef self) m
15361662 scheduleIntClear $ _fanInt_occRef self
1537− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1538− 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 ->
15391665 subscriberPropagate s v
1540− , subscriberInvalidateHeight = \old -> do
1541− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1542− FastWeakBag.traverse_ b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15431669 subscriberInvalidateHeight s old
1544− , subscriberRecalculateHeight = \new -> do
1545− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1546− FastWeakBag.traverse_ b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15471673 subscriberRecalculateHeight s new
15481674 }
15491675 liftIO $ do
@@ -1557,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15571683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15581684 return b
15591685 Just b -> return b
1560− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15611687 currentOcc <- readIORef (_fanInt_occRef self)
1562− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1563− 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+
15641705
15651706{-# INLINABLE getFanSubscribed #-}
15661707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1758,7 +1899,7 @@ mergeCheap
17581899 => (forall a. q a -> Event x (v a))
17591900 -> DynamicS x (PatchDMap k q)
17601901 -> Event x (DMap k v)
1761−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17621903 where
17631904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17641905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1773,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17731914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17741915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17751916 forM_ mOldSubd $ \oldSubd -> do
1776− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17771920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17781921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17791922 foldM f ([], oldParents) $ DMap.toList p
@@ -1798,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17981941 => (forall a. q a -> Event x (v a))
17991942 -> DynamicS x (PatchDMapWithMove k q)
18001943 -> Event x (DMap k v)
1801−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
18021945 where
18031946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
18041947 updateMe subscriber heightBagRef oldParents p = do
@@ -1817,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18171960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18181961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18191962 Nothing -> do
1820− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
18211966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18221967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18231968 Just toKey -> do
18241969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18251970 return Nothing
1826− 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+
18271974 return (toDelete, applyAlways p' oldParents)
18281975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18291976 getInitialSubscribers initialParents subscriber = do
@@ -1848,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18481995 -> p
18491996 -> EventM x ([EventSubscription x], DMap k s)
18501997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18512000type MergeInitFunc k v q x s
18522001 = DMap k q
18532002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1871,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18712020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18722021invalidateMergeHeight' heightRef sub = do
18732022 oldHeight <- readIORef heightRef
1874− 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
18752025 writeIORef heightRef $! invalidHeight
18762026 subscriberInvalidateHeight sub oldHeight
18772027
18782028revalidateMergeHeight :: Merge x k v s -> IO ()
18792029revalidateMergeHeight m = do
18802030 currentHeight <- readIORef $ _merge_heightRef m
1881− 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
18822034 heights <- readIORef $ _merge_heightBagRef m
18832035 parents <- readIORef $ _merge_parentsRef m
18842036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1886,7 +2038,7 @@ revalidateMergeHeight m = do
18862038 LT -> return ()
18872039 EQ -> do
18882040 let height = succHeight $ heightBagMax heights
1889− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18902042 writeIORef (_merge_heightRef m) $! height
18912043 subscriberRecalculateHeight (_merge_sub m) height
18922044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1894,36 +2046,45 @@ revalidateMergeHeight m = do
18942046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18952047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18962048 vals <- liftIO $ readIORef $ _merge_accumRef m
1897− 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
18982052 --TODO: Assert that m is not empty
18992053 subscriberPropagate (_merge_sub m) vals
19002054
1901−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1902−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
19032078 { subscriberPropagate = \a -> do
19042079 oldM <- liftIO $ readIORef $ _merge_accumRef m
19052080 k <- getKey
1906− 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
19072082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19082083 liftIO $ writeIORef (_merge_accumRef m) $! newM
19092084 when (DMap.null oldM) $ do -- Only schedule the firing once
19102085 height <- liftIO $ readIORef $ _merge_heightRef m
1911− --TODO: assertions about height
1912− currentHeight <- getCurrentHeight
1913− when (height <= currentHeight) $ do
1914− if height /= invalidHeight
1915− then do
1916− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1917− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1918− else liftIO $ do
1919−#ifdef DEBUG_CYCLES
1920− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1921− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1922− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1923−#else
1924− let cycleInfo = ""
1925−#endif
1926− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
19272088 scheduleMergeSelf m height
19282089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19292090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1934,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
19342095 }
19352096
19362097--TODO: Be able to run as much of this as possible promptly
1937−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1938−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)
19392100 where updateMe = do
19402101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1941− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19422103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19432104 return subscriptionsToKill
19442105
19452106{-# INLINE mergeGCheap' #-}
19462107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1947− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1948−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
19492110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19502111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19512112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19522113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19532114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1954− 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
19552130 { _merge_parentsRef = parentsRef
19562131 , _merge_heightBagRef = heightBagRef
19572132 , _merge_heightRef = heightRef
19582133 , _merge_sub = sub
19592134 , _merge_accumRef = accumRef
19602135 }
1961− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19622137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19632138 myHeight = if invalidHeight `elem` heights
19642139 then invalidHeight
@@ -1967,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19672142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19682143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19692144 else (Nothing, dm)
1970− unless (DMap.null accum) $ do
1971− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19722146 liftIO $ writeIORef accumRef $! accum
19732147 liftIO $ writeIORef heightRef $! myHeight
19742148 liftIO $ writeIORef heightBagRef $! myHeightBag
1975− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19762149 liftIO $ writeIORef parentsRef $! initialParentState
19772150 defer $ SomeMergeInit $ do
1978− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19792152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1980− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1981− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19822155 , subscriberInvalidateHeight = \_ -> return ()
19832156 , subscriberRecalculateHeight = \_ -> return ()
19842157 }
1985− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1986− 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
19872160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19882161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19892162 -- its subscription.
1990− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19912164 let unsubscribeAll = destroy =<< readIORef parentsRef
1992− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1993− , occ
1994− )
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
19952168
19962169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19972170mergeInt = cacheEvent . mergeIntCheap
@@ -2004,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
20042177 heightRef <- liftIO $ newIORef zeroHeight
20052178 heightBagRef <- liftIO $ newIORef heightBagEmpty
20062179 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+ }
20072190 let scheduleSelf = do
20082191 height <- liftIO $ readIORef $ heightRef
20092192 scheduleMerge' height heightRef $ do
20102193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20112194 subscriberPropagate sub vals
2012− invalidateMyHeight = do
2013− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20142196 recalculateMyHeight = do
20152197 currentHeight <- readIORef heightRef
20162198 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?
@@ -2020,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
20202202 LT -> return ()
20212203 EQ -> do
20222204 let height = succHeight $ heightBagMax heights
2023− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20242206 writeIORef heightRef $! height
20252207 subscriberRecalculateHeight sub height
20262208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20272209 mySubscriber k = Subscriber
20282210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
20292213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20302214 liftIO $ FastMutableIntMap.insert accum k a
20312215 when wasEmpty scheduleSelf
@@ -2059,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20592243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20602244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20612245 return Nothing
2062− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20632246 defer $ SomeMergeInit $ do
20642247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20652248 where
@@ -2073,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20732256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20742257 liftIO $ for_ oldParents $ \oldParent -> do
20752258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20762261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20772262 return $ IntMap.elems oldParents
2078− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20792264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20802265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20812266 defer $ updateMe a
20822267 , subscriberInvalidateHeight = \_ -> return ()
20832268 , subscriberRecalculateHeight = \_ -> return ()
20842269 }
2085− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20862271 forM_ change $ \c -> defer $ updateMe c
20872272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20882273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20892274 -- its subscription.
2090− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20912276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2092− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2093− , occ
2094− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20952280
20962281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20972282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2174,19 +2359,19 @@ runFrame a = SpiderHost $ do
21742359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21752360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21762361 writeIORef vRef v
2177− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21782363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21792364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21802365 writeIORef (eventEnvMergeUpdates env) []
2181− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21822367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2183− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21842369 toReconnect <- readIORef toReconnectRef
21852370 clearEventEnv env
21862371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21872372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21882373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2189− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21902375 finalize wi
21912376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21922377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2200,7 +2385,7 @@ runFrame a = SpiderHost $ do
22002385 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
22012386 {-
22022387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2203− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
22042389 EventRoot _ -> "EventRoot"
22052390 EventNever -> "EventNever"
22062391 _ -> "something else"
@@ -2335,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
23352520 {-# INLINABLE headE #-}
23362521 headE = R.slowHeadE
23372522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
23382525
23392526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
23402527 {-# INLINABLE sample #-}
@@ -2356,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23562543 {-# INLINABLE headE #-}
23572544 headE = R.slowHeadE
23582545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23592549
23602550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23612551 {-# INLINE return #-}
@@ -2419,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24192609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
24202610 {-# INLINABLE headE #-}
24212611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
24222615
24232616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
24242617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2435,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24352628 {-# INLINABLE headE #-}
24362629 headE = R.slowHeadE
24372630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
24382633
24392634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
24402635 {-# INLINABLE sample #-}
@@ -2455,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24552650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24562651 {-# INLINABLE headE #-}
24572652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24582655
24592656--------------------------------------------------------------------------------
24602657-- Deprecated items
@@ -2492,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24922689 touch h
24932690 return result
24942691
2495−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24962693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24972694 newFanEventWithTrigger f = SpiderHost $ do
24982695 es <- newFanEventWithTriggerIO f
24992696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
25002697
2501−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
25022699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
25032700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
25042701 es <- newFanEventWithTriggerIO f
@@ -2578,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25782775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25792776 {-# INLINABLE mergeG #-}
25802777 mergeG
2581− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25822779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25832780 -> DMap k q
25842781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2648,12 +2845,12 @@ instance Monad (SpiderHost x) where
26482845 return x = SpiderHost $ return x
26492846#if !MIN_VERSION_base(4,13,0)
26502847 {-# INLINABLE fail #-}
2651− fail s = MonadFail.fail
2848+ fail = MonadFail.fail
26522849#endif
26532850
26542851instance MonadFail (SpiderHost x) where
26552852 {-# INLINABLE fail #-}
2656− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
26572854
26582855-- | Run an action affecting the global Spider timeline; this will be guarded by
26592856-- a mutex for that timeline
@@ -2676,24 +2873,20 @@ instance Monad (SpiderHostFrame x) where
26762873 {-# INLINABLE return #-}
26772874 return x = SpiderHostFrame $ return x
26782875#if !MIN_VERSION_base(4,13,0)
2679− {-# INLINABLE fail #-}
2680− fail s = MonadFail.fail
2681−#endif
2682−
2683−instance MonadFail (SpiderHostFrame x) where
26842876 {-# INLINABLE fail #-}
26852877 fail s = SpiderHostFrame $ fail s
2878+#endif
26862879
26872880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26882881 notReadyUntil _ = pure ()
26892882 notReady = pure ()
26902883
2691−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26922885newEventWithTriggerIO f = do
26932886 es <- newFanEventWithTriggerIO $ \Refl -> f
26942887 return $ select es Refl
26952888
2696−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26972890newFanEventWithTriggerIO f = do
26982891 occRef <- newIORef DMap.empty
26992892 subscribedRef <- newIORef DMap.empty