@@ -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,15 +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)
46+import qualified Control.Monad.Fail as MonadFail
4647import Data.Align
4748import Data.Coerce
48−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4950import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
5052import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5153import qualified Data.FastMutableIntMap as FastMutableIntMap
5254import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
5961import Data.IORef
6062import Data.Kind (Type)
6163import Data.Maybe hiding (mapMaybe)
62−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
6365import Data.Proxy
6466import Data.These
6567import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
6669import Data.Witherable (Filterable, mapMaybe)
67−import GHC.Exts
70+import GHC.Exts hiding (toList)
6871import GHC.IORef (IORef (..))
6972import GHC.Stack
7073import Reflex.FastWeak
@@ -83,14 +86,16 @@ import Data.Zip (Zip (..))
8386
8487#ifdef DEBUG_CYCLES
8588import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
8691import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
8792import qualified Data.List.NonEmpty as NonEmpty
88−import Data.Monoid (mempty)
8993import Data.Tree (Forest, Tree (..), drawForest)
90−#endif
94+import Data.List (isPrefixOf)
9195
92−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9397import qualified Data.FastWeakBag as FastWeakBag
98+
9499import Data.Reflection
95100import Data.Some (Some(Some))
96101import Data.Type.Coercion
@@ -101,20 +106,26 @@ import qualified Reflex.Class
101106import qualified Reflex.Class as R
102107import qualified Reflex.Host.Class
103108import Reflex.NotReady.Class
104−import Reflex.Patch
105−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
106112
107113#ifdef DEBUG_TRACE_EVENTS
108114import qualified Data.ByteString.Char8 as BS8
109115import System.IO (stderr)
116+import Data.List (isPrefixOf)
110117#endif
111118
112−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
113122
123+#ifdef DEBUG_TRACE_EVENTS
114124withStackOneLine :: (BS8.ByteString -> a) -> a
115125withStackOneLine expr = unsafePerformIO $ do
116126 stack <- currentCallStack
117− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
118129
119130#endif
120131
@@ -125,28 +136,42 @@ debugInvalidateHeight :: Bool
125136debugInvalidate :: Bool
126137
127138#ifdef DEBUG
128−
129139#define DEBUG_NODEIDS
130140
141+#ifdef DEBUG_TRACE_PROPAGATION
131142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
132146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
133150debugInvalidateHeight = False
151+#endif
134152
153+#ifdef DEBUG_TRACE_INVALIDATION
135154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
136158
137159class HasNodeId a where
138160 getNodeId :: a -> Int
139161
140−instance HasNodeId (Hold x p a) where
141− 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
142167
143−instance HasNodeId (PushSubscribed x a b) where
144− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
145170
146171instance HasNodeId (SwitchSubscribed x a) where
147172 getNodeId = switchSubscribedNodeId
148173
149−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
150175 getNodeId = fanSubscribedNodeId
151176
152177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -160,41 +185,16 @@ instance HasNodeId (Pull x a) where
160185
161186{-# INLINE showNodeId #-}
162187showNodeId :: HasNodeId a => a -> String
163−showNodeId = ("#"<>) . show . getNodeId
164−
165−showSubscriberType :: Subscriber x a -> String
166−showSubscriberType = \case
167− SubscriberPush _ _ -> "SubscriberPush"
168− SubscriberMerge _ _ -> "SubscriberMerge"
169− SubscriberFan _ -> "SubscriberFan"
170− SubscriberMergeChange _ -> "SubscriberMergeChange"
171− SubscriberHold _ -> "SubscriberHold"
172− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
173− SubscriberSwitch _ -> "SubscriberSwitch"
174− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
175− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
176− SubscriberHandle -> "SubscriberHandle"
177−
178−showEventType :: Event x a -> String
179−showEventType = \case
180− EventRoot _ _ -> "EventRoot"
181− EventNever -> "EventNever"
182− EventPush _ -> "EventPush"
183− EventMerge _ -> "EventMerge"
184− EventFan _ _ -> "EventFan"
185− EventSwitch _ -> "EventSwitch"
186− EventCoincidence _ -> "EventCoincidence"
187− EventHold _ -> "EventHold"
188− EventDyn _ -> "EventDyn"
189− EventHoldIdentity _ -> "EventHoldIdentity"
190− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
191193
192194#else
193195
194196debugPropagate = False
195−
196197debugInvalidateHeight = False
197−
198198debugInvalidate = False
199199
200200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,6 +202,10 @@ debugInvalidate = False
202202showNodeId :: a -> String
203203showNodeId _ = ""
204204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
205209#endif
206210
207211#ifdef DEBUG_NODEIDS
@@ -247,9 +251,9 @@ subscribeAndRead = unEvent
247251-- caching; if the computation function is very cheap, this is (much) more
248252-- efficient than 'push'
249253{-# INLINE [1] pushCheap #-}
250−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
251255pushCheap !f e = Event $ \sub -> do
252− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
253257 { subscriberPropagate = \a -> do
254258 mb <- f a
255259 mapM_ (subscriberPropagate sub) mb
@@ -268,10 +272,10 @@ terminalSubscriber p = Subscriber
268272
269273-- | Subscribe to an Event only for the duration of one occurrence
270274{-# INLINE subscribeAndReadHead #-}
271−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)
272276subscribeAndReadHead e sub = do
273277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
274− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
275279 { subscriberPropagate = \a -> do
276280 liftIO $ unsubscribe =<< readIORef subscriptionRef
277281 subscriberPropagate sub a
@@ -282,24 +286,42 @@ subscribeAndReadHead e sub = do
282286 return (subscription, occ)
283287
284288--TODO: Make this lazy in its input event
285−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)
286290headE originalE = do
287291 parent <- liftIO $ newIORef $ Just originalE
288292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
289293 let clearParent = liftIO $ writeIORef parent Nothing
290− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
291295 when (isJust occ) clearParent
292− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
293297 liftIO (readIORef parent) >>= \case
294− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
295299 Just e -> subscribeAndReadHead e sub
296300
297301data CacheSubscribed x a
298302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
299303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
300304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
301308 }
302309
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+
303325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
304326-- repeatedly
305327--
@@ -324,18 +346,23 @@ cacheEvent e =
324346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
325347 Just subscribedTicket -> return subscribedTicket
326348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
327352 subscribers <- liftIO FastWeakBag.empty
328353 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
329357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
330− { subscriberPropagate = \a -> do
331− liftIO $ writeIORef occRef $ Just a
332− scheduleClear occRef
333− propagateFast a subscribers
334− , subscriberInvalidateHeight = \old -> do
335− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
336− , subscriberRecalculateHeight = \new -> do
337− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
338− }
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+ }
339366 when (isJust occ) $ do
340367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
341368 scheduleClear occRef
@@ -343,29 +370,45 @@ cacheEvent e =
343370 { _cacheSubscribed_subscribers = subscribers
344371 , _cacheSubscribed_parent = parentSub
345372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
346376 }
347377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
348378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
349379 return subscribedTicket
350− liftIO $ do
351− subscribed <- getFastWeakTicketValue subscribedTicket
352− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
353− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
354− let es = EventSubscription
355− { _eventSubscription_unsubscribe = do
356− FastWeakBag.remove ticket
357− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
358− when isEmpty $ do
359− writeIORef mSubscribedRef emptyFastWeak
360− unsubscribe $ _cacheSubscribed_parent subscribed
361− touch ticket
362− touch subscribedTicket
363− , _eventSubscription_subscribed = EventSubscribed
364− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
365− , eventSubscribedRetained = toAny subscribedTicket
366− }
367− }
368− return (es, occ)
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+
369412
370413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
371414subscribe e s = fst <$> subscribeAndRead e s
@@ -377,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
377420 let es = tag subd
378421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
379422
380−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
381424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
382425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
383429eventNever :: Event x a
384−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
385431
386432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
387433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -418,16 +464,6 @@ data Subscriber x a = Subscriber
418464 , subscriberRecalculateHeight :: !(Height -> IO ())
419465 }
420466
421−--TODO: Move this comment to WeakBag
422−-- These function are constructor functions that are marked NOINLINE so they are
423−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
424−-- so any weak references that are attached to the constructors will have their
425−-- finalizer run. Using the opaque constructor, does not see the
426−-- constructor application, so it behaves like an IORef and cannot be fused away.
427−--
428−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
429−-- the weak pointer to it in some cases.
430−
431467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
432468newSubscriberHold h = return $ Subscriber
433469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -436,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
436472 }
437473
438474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
439−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
440476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
441477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
442− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
443479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
444480 scheduleClear $ fanSubscribedOccurrence subscribed
445481 let f _ (Pair v subsubs) = do
@@ -448,50 +484,40 @@ newSubscriberFan subscribed = return $ Subscriber
448484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
449485 return ()
450486 , subscriberInvalidateHeight = \old -> do
451− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
452487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
453488 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
454− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
455489 , subscriberRecalculateHeight = \new -> do
456− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
457490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
458491 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
459− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
460492 }
461493
462494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
463−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
464496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
465− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
466497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
467498 scheduleClear $ switchSubscribedOccurrence subscribed
468499 propagate a $ switchSubscribedSubscribers subscribed
469500 , subscriberInvalidateHeight = \_ -> do
470− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
471501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
472502 when (oldHeight /= invalidHeight) $ do
473503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
474504 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
475− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
476− , subscriberRecalculateHeight = \new -> do
477− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
478− updateSwitchHeight new subscribed
479− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
480− }
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
481507
482508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
483−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
484510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
485− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
486511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
487512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
488513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
489514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
490515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
491517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
492518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
493519 case occ of
494− Nothing -> do
520+ Nothing ->
495521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
496522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
497523 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -500,20 +526,13 @@ newSubscriberCoincidenceOuter subscribed = return $ Subscriber
500526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
501527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
502528 propagate o $ coincidenceSubscribedSubscribers subscribed
503− , subscriberInvalidateHeight = \_ -> do
504− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
505− invalidateCoincidenceHeight subscribed
506− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
507− , subscriberRecalculateHeight = \_ -> do
508− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
509− recalculateCoincidenceHeight subscribed
510− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
511531 }
512532
513533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
514−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
515535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
516− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
517536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
518537 case occ of
519538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -521,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
521540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
522541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
523542 propagate a $ coincidenceSubscribedSubscribers subscribed
524− , subscriberInvalidateHeight = \_ -> do
525− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
526− invalidateCoincidenceHeight subscribed
527− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
528− , subscriberRecalculateHeight = \_ -> do
529− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
530− recalculateCoincidenceHeight subscribed
531− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
532545 }
533546
534547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -538,15 +551,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
538551recalculateSubscriberHeight = flip subscriberRecalculateHeight
539552
540553-- | Propagate everything at the current height
541−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
542−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) $
543556 -- 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
544557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
545558 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
546559
547560-- | Propagate everything at the current height
548−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
549−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) $
550563 -- 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
551564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
552565 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -567,7 +580,7 @@ data EventSubscribed x = EventSubscribed
567580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
568581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
569582#ifdef DEBUG_CYCLES
570− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
571584 , eventSubscribedHasOwnHeightRef :: !Bool
572585 , eventSubscribedWhoCreated :: !(IO [String])
573586#endif
@@ -594,13 +607,23 @@ eventSubscribedNever = EventSubscribed
594607 , eventSubscribedWhoCreated = return ["never"]
595608#endif
596609 }
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+ }
597620
598621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
599622eventSubscribedFan !subscribed = EventSubscribed
600623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
601624 , eventSubscribedRetained = toAny subscribed
602625#ifdef DEBUG_CYCLES
603− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
604627 , eventSubscribedHasOwnHeightRef = False
605628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
606629#endif
@@ -613,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
613636#ifdef DEBUG_CYCLES
614637 , eventSubscribedGetParents = do
615638 s <- readIORef $ switchSubscribedCurrentParent subscribed
616− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
617640 , eventSubscribedHasOwnHeightRef = True
618641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
619642#endif
@@ -626,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
626649#ifdef DEBUG_CYCLES
627650 , eventSubscribedGetParents = do
628651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
629− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
630− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
631654 return $ outerParent : innerParents
632655 , eventSubscribedHasOwnHeightRef = True
633656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -641,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
641664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
642665whoCreatedEventSubscribed = eventSubscribedWhoCreated
643666
644−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
645668walkInvalidHeightParents s0 = do
646− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
647670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
648671 when (h == invalidHeight) $ do
649672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
650− modify (Some s :)
673+ modify (s :)
651674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
652− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
653676 return subscribers
654677#endif
655678
@@ -971,8 +994,10 @@ instance Monad (BehaviorM x) where
971994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
972995 {-# INLINE return #-}
973996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
974998 {-# INLINE fail #-}
975999 fail s = BehaviorM $ fail s
1000+#endif
9761001
9771002data BehaviorSubscribed x a
9781003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1032,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10321057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10331058
10341059-- EventM can do everything BehaviorM can, plus create holds
1035−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10361061
10371062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10381063
@@ -1057,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10571082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10581083
10591084heightBagAdd :: Height -> HeightBag -> HeightBag
1060−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
10611087
10621088heightBagRemove :: Height -> HeightBag -> HeightBag
10631089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1066,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10661092 0 -> IntMap.delete h c
10671093 _ -> IntMap.insert h (pred old) c
10681094
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+
10691102heightBagMax :: HeightBag -> Height
10701103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10711104 Just ((h, _), _) -> Height h
@@ -1313,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
13131346 x' <- evaluate x
13141347 mkWeakPtr x' $
13151348 if debugFinalize
1316− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13171350 else Nothing
13181351
13191352type WeakList a = [Weak a]
13201353
1321−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
13221359#ifdef DEBUG
1323−withIncreasedDepth :: CanTrace x m => m a -> m a
1324−withIncreasedDepth a = do
1325− spiderTimeline <- askSpiderTimelineEnv
1326− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
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
13271385 result <- a
1328− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13291387 return result
1330−#else
1331−withIncreasedDepth :: m a -> m a
1332−withIncreasedDepth = id
1333−#endif
1334−
1335−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13361388
13371389{-# INLINE tracePropagate #-}
13381390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1339−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13401392
13411393{-# INLINE traceInvalidate #-}
13421394traceInvalidate :: String -> IO ()
1343−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
13441396
1345−{-# INLINE traceWhen #-}
1346−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1347−traceWhen p b message = traceMWhen p b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13481400
1349−{-# INLINE traceMWhen #-}
1350−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1351−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
13521408 message <- getMessage
1353−#ifdef DEBUG
1354− spiderTimeline <- askSpiderTimelineEnv
1355− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13561412#else
1357− 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+
13581448#endif
1359− liftIO $ putStrLn $ replicate d ' ' <> message
13601449
13611450whoCreatedIORef :: IORef a -> IO [String]
13621451whoCreatedIORef (IORef a) = whoCreated $! a
13631452
1364−#ifdef DEBUG_CYCLES
13651453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13661454groupByHead = \case
13671455 [] -> []
@@ -1372,20 +1460,54 @@ groupByHead = \case
13721460 | otherwise -> (x, xs :| []) : l
13731461
13741462listsToForest :: Eq a => [[a]] -> Forest a
1375−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+
13761495#endif
13771496
1497+
13781498{-# INLINE propagateSubscriberHold #-}
13791499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13801500propagateSubscriberHold h a = do
1381− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13821502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13831503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13841505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13851506 case {-# SCC "apply" #-} apply a v of
13861507 Nothing -> return ()
13871508 Just v' -> do
1388− {-# 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)
13891511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13901512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13911513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1439,7 +1561,7 @@ getDynHold d = do
14391561zeroRef :: IORef Height
14401562zeroRef = unsafePerformIO $ newIORef zeroHeight
14411563
1442−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)
14431565getRootSubscribed k r sub = do
14441566 mSubscribed <- readIORef $ rootSubscribed r
14451567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1453,7 +1575,9 @@ getRootSubscribed k r sub = do
14531575 let !cached = rootSubscribed r
14541576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14551577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1456− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14571581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14581582 writeIORef uninitRef $! uninit
14591583#ifdef DEBUG_NODEIDS
@@ -1503,6 +1627,9 @@ data FanInt x a = FanInt
15031627 { _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
15041628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15051629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
15061633 }
15071634
15081635newFanInt :: IO (FanInt x a)
@@ -1510,10 +1637,16 @@ newFanInt = do
15101637 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
15111638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15121639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
15131643 return $ FanInt
15141644 { _fanInt_subscribers = subscribers
15151645 , _fanInt_subscriptionRef = subscriptionRef
15161646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
15171650 }
15181651
15191652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1522,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
15221655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15231656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15241657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1525− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15261660 { subscriberPropagate = \m -> do
15271661 liftIO $ writeIORef (_fanInt_occRef self) m
15281662 scheduleIntClear $ _fanInt_occRef self
1529− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1530− FastWeakBag.traverse_ b $ \s -> do
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 ->
15311665 subscriberPropagate s v
1532− , subscriberInvalidateHeight = \old -> do
1533− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1534− FastWeakBag.traverse_ b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15351669 subscriberInvalidateHeight s old
1536− , subscriberRecalculateHeight = \new -> do
1537− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1538− FastWeakBag.traverse_ b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15391673 subscriberRecalculateHeight s new
15401674 }
15411675 liftIO $ do
@@ -1549,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15491683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15501684 return b
15511685 Just b -> return b
1552− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15531687 currentOcc <- readIORef (_fanInt_occRef self)
1554− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1555− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
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+
15561705
15571706{-# INLINABLE getFanSubscribed #-}
15581707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1750,7 +1899,7 @@ mergeCheap
17501899 => (forall a. q a -> Event x (v a))
17511900 -> DynamicS x (PatchDMap k q)
17521901 -> Event x (DMap k v)
1753−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17541903 where
17551904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17561905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1765,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17651914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17661915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17671916 forM_ mOldSubd $ \oldSubd -> do
1768− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17691920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17701921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17711922 foldM f ([], oldParents) $ DMap.toList p
@@ -1790,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17901941 => (forall a. q a -> Event x (v a))
17911942 -> DynamicS x (PatchDMapWithMove k q)
17921943 -> Event x (DMap k v)
1793−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17941945 where
17951946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17961947 updateMe subscriber heightBagRef oldParents p = do
@@ -1809,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18091960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18101961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18111962 Nothing -> do
1812− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
18131966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18141967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18151968 Just toKey -> do
18161969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18171970 return Nothing
1818− 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+
18191974 return (toDelete, applyAlways p' oldParents)
18201975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18211976 getInitialSubscribers initialParents subscriber = do
@@ -1840,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18401995 -> p
18411996 -> EventM x ([EventSubscription x], DMap k s)
18421997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18432000type MergeInitFunc k v q x s
18442001 = DMap k q
18452002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1863,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18632020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18642021invalidateMergeHeight' heightRef sub = do
18652022 oldHeight <- readIORef heightRef
1866− when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
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
18672025 writeIORef heightRef $! invalidHeight
18682026 subscriberInvalidateHeight sub oldHeight
18692027
18702028revalidateMergeHeight :: Merge x k v s -> IO ()
18712029revalidateMergeHeight m = do
18722030 currentHeight <- readIORef $ _merge_heightRef m
1873− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
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
18742034 heights <- readIORef $ _merge_heightBagRef m
18752035 parents <- readIORef $ _merge_parentsRef m
18762036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1878,7 +2038,7 @@ revalidateMergeHeight m = do
18782038 LT -> return ()
18792039 EQ -> do
18802040 let height = succHeight $ heightBagMax heights
1881− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18822042 writeIORef (_merge_heightRef m) $! height
18832043 subscriberRecalculateHeight (_merge_sub m) height
18842044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1886,36 +2046,45 @@ revalidateMergeHeight m = do
18862046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18872047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18882048 vals <- liftIO $ readIORef $ _merge_accumRef m
1889− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
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
18902052 --TODO: Assert that m is not empty
18912053 subscriberPropagate (_merge_sub m) vals
18922054
1893−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1894−mergeSubscriber m getKey = Subscriber
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
18952078 { subscriberPropagate = \a -> do
18962079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18972080 k <- getKey
1898− 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
18992082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19002083 liftIO $ writeIORef (_merge_accumRef m) $! newM
19012084 when (DMap.null oldM) $ do -- Only schedule the firing once
19022085 height <- liftIO $ readIORef $ _merge_heightRef m
1903− --TODO: assertions about height
1904− currentHeight <- getCurrentHeight
1905− when (height <= currentHeight) $ do
1906− if height /= invalidHeight
1907− then do
1908− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1909− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1910− else liftIO $ do
1911−#ifdef DEBUG_CYCLES
1912− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1913− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1914− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1915−#else
1916− let cycleInfo = ""
1917−#endif
1918− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
19192088 scheduleMergeSelf m height
19202089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19212090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1926,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
19262095 }
19272096
19282097--TODO: Be able to run as much of this as possible promptly
1929−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1930−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
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)
19312100 where updateMe = do
19322101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1933− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19342103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19352104 return subscriptionsToKill
19362105
19372106{-# INLINE mergeGCheap' #-}
19382107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1939− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1940−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
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
19412110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19422111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19432112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19442113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19452114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1946− 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
19472130 { _merge_parentsRef = parentsRef
19482131 , _merge_heightBagRef = heightBagRef
19492132 , _merge_heightRef = heightRef
19502133 , _merge_sub = sub
19512134 , _merge_accumRef = accumRef
19522135 }
1953− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19542137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19552138 myHeight = if invalidHeight `elem` heights
19562139 then invalidHeight
@@ -1959,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19592142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19602143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19612144 else (Nothing, dm)
1962− unless (DMap.null accum) $ do
1963− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19642146 liftIO $ writeIORef accumRef $! accum
19652147 liftIO $ writeIORef heightRef $! myHeight
19662148 liftIO $ writeIORef heightBagRef $! myHeightBag
1967− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19682149 liftIO $ writeIORef parentsRef $! initialParentState
19692150 defer $ SomeMergeInit $ do
1970− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19712152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1972− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1973− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19742155 , subscriberInvalidateHeight = \_ -> return ()
19752156 , subscriberRecalculateHeight = \_ -> return ()
19762157 }
1977− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1978− 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
19792160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19802161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19812162 -- its subscription.
1982− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19832164 let unsubscribeAll = destroy =<< readIORef parentsRef
1984− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1985− , occ
1986− )
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
19872168
19882169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19892170mergeInt = cacheEvent . mergeIntCheap
@@ -1996,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
19962177 heightRef <- liftIO $ newIORef zeroHeight
19972178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19982179 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+ }
19992190 let scheduleSelf = do
20002191 height <- liftIO $ readIORef $ heightRef
20012192 scheduleMerge' height heightRef $ do
20022193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20032194 subscriberPropagate sub vals
2004− invalidateMyHeight = do
2005− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20062196 recalculateMyHeight = do
20072197 currentHeight <- readIORef heightRef
20082198 when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
@@ -2012,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
20122202 LT -> return ()
20132203 EQ -> do
20142204 let height = succHeight $ heightBagMax heights
2015− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20162206 writeIORef heightRef $! height
20172207 subscriberRecalculateHeight sub height
20182208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20192209 mySubscriber k = Subscriber
20202210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
20212213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20222214 liftIO $ FastMutableIntMap.insert accum k a
20232215 when wasEmpty scheduleSelf
@@ -2051,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20512243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20522244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20532245 return Nothing
2054− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20552246 defer $ SomeMergeInit $ do
20562247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20572248 where
@@ -2065,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20652256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20662257 liftIO $ for_ oldParents $ \oldParent -> do
20672258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20682261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20692262 return $ IntMap.elems oldParents
2070− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20712264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20722265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20732266 defer $ updateMe a
20742267 , subscriberInvalidateHeight = \_ -> return ()
20752268 , subscriberRecalculateHeight = \_ -> return ()
20762269 }
2077− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20782271 forM_ change $ \c -> defer $ updateMe c
20792272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20802273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20812274 -- its subscription.
2082− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20832276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2084− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2085− , occ
2086− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20872280
20882281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20892282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2166,19 +2359,19 @@ runFrame a = SpiderHost $ do
21662359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21672360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21682361 writeIORef vRef v
2169− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21702363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21712364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21722365 writeIORef (eventEnvMergeUpdates env) []
2173− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21742367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2175− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21762369 toReconnect <- readIORef toReconnectRef
21772370 clearEventEnv env
21782371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21792372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21802373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2181− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21822375 finalize wi
21832376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21842377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2192,7 +2385,7 @@ runFrame a = SpiderHost $ do
21922385 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
21932386 {-
21942387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2195− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21962389 EventRoot _ -> "EventRoot"
21972390 EventNever -> "EventNever"
21982391 _ -> "something else"
@@ -2327,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
23272520 {-# INLINABLE headE #-}
23282521 headE = R.slowHeadE
23292522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
23302525
23312526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
23322527 {-# INLINABLE sample #-}
@@ -2348,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23482543 {-# INLINABLE headE #-}
23492544 headE = R.slowHeadE
23502545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23512549
23522550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23532551 {-# INLINE return #-}
@@ -2356,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23562554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23572555 {-# INLINE (>>) #-}
23582556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
23592558 {-# INLINE fail #-}
23602559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23612561
23622562{-# INLINABLE newJoinDyn #-}
23632563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2409,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24092609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
24102610 {-# INLINABLE headE #-}
24112611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
24122615
24132616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
24142617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2425,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24252628 {-# INLINABLE headE #-}
24262629 headE = R.slowHeadE
24272630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
24282633
24292634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
24302635 {-# INLINABLE sample #-}
@@ -2445,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24452650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24462651 {-# INLINABLE headE #-}
24472652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24482655
24492656--------------------------------------------------------------------------------
24502657-- Deprecated items
@@ -2482,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24822689 touch h
24832690 return result
24842691
2485−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24862693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24872694 newFanEventWithTrigger f = SpiderHost $ do
24882695 es <- newFanEventWithTriggerIO f
24892696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24902697
2491−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24922699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24932700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24942701 es <- newFanEventWithTriggerIO f
@@ -2568,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25682775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25692776 {-# INLINABLE mergeG #-}
25702777 mergeG
2571− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25722779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25732780 -> DMap k q
25742781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2636,8 +2843,14 @@ instance Monad (SpiderHost x) where
26362843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
26372844 {-# INLINABLE return #-}
26382845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
2847+ {-# INLINABLE fail #-}
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
26392852 {-# INLINABLE fail #-}
2640− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
26412854
26422855-- | Run an action affecting the global Spider timeline; this will be guarded by
26432856-- a mutex for that timeline
@@ -2659,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
26592872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26602873 {-# INLINABLE return #-}
26612874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
26622876 {-# INLINABLE fail #-}
26632877 fail s = SpiderHostFrame $ fail s
2878+#endif
26642879
26652880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26662881 notReadyUntil _ = pure ()
26672882 notReady = pure ()
26682883
2669−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)
26702885newEventWithTriggerIO f = do
26712886 es <- newFanEventWithTriggerIO $ \Refl -> f
26722887 return $ select es Refl
26732888
2674−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)
26752890newFanEventWithTriggerIO f = do
26762891 occRef <- newIORef DMap.empty
26772892 subscribedRef <- newIORef DMap.empty
@@ -2705,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
27052920instance PrimMonad (SpiderHostFrame x) where
27062921 type PrimState (SpiderHostFrame x) = PrimState IO
27072922 primitive = SpiderHostFrame . EventM . primitive
2923+
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
2927+
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()