@@ -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,7 +38,6 @@ 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
@@ -47,8 +46,9 @@ import Control.Monad.Fail (MonadFail)
4746import qualified Control.Monad.Fail as MonadFail
4847import Data.Align
4948import Data.Coerce
50−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
5150import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
5252import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5353import qualified Data.FastMutableIntMap as FastMutableIntMap
5454import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
6161import Data.IORef
6262import Data.Kind (Type)
6363import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
6565import Data.Proxy
6666import Data.These
6767import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
6869import Data.Witherable (Filterable, mapMaybe)
69−import GHC.Exts
70+import GHC.Exts hiding (toList)
7071import GHC.IORef (IORef (..))
7172import GHC.Stack
7273import Reflex.FastWeak
@@ -85,14 +86,16 @@ import Data.Zip (Zip (..))
8586
8687#ifdef DEBUG_CYCLES
8788import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
8891import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
8992import qualified Data.List.NonEmpty as NonEmpty
90−import Data.Monoid (mempty)
9193import Data.Tree (Forest, Tree (..), drawForest)
92−#endif
94+import Data.List (isPrefixOf)
9395
94−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9597import qualified Data.FastWeakBag as FastWeakBag
98+
9699import Data.Reflection
97100import Data.Some (Some(Some))
98101import Data.Type.Coercion
@@ -103,21 +106,26 @@ import qualified Reflex.Class
103106import qualified Reflex.Class as R
104107import qualified Reflex.Host.Class
105108import Reflex.NotReady.Class
106−import Reflex.Patch
107−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
108111import Reflex.PerformEvent.Base (PerformEventT)
109112
110113#ifdef DEBUG_TRACE_EVENTS
111114import qualified Data.ByteString.Char8 as BS8
112115import System.IO (stderr)
116+import Data.List (isPrefixOf)
113117#endif
114118
115−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
116122
123+#ifdef DEBUG_TRACE_EVENTS
117124withStackOneLine :: (BS8.ByteString -> a) -> a
118125withStackOneLine expr = unsafePerformIO $ do
119126 stack <- currentCallStack
120− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
121129
122130#endif
123131
@@ -128,28 +136,42 @@ debugInvalidateHeight :: Bool
128136debugInvalidate :: Bool
129137
130138#ifdef DEBUG
131−
132139#define DEBUG_NODEIDS
133140
141+#ifdef DEBUG_TRACE_PROPAGATION
134142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
135146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
136150debugInvalidateHeight = False
151+#endif
137152
153+#ifdef DEBUG_TRACE_INVALIDATION
138154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
139158
140159class HasNodeId a where
141160 getNodeId :: a -> Int
142161
143−instance HasNodeId (Hold x p a) where
144− 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
145167
146−instance HasNodeId (PushSubscribed x a b) where
147− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
148170
149171instance HasNodeId (SwitchSubscribed x a) where
150172 getNodeId = switchSubscribedNodeId
151173
152−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
153175 getNodeId = fanSubscribedNodeId
154176
155177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -163,41 +185,16 @@ instance HasNodeId (Pull x a) where
163185
164186{-# INLINE showNodeId #-}
165187showNodeId :: HasNodeId a => a -> String
166−showNodeId = ("#"<>) . show . getNodeId
167−
168−showSubscriberType :: Subscriber x a -> String
169−showSubscriberType = \case
170− SubscriberPush _ _ -> "SubscriberPush"
171− SubscriberMerge _ _ -> "SubscriberMerge"
172− SubscriberFan _ -> "SubscriberFan"
173− SubscriberMergeChange _ -> "SubscriberMergeChange"
174− SubscriberHold _ -> "SubscriberHold"
175− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
176− SubscriberSwitch _ -> "SubscriberSwitch"
177− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
178− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
179− SubscriberHandle -> "SubscriberHandle"
180−
181−showEventType :: Event x a -> String
182−showEventType = \case
183− EventRoot _ _ -> "EventRoot"
184− EventNever -> "EventNever"
185− EventPush _ -> "EventPush"
186− EventMerge _ -> "EventMerge"
187− EventFan _ _ -> "EventFan"
188− EventSwitch _ -> "EventSwitch"
189− EventCoincidence _ -> "EventCoincidence"
190− EventHold _ -> "EventHold"
191− EventDyn _ -> "EventDyn"
192− EventHoldIdentity _ -> "EventHoldIdentity"
193− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
194193
195194#else
196195
197196debugPropagate = False
198−
199197debugInvalidateHeight = False
200−
201198debugInvalidate = False
202199
203200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -205,6 +202,10 @@ debugInvalidate = False
205202showNodeId :: a -> String
206203showNodeId _ = ""
207204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
208209#endif
209210
210211#ifdef DEBUG_NODEIDS
@@ -250,9 +251,9 @@ subscribeAndRead = unEvent
250251-- caching; if the computation function is very cheap, this is (much) more
251252-- efficient than 'push'
252253{-# INLINE [1] pushCheap #-}
253−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
254255pushCheap !f e = Event $ \sub -> do
255− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
256257 { subscriberPropagate = \a -> do
257258 mb <- f a
258259 mapM_ (subscriberPropagate sub) mb
@@ -271,10 +272,10 @@ terminalSubscriber p = Subscriber
271272
272273-- | Subscribe to an Event only for the duration of one occurrence
273274{-# INLINE subscribeAndReadHead #-}
274−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)
275276subscribeAndReadHead e sub = do
276277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
277− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
278279 { subscriberPropagate = \a -> do
279280 liftIO $ unsubscribe =<< readIORef subscriptionRef
280281 subscriberPropagate sub a
@@ -285,24 +286,42 @@ subscribeAndReadHead e sub = do
285286 return (subscription, occ)
286287
287288--TODO: Make this lazy in its input event
288−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)
289290headE originalE = do
290291 parent <- liftIO $ newIORef $ Just originalE
291292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
292293 let clearParent = liftIO $ writeIORef parent Nothing
293− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
294295 when (isJust occ) clearParent
295− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
296297 liftIO (readIORef parent) >>= \case
297− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
298299 Just e -> subscribeAndReadHead e sub
299300
300301data CacheSubscribed x a
301302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
302303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
303304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
304308 }
305309
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+
306325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
307326-- repeatedly
308327--
@@ -327,18 +346,23 @@ cacheEvent e =
327346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
328347 Just subscribedTicket -> return subscribedTicket
329348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
330352 subscribers <- liftIO FastWeakBag.empty
331353 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
332357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
333− { subscriberPropagate = \a -> do
334− liftIO $ writeIORef occRef $ Just a
335− scheduleClear occRef
336− propagateFast a subscribers
337− , subscriberInvalidateHeight = \old -> do
338− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
339− , subscriberRecalculateHeight = \new -> do
340− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
341− }
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+ }
342366 when (isJust occ) $ do
343367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
344368 scheduleClear occRef
@@ -346,29 +370,45 @@ cacheEvent e =
346370 { _cacheSubscribed_subscribers = subscribers
347371 , _cacheSubscribed_parent = parentSub
348372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
349376 }
350377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
351378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
352379 return subscribedTicket
353− liftIO $ do
354− subscribed <- getFastWeakTicketValue subscribedTicket
355− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
356− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
357− let es = EventSubscription
358− { _eventSubscription_unsubscribe = do
359− FastWeakBag.remove ticket
360− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
361− when isEmpty $ do
362− writeIORef mSubscribedRef emptyFastWeak
363− unsubscribe $ _cacheSubscribed_parent subscribed
364− touch ticket
365− touch subscribedTicket
366− , _eventSubscription_subscribed = EventSubscribed
367− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
368− , eventSubscribedRetained = toAny subscribedTicket
369− }
370− }
371− 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+
372412
373413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
374414subscribe e s = fst <$> subscribeAndRead e s
@@ -380,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
380420 let es = tag subd
381421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
382422
383−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
384424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
385425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
386429eventNever :: Event x a
387−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
388431
389432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
390433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -421,16 +464,6 @@ data Subscriber x a = Subscriber
421464 , subscriberRecalculateHeight :: !(Height -> IO ())
422465 }
423466
424−--TODO: Move this comment to WeakBag
425−-- These function are constructor functions that are marked NOINLINE so they are
426−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
427−-- so any weak references that are attached to the constructors will have their
428−-- finalizer run. Using the opaque constructor, does not see the
429−-- constructor application, so it behaves like an IORef and cannot be fused away.
430−--
431−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
432−-- the weak pointer to it in some cases.
433−
434467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
435468newSubscriberHold h = return $ Subscriber
436469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -439,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
439472 }
440473
441474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
442−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
443476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
444477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
445− 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"
446479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
447480 scheduleClear $ fanSubscribedOccurrence subscribed
448481 let f _ (Pair v subsubs) = do
@@ -451,50 +484,40 @@ newSubscriberFan subscribed = return $ Subscriber
451484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
452485 return ()
453486 , subscriberInvalidateHeight = \old -> do
454− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
455487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
456488 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
457− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
458489 , subscriberRecalculateHeight = \new -> do
459− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
460490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
461491 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
462− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
463492 }
464493
465494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
466−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
467496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
468− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
469497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
470498 scheduleClear $ switchSubscribedOccurrence subscribed
471499 propagate a $ switchSubscribedSubscribers subscribed
472500 , subscriberInvalidateHeight = \_ -> do
473− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
474501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
475502 when (oldHeight /= invalidHeight) $ do
476503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
477504 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
478− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
479− , subscriberRecalculateHeight = \new -> do
480− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
481− updateSwitchHeight new subscribed
482− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
483− }
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
484507
485508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
486−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
487510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
488− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
489511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
490512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
491513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
492514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
493515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
494517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
495518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
496519 case occ of
497− Nothing -> do
520+ Nothing ->
498521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
499522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
500523 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -503,20 +526,13 @@ newSubscriberCoincidenceOuter subscribed = return $ Subscriber
503526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
504527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
505528 propagate o $ coincidenceSubscribedSubscribers subscribed
506− , subscriberInvalidateHeight = \_ -> do
507− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
508− invalidateCoincidenceHeight subscribed
509− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
510− , subscriberRecalculateHeight = \_ -> do
511− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
512− recalculateCoincidenceHeight subscribed
513− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
514531 }
515532
516533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
517−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
518535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
519− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
520536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
521537 case occ of
522538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -524,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
524540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
525541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
526542 propagate a $ coincidenceSubscribedSubscribers subscribed
527− , subscriberInvalidateHeight = \_ -> do
528− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
529− invalidateCoincidenceHeight subscribed
530− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
531− , subscriberRecalculateHeight = \_ -> do
532− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
533− recalculateCoincidenceHeight subscribed
534− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
535545 }
536546
537547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -541,15 +551,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
541551recalculateSubscriberHeight = flip subscriberRecalculateHeight
542552
543553-- | Propagate everything at the current height
544−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
545−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) $
546556 -- 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
547557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
548558 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
549559
550560-- | Propagate everything at the current height
551−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
552−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) $
553563 -- 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
554564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
555565 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -570,7 +580,7 @@ data EventSubscribed x = EventSubscribed
570580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
571581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
572582#ifdef DEBUG_CYCLES
573− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
574584 , eventSubscribedHasOwnHeightRef :: !Bool
575585 , eventSubscribedWhoCreated :: !(IO [String])
576586#endif
@@ -597,13 +607,23 @@ eventSubscribedNever = EventSubscribed
597607 , eventSubscribedWhoCreated = return ["never"]
598608#endif
599609 }
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+ }
600620
601621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
602622eventSubscribedFan !subscribed = EventSubscribed
603623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
604624 , eventSubscribedRetained = toAny subscribed
605625#ifdef DEBUG_CYCLES
606− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
607627 , eventSubscribedHasOwnHeightRef = False
608628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
609629#endif
@@ -616,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
616636#ifdef DEBUG_CYCLES
617637 , eventSubscribedGetParents = do
618638 s <- readIORef $ switchSubscribedCurrentParent subscribed
619− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
620640 , eventSubscribedHasOwnHeightRef = True
621641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
622642#endif
@@ -629,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
629649#ifdef DEBUG_CYCLES
630650 , eventSubscribedGetParents = do
631651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
632− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
633− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
634654 return $ outerParent : innerParents
635655 , eventSubscribedHasOwnHeightRef = True
636656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -644,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
644664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
645665whoCreatedEventSubscribed = eventSubscribedWhoCreated
646666
647−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
648668walkInvalidHeightParents s0 = do
649− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
650670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
651671 when (h == invalidHeight) $ do
652672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
653− modify (Some s :)
673+ modify (s :)
654674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
655− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
656676 return subscribers
657677#endif
658678
@@ -976,12 +996,8 @@ instance Monad (BehaviorM x) where
976996 return x = BehaviorM $ return x
977997#if !MIN_VERSION_base(4,13,0)
978998 {-# INLINE fail #-}
979− fail s = MonadFail.fail
980−#endif
981−
982−instance MonadFail (BehaviorM x) where
983− {-# INLINABLE fail #-}
984999 fail s = BehaviorM $ fail s
1000+#endif
9851001
9861002data BehaviorSubscribed x a
9871003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1041,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10411057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10421058
10431059-- EventM can do everything BehaviorM can, plus create holds
1044−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)
10451061
10461062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10471063
@@ -1066,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10661082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10671083
10681084heightBagAdd :: Height -> HeightBag -> HeightBag
1069−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
10701087
10711088heightBagRemove :: Height -> HeightBag -> HeightBag
10721089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1075,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10751092 0 -> IntMap.delete h c
10761093 _ -> IntMap.insert h (pred old) c
10771094
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+
10781102heightBagMax :: HeightBag -> Height
10791103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10801104 Just ((h, _), _) -> Height h
@@ -1322,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
13221346 x' <- evaluate x
13231347 mkWeakPtr x' $
13241348 if debugFinalize
1325− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13261350 else Nothing
13271351
13281352type WeakList a = [Weak a]
13291353
1330−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
13311359#ifdef DEBUG
1332−withIncreasedDepth :: CanTrace x m => m a -> m a
1333−withIncreasedDepth a = do
1334− spiderTimeline <- askSpiderTimelineEnv
1335− 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
13361385 result <- a
1337− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13381387 return result
1339−#else
1340−withIncreasedDepth :: m a -> m a
1341−withIncreasedDepth = id
1342−#endif
1343−
1344−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13451388
13461389{-# INLINE tracePropagate #-}
13471390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1348−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13491392
13501393{-# INLINE traceInvalidate #-}
13511394traceInvalidate :: String -> IO ()
1352−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
13531396
1354−{-# INLINE traceWhen #-}
1355−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1356−traceWhen p b message = traceMWhen p b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13571400
1358−{-# INLINE traceMWhen #-}
1359−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1360−traceMWhen _ b getMessage = when b $ do
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
1404+
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13611408 message <- getMessage
1362−#ifdef DEBUG
1363− spiderTimeline <- askSpiderTimelineEnv
1364− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13651412#else
1366− 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+
13671448#endif
1368− liftIO $ putStrLn $ replicate d ' ' <> message
13691449
13701450whoCreatedIORef :: IORef a -> IO [String]
13711451whoCreatedIORef (IORef a) = whoCreated $! a
13721452
1373−#ifdef DEBUG_CYCLES
13741453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13751454groupByHead = \case
13761455 [] -> []
@@ -1381,20 +1460,54 @@ groupByHead = \case
13811460 | otherwise -> (x, xs :| []) : l
13821461
13831462listsToForest :: Eq a => [[a]] -> Forest a
1384−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
1474+#endif
1475+
1476+#ifdef DEBUG_CYCLES
1477+
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1480+
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1485+
1486+#else
1487+
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1490+
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494+
13851495#endif
13861496
1497+
13871498{-# INLINE propagateSubscriberHold #-}
13881499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13891500propagateSubscriberHold h a = do
1390− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13911502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13921503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13931505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13941506 case {-# SCC "apply" #-} apply a v of
13951507 Nothing -> return ()
13961508 Just v' -> do
1397− {-# 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)
13981511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13991512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
14001513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1448,7 +1561,7 @@ getDynHold d = do
14481561zeroRef :: IORef Height
14491562zeroRef = unsafePerformIO $ newIORef zeroHeight
14501563
1451−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)
14521565getRootSubscribed k r sub = do
14531566 mSubscribed <- readIORef $ rootSubscribed r
14541567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1462,7 +1575,9 @@ getRootSubscribed k r sub = do
14621575 let !cached = rootSubscribed r
14631576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14641577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1465− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14661581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14671582 writeIORef uninitRef $! uninit
14681583#ifdef DEBUG_NODEIDS
@@ -1512,6 +1627,9 @@ data FanInt x a = FanInt
15121627 { _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
15131628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15141629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
15151633 }
15161634
15171635newFanInt :: IO (FanInt x a)
@@ -1519,10 +1637,16 @@ newFanInt = do
15191637 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
15201638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15211639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
15221643 return $ FanInt
15231644 { _fanInt_subscribers = subscribers
15241645 , _fanInt_subscriptionRef = subscriptionRef
15251646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
15261650 }
15271651
15281652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1531,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
15311655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15321656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15331657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1534− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15351660 { subscriberPropagate = \m -> do
15361661 liftIO $ writeIORef (_fanInt_occRef self) m
15371662 scheduleIntClear $ _fanInt_occRef self
1538− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1539− 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 ->
15401665 subscriberPropagate s v
1541− , subscriberInvalidateHeight = \old -> do
1542− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1543− FastWeakBag.traverse_ b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15441669 subscriberInvalidateHeight s old
1545− , subscriberRecalculateHeight = \new -> do
1546− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1547− FastWeakBag.traverse_ b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15481673 subscriberRecalculateHeight s new
15491674 }
15501675 liftIO $ do
@@ -1558,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15581683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15591684 return b
15601685 Just b -> return b
1561− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15621687 currentOcc <- readIORef (_fanInt_occRef self)
1563− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1564− 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+
15651705
15661706{-# INLINABLE getFanSubscribed #-}
15671707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1759,7 +1899,7 @@ mergeCheap
17591899 => (forall a. q a -> Event x (v a))
17601900 -> DynamicS x (PatchDMap k q)
17611901 -> Event x (DMap k v)
1762−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17631903 where
17641904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17651905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1774,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17741914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17751915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17761916 forM_ mOldSubd $ \oldSubd -> do
1777− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17781920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17791921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17801922 foldM f ([], oldParents) $ DMap.toList p
@@ -1799,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17991941 => (forall a. q a -> Event x (v a))
18001942 -> DynamicS x (PatchDMapWithMove k q)
18011943 -> Event x (DMap k v)
1802−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
18031945 where
18041946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
18051947 updateMe subscriber heightBagRef oldParents p = do
@@ -1818,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18181960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18191961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18201962 Nothing -> do
1821− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
18221966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18231967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18241968 Just toKey -> do
18251969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18261970 return Nothing
1827− 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+
18281974 return (toDelete, applyAlways p' oldParents)
18291975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18301976 getInitialSubscribers initialParents subscriber = do
@@ -1849,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18491995 -> p
18501996 -> EventM x ([EventSubscription x], DMap k s)
18511997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18522000type MergeInitFunc k v q x s
18532001 = DMap k q
18542002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1872,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18722020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18732021invalidateMergeHeight' heightRef sub = do
18742022 oldHeight <- readIORef heightRef
1875− 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
18762025 writeIORef heightRef $! invalidHeight
18772026 subscriberInvalidateHeight sub oldHeight
18782027
18792028revalidateMergeHeight :: Merge x k v s -> IO ()
18802029revalidateMergeHeight m = do
18812030 currentHeight <- readIORef $ _merge_heightRef m
1882− 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
18832034 heights <- readIORef $ _merge_heightBagRef m
18842035 parents <- readIORef $ _merge_parentsRef m
18852036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1887,7 +2038,7 @@ revalidateMergeHeight m = do
18872038 LT -> return ()
18882039 EQ -> do
18892040 let height = succHeight $ heightBagMax heights
1890− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18912042 writeIORef (_merge_heightRef m) $! height
18922043 subscriberRecalculateHeight (_merge_sub m) height
18932044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1895,36 +2046,45 @@ revalidateMergeHeight m = do
18952046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18962047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18972048 vals <- liftIO $ readIORef $ _merge_accumRef m
1898− 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
18992052 --TODO: Assert that m is not empty
19002053 subscriberPropagate (_merge_sub m) vals
19012054
1902−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1903−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
19042078 { subscriberPropagate = \a -> do
19052079 oldM <- liftIO $ readIORef $ _merge_accumRef m
19062080 k <- getKey
1907− 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
19082082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19092083 liftIO $ writeIORef (_merge_accumRef m) $! newM
19102084 when (DMap.null oldM) $ do -- Only schedule the firing once
19112085 height <- liftIO $ readIORef $ _merge_heightRef m
1912− --TODO: assertions about height
1913− currentHeight <- getCurrentHeight
1914− when (height <= currentHeight) $ do
1915− if height /= invalidHeight
1916− then do
1917− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1918− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1919− else liftIO $ do
1920−#ifdef DEBUG_CYCLES
1921− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1922− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1923− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1924−#else
1925− let cycleInfo = ""
1926−#endif
1927− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
19282088 scheduleMergeSelf m height
19292089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19302090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1935,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
19352095 }
19362096
19372097--TODO: Be able to run as much of this as possible promptly
1938−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1939−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)
19402100 where updateMe = do
19412101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1942− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19432103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19442104 return subscriptionsToKill
19452105
19462106{-# INLINE mergeGCheap' #-}
19472107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1948− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1949−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
19502110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19512111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19522112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19532113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19542114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1955− 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
19562130 { _merge_parentsRef = parentsRef
19572131 , _merge_heightBagRef = heightBagRef
19582132 , _merge_heightRef = heightRef
19592133 , _merge_sub = sub
19602134 , _merge_accumRef = accumRef
19612135 }
1962− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19632137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19642138 myHeight = if invalidHeight `elem` heights
19652139 then invalidHeight
@@ -1968,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19682142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19692143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19702144 else (Nothing, dm)
1971− unless (DMap.null accum) $ do
1972− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19732146 liftIO $ writeIORef accumRef $! accum
19742147 liftIO $ writeIORef heightRef $! myHeight
19752148 liftIO $ writeIORef heightBagRef $! myHeightBag
1976− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19772149 liftIO $ writeIORef parentsRef $! initialParentState
19782150 defer $ SomeMergeInit $ do
1979− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19802152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1981− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1982− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19832155 , subscriberInvalidateHeight = \_ -> return ()
19842156 , subscriberRecalculateHeight = \_ -> return ()
19852157 }
1986− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1987− 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
19882160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19892161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19902162 -- its subscription.
1991− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19922164 let unsubscribeAll = destroy =<< readIORef parentsRef
1993− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1994− , occ
1995− )
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
19962168
19972169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19982170mergeInt = cacheEvent . mergeIntCheap
@@ -2005,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
20052177 heightRef <- liftIO $ newIORef zeroHeight
20062178 heightBagRef <- liftIO $ newIORef heightBagEmpty
20072179 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+ }
20082190 let scheduleSelf = do
20092191 height <- liftIO $ readIORef $ heightRef
20102192 scheduleMerge' height heightRef $ do
20112193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20122194 subscriberPropagate sub vals
2013− invalidateMyHeight = do
2014− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20152196 recalculateMyHeight = do
20162197 currentHeight <- readIORef heightRef
20172198 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?
@@ -2021,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
20212202 LT -> return ()
20222203 EQ -> do
20232204 let height = succHeight $ heightBagMax heights
2024− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20252206 writeIORef heightRef $! height
20262207 subscriberRecalculateHeight sub height
20272208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20282209 mySubscriber k = Subscriber
20292210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
20302213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20312214 liftIO $ FastMutableIntMap.insert accum k a
20322215 when wasEmpty scheduleSelf
@@ -2060,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20602243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20612244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20622245 return Nothing
2063− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20642246 defer $ SomeMergeInit $ do
20652247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20662248 where
@@ -2074,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20742256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20752257 liftIO $ for_ oldParents $ \oldParent -> do
20762258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20772261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20782262 return $ IntMap.elems oldParents
2079− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20802264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20812265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20822266 defer $ updateMe a
20832267 , subscriberInvalidateHeight = \_ -> return ()
20842268 , subscriberRecalculateHeight = \_ -> return ()
20852269 }
2086− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20872271 forM_ change $ \c -> defer $ updateMe c
20882272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20892273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20902274 -- its subscription.
2091− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20922276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2093− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2094− , occ
2095− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20962280
20972281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20982282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2175,19 +2359,19 @@ runFrame a = SpiderHost $ do
21752359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21762360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21772361 writeIORef vRef v
2178− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21792363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21802364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21812365 writeIORef (eventEnvMergeUpdates env) []
2182− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21832367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2184− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21852369 toReconnect <- readIORef toReconnectRef
21862370 clearEventEnv env
21872371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21882372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21892373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2190− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21912375 finalize wi
21922376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21932377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2201,7 +2385,7 @@ runFrame a = SpiderHost $ do
22012385 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
22022386 {-
22032387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2204− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
22052389 EventRoot _ -> "EventRoot"
22062390 EventNever -> "EventNever"
22072391 _ -> "something else"
@@ -2336,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
23362520 {-# INLINABLE headE #-}
23372521 headE = R.slowHeadE
23382522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
23392525
23402526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
23412527 {-# INLINABLE sample #-}
@@ -2357,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23572543 {-# INLINABLE headE #-}
23582544 headE = R.slowHeadE
23592545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23602549
23612550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23622551 {-# INLINE return #-}
@@ -2420,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24202609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
24212610 {-# INLINABLE headE #-}
24222611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
24232615
24242616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
24252617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2436,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24362628 {-# INLINABLE headE #-}
24372629 headE = R.slowHeadE
24382630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
24392633
24402634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
24412635 {-# INLINABLE sample #-}
@@ -2456,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24562650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24572651 {-# INLINABLE headE #-}
24582652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24592655
24602656--------------------------------------------------------------------------------
24612657-- Deprecated items
@@ -2493,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24932689 touch h
24942690 return result
24952691
2496−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24972693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24982694 newFanEventWithTrigger f = SpiderHost $ do
24992695 es <- newFanEventWithTriggerIO f
25002696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
25012697
2502−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
25032699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
25042700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
25052701 es <- newFanEventWithTriggerIO f
@@ -2579,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25792775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25802776 {-# INLINABLE mergeG #-}
25812777 mergeG
2582− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25832779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25842780 -> DMap k q
25852781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2649,12 +2845,12 @@ instance Monad (SpiderHost x) where
26492845 return x = SpiderHost $ return x
26502846#if !MIN_VERSION_base(4,13,0)
26512847 {-# INLINABLE fail #-}
2652− fail s = MonadFail.fail
2848+ fail = MonadFail.fail
26532849#endif
26542850
26552851instance MonadFail (SpiderHost x) where
26562852 {-# INLINABLE fail #-}
2657− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
26582854
26592855-- | Run an action affecting the global Spider timeline; this will be guarded by
26602856-- a mutex for that timeline
@@ -2677,24 +2873,20 @@ instance Monad (SpiderHostFrame x) where
26772873 {-# INLINABLE return #-}
26782874 return x = SpiderHostFrame $ return x
26792875#if !MIN_VERSION_base(4,13,0)
2680− {-# INLINABLE fail #-}
2681− fail s = MonadFail.fail
2682−#endif
2683−
2684−instance MonadFail (SpiderHostFrame x) where
26852876 {-# INLINABLE fail #-}
26862877 fail s = SpiderHostFrame $ fail s
2878+#endif
26872879
26882880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26892881 notReadyUntil _ = pure ()
26902882 notReady = pure ()
26912883
2692−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)
26932885newEventWithTriggerIO f = do
26942886 es <- newFanEventWithTriggerIO $ \Refl -> f
26952887 return $ select es Refl
26962888
2697−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)
26982890newFanEventWithTriggerIO f = do
26992891 occRef <- newIORef DMap.empty
27002892 subscribedRef <- newIORef DMap.empty