@@ -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
@@ -61,13 +60,13 @@ import qualified Data.IntMap.Strict as IntMap
6160import Data.IORef
6261import Data.Kind (Type)
6362import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid ((<>))
63+import Data.Monoid (mempty, (<>))
6564import Data.Proxy
6665import Data.These
6766import Data.Traversable
6867import Data.Type.Equality ((:~:)(Refl))
6968import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts
69+import GHC.Exts hiding (toList)
7170import GHC.IORef (IORef (..))
7271import GHC.Stack
7372import Reflex.FastWeak
@@ -86,14 +85,16 @@ import Data.Zip (Zip (..))
8685
8786#ifdef DEBUG_CYCLES
8887import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88+#endif
89+
8990import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9091import qualified Data.List.NonEmpty as NonEmpty
91−import Data.Monoid (mempty)
9292import Data.Tree (Forest, Tree (..), drawForest)
93−#endif
93+import Data.List (isPrefixOf)
9494
95−import Data.FastWeakBag (FastWeakBag)
95+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
9696import qualified Data.FastWeakBag as FastWeakBag
97+
9798import Data.Reflection
9899import Data.Some (Some(Some))
99100import Data.Type.Coercion
@@ -104,21 +105,26 @@ import qualified Reflex.Class
104105import qualified Reflex.Class as R
105106import qualified Reflex.Host.Class
106107import Reflex.NotReady.Class
107−import Reflex.Patch
108−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
108+import Data.Patch
109+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
109110import Reflex.PerformEvent.Base (PerformEventT)
110111
111112#ifdef DEBUG_TRACE_EVENTS
112113import qualified Data.ByteString.Char8 as BS8
113114import System.IO (stderr)
115+import Data.List (isPrefixOf)
114116#endif
115117
116−#ifdef DEBUG_TRACE_EVENTS
118+-- TODO stdout might not be the best channel for debug output
119+debugStrLn :: String -> IO ()
120+debugStrLn = putStrLn
117121
122+#ifdef DEBUG_TRACE_EVENTS
118123withStackOneLine :: (BS8.ByteString -> a) -> a
119124withStackOneLine expr = unsafePerformIO $ do
120125 stack <- currentCallStack
121− return (expr (BS8.pack (unwords (reverse stack))))
126+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
127+ where dropInternal = filterStack "Reflex.Spider.Internal"
122128
123129#endif
124130
@@ -129,28 +135,42 @@ debugInvalidateHeight :: Bool
129135debugInvalidate :: Bool
130136
131137#ifdef DEBUG
132−
133138#define DEBUG_NODEIDS
134139
140+#ifdef DEBUG_TRACE_PROPAGATION
135141debugPropagate = True
142+#else
143+debugPropagate = False
144+#endif
136145
146+#ifdef DEBUG_TRACE_HEIGHT
147+debugInvalidateHeight = True
148+#else
137149debugInvalidateHeight = False
150+#endif
138151
152+#ifdef DEBUG_TRACE_INVALIDATION
139153debugInvalidate = True
154+#else
155+debugInvalidate = False
156+#endif
140157
141158class HasNodeId a where
142159 getNodeId :: a -> Int
143160
144−instance HasNodeId (Hold x p a) where
145− getNodeId = holdNodeId
161+instance HasNodeId (CacheSubscribed x a) where
162+ getNodeId = _cacheSubscribed_nodeId
163+
164+instance HasNodeId (FanInt x a) where
165+ getNodeId = _fanInt_nodeId
146166
147−instance HasNodeId (PushSubscribed x a b) where
148− getNodeId = pushSubscribedNodeId
167+instance HasNodeId (Hold x p) where
168+ getNodeId = holdNodeId
149169
150170instance HasNodeId (SwitchSubscribed x a) where
151171 getNodeId = switchSubscribedNodeId
152172
153−instance HasNodeId (FanSubscribed x a) where
173+instance HasNodeId (FanSubscribed x v a) where
154174 getNodeId = fanSubscribedNodeId
155175
156176instance HasNodeId (CoincidenceSubscribed x a) where
@@ -164,41 +184,16 @@ instance HasNodeId (Pull x a) where
164184
165185{-# INLINE showNodeId #-}
166186showNodeId :: HasNodeId a => a -> String
167−showNodeId = ("#"<>) . show . getNodeId
168−
169−showSubscriberType :: Subscriber x a -> String
170−showSubscriberType = \case
171− SubscriberPush _ _ -> "SubscriberPush"
172− SubscriberMerge _ _ -> "SubscriberMerge"
173− SubscriberFan _ -> "SubscriberFan"
174− SubscriberMergeChange _ -> "SubscriberMergeChange"
175− SubscriberHold _ -> "SubscriberHold"
176− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
177− SubscriberSwitch _ -> "SubscriberSwitch"
178− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
179− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
180− SubscriberHandle -> "SubscriberHandle"
181−
182−showEventType :: Event x a -> String
183−showEventType = \case
184− EventRoot _ _ -> "EventRoot"
185− EventNever -> "EventNever"
186− EventPush _ -> "EventPush"
187− EventMerge _ -> "EventMerge"
188− EventFan _ _ -> "EventFan"
189− EventSwitch _ -> "EventSwitch"
190− EventCoincidence _ -> "EventCoincidence"
191− EventHold _ -> "EventHold"
192− EventDyn _ -> "EventDyn"
193− EventHoldIdentity _ -> "EventHoldIdentity"
194− EventDynIdentity _ -> "EventDynIdentity"
187+showNodeId = showNodeId' . getNodeId
188+
189+showNodeId' :: Int -> String
190+showNodeId' = ("#"<>) . show
191+
195192
196193#else
197194
198195debugPropagate = False
199−
200196debugInvalidateHeight = False
201−
202197debugInvalidate = False
203198
204199-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -206,6 +201,10 @@ debugInvalidate = False
206201showNodeId :: a -> String
207202showNodeId _ = ""
208203
204+{-# INLINE showNodeId' #-}
205+showNodeId' :: Int -> String
206+showNodeId' _ = ""
207+
209208#endif
210209
211210#ifdef DEBUG_NODEIDS
@@ -251,9 +250,9 @@ subscribeAndRead = unEvent
251250-- caching; if the computation function is very cheap, this is (much) more
252251-- efficient than 'push'
253252{-# INLINE [1] pushCheap #-}
254−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
253+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255254pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ sub
255+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
257256 { subscriberPropagate = \a -> do
258257 mb <- f a
259258 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +271,10 @@ terminalSubscriber p = Subscriber
272271
273272-- | Subscribe to an Event only for the duration of one occurrence
274273{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
274+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276275subscribeAndReadHead e sub = do
277276 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ sub
277+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279278 { subscriberPropagate = \a -> do
280279 liftIO $ unsubscribe =<< readIORef subscriptionRef
281280 subscriberPropagate sub a
@@ -286,24 +285,29 @@ subscribeAndReadHead e sub = do
286285 return (subscription, occ)
287286
288287--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
288+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
290289headE originalE = do
291290 parent <- liftIO $ newIORef $ Just originalE
292291 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293292 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
293+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295294 when (isJust occ) clearParent
296− return $ Event $ \sub -> do
295+ return $ Event $ \sub ->
297296 liftIO (readIORef parent) >>= \case
298− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
297+ Nothing -> subscribeAndReadNever
299298 Just e -> subscribeAndReadHead e sub
300299
301300data CacheSubscribed x a
302301 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303302 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304303 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
304+#ifdef DEBUG_NODEIDS
305+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
306+#endif
305307 }
306308
309+
310+
307311-- | Construct an 'Event' whose value is guaranteed not to be recomputed
308312-- repeatedly
309313--
@@ -328,18 +332,23 @@ cacheEvent e =
328332 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
329333 Just subscribedTicket -> return subscribedTicket
330334 Nothing -> do
335+#ifdef DEBUG_NODEIDS
336+ nodeId <- liftIO newNodeId
337+#endif
331338 subscribers <- liftIO FastWeakBag.empty
332339 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
340+#ifdef DEBUG_NODEIDS
341+ (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
342+#else
333343 (parentSub, occ) <- subscribeAndRead e $ Subscriber
334− { subscriberPropagate = \a -> do
335− liftIO $ writeIORef occRef $ Just a
336− scheduleClear occRef
337− propagateFast a subscribers
338− , subscriberInvalidateHeight = \old -> do
339− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
340− , subscriberRecalculateHeight = \new -> do
341− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
342− }
344+#endif
345+ { subscriberPropagate = \a -> do
346+ liftIO $ writeIORef occRef (Just a)
347+ scheduleClear occRef
348+ propagateFast a subscribers
349+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
350+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
351+ }
343352 when (isJust occ) $ do
344353 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
345354 scheduleClear occRef
@@ -347,29 +356,45 @@ cacheEvent e =
347356 { _cacheSubscribed_subscribers = subscribers
348357 , _cacheSubscribed_parent = parentSub
349358 , _cacheSubscribed_occurrence = occRef
359+#ifdef DEBUG_NODEIDS
360+ , _cacheSubscribed_nodeId = nodeId
361+#endif
350362 }
351363 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
352364 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
353365 return subscribedTicket
354− liftIO $ do
355− subscribed <- getFastWeakTicketValue subscribedTicket
356− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
357− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
358− let es = EventSubscription
359− { _eventSubscription_unsubscribe = do
360− FastWeakBag.remove ticket
361− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
362− when isEmpty $ do
363− writeIORef mSubscribedRef emptyFastWeak
364− unsubscribe $ _cacheSubscribed_parent subscribed
365− touch ticket
366− touch subscribedTicket
367− , _eventSubscription_subscribed = EventSubscribed
368− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
369− , eventSubscribedRetained = toAny subscribedTicket
370− }
371− }
372− return (es, occ)
366+ liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
367+
368+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
369+ -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
370+cacheSubscription sub mSubscribedRef subscribedTicket = do
371+ subscribed <- getFastWeakTicketValue subscribedTicket
372+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
373+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
374+
375+ let parentSub = _cacheSubscribed_parent subscribed
376+ es = EventSubscription
377+ { _eventSubscription_unsubscribe = do
378+ FastWeakBag.remove ticket
379+
380+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
381+ when isEmpty $ do
382+ writeIORef mSubscribedRef emptyFastWeak
383+ unsubscribe parentSub
384+ touch ticket
385+ touch subscribedTicket
386+ , _eventSubscription_subscribed = EventSubscribed
387+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
388+ , eventSubscribedRetained = toAny subscribedTicket
389+#ifdef DEBUG_CYCLES
390+ , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
391+ , eventSubscribedHasOwnHeightRef = False
392+ , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
393+#endif
394+ }
395+ }
396+ return (es, occ)
397+
373398
374399subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
375400subscribe e s = fst <$> subscribeAndRead e s
@@ -381,11 +406,14 @@ wrap tag getSpecificSubscribed sub = do
381406 let es = tag subd
382407 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
383408
384−eventRoot :: GCompare k => k a -> Root x k -> Event x a
409+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
385410eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
386411
412+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
413+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
414+
387415eventNever :: Event x a
388−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
416+eventNever = Event $ const subscribeAndReadNever
389417
390418eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
391419eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -422,16 +450,6 @@ data Subscriber x a = Subscriber
422450 , subscriberRecalculateHeight :: !(Height -> IO ())
423451 }
424452
425−--TODO: Move this comment to WeakBag
426−-- These function are constructor functions that are marked NOINLINE so they are
427−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
428−-- so any weak references that are attached to the constructors will have their
429−-- finalizer run. Using the opaque constructor, does not see the
430−-- constructor application, so it behaves like an IORef and cannot be fused away.
431−--
432−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
433−-- the weak pointer to it in some cases.
434−
435453newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
436454newSubscriberHold h = return $ Subscriber
437455 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -440,10 +458,10 @@ newSubscriberHold h = return $ Subscriber
440458 }
441459
442460newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
443−newSubscriberFan subscribed = return $ Subscriber
461+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
444462 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
445463 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
446− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
464+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
447465 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
448466 scheduleClear $ fanSubscribedOccurrence subscribed
449467 let f _ (Pair v subsubs) = do
@@ -452,50 +470,40 @@ newSubscriberFan subscribed = return $ Subscriber
452470 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
453471 return ()
454472 , subscriberInvalidateHeight = \old -> do
455− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
456473 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
457474 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
458− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
459475 , subscriberRecalculateHeight = \new -> do
460− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
461476 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
462477 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
463− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
464478 }
465479
466480newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
467−newSubscriberSwitch subscribed = return $ Subscriber
481+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
468482 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
469− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
470483 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
471484 scheduleClear $ switchSubscribedOccurrence subscribed
472485 propagate a $ switchSubscribedSubscribers subscribed
473486 , subscriberInvalidateHeight = \_ -> do
474− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
475487 oldHeight <- readIORef $ switchSubscribedHeight subscribed
476488 when (oldHeight /= invalidHeight) $ do
477489 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
478490 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
479− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
480− , subscriberRecalculateHeight = \new -> do
481− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
482− updateSwitchHeight new subscribed
483− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
484− }
491+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
492+ }
485493
486494newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
487−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
495+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
488496 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
489− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
490497 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
491498 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
492499 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
493500 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
494501 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
502+
495503 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
496504 scheduleClear $ coincidenceSubscribedInnerParent subscribed
497505 case occ of
498− Nothing -> do
506+ Nothing ->
499507 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
500508 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
501509 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -504,20 +512,13 @@ newSubscriberCoincidenceOuter subscribed = return $ Subscriber
504512 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
505513 scheduleClear $ coincidenceSubscribedOccurrence subscribed
506514 propagate o $ coincidenceSubscribedSubscribers subscribed
507− , subscriberInvalidateHeight = \_ -> do
508− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
509− invalidateCoincidenceHeight subscribed
510− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
511− , subscriberRecalculateHeight = \_ -> do
512− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
513− recalculateCoincidenceHeight subscribed
514− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
515+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
516+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
515517 }
516518
517519newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
518−newSubscriberCoincidenceInner subscribed = return $ Subscriber
520+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
519521 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
520− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
521522 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
522523 case occ of
523524 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -525,14 +526,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
525526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
526527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
527528 propagate a $ coincidenceSubscribedSubscribers subscribed
528− , subscriberInvalidateHeight = \_ -> do
529− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
530− invalidateCoincidenceHeight subscribed
531− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
532− , subscriberRecalculateHeight = \_ -> do
533− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
534− recalculateCoincidenceHeight subscribed
535− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
536531 }
537532
538533invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -542,15 +537,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
542537recalculateSubscriberHeight = flip subscriberRecalculateHeight
543538
544539-- | Propagate everything at the current height
545−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
546−propagate a subscribers = withIncreasedDepth $ do
540+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
541+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
547542 -- 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
548543 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
549544 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
550545
551546-- | Propagate everything at the current height
552−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
553−propagateFast a subscribers = withIncreasedDepth $ do
547+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
548+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
554549 -- 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
555550 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
556551 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -571,7 +566,7 @@ data EventSubscribed x = EventSubscribed
571566 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
572567 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
573568#ifdef DEBUG_CYCLES
574− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
569+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
575570 , eventSubscribedHasOwnHeightRef :: !Bool
576571 , eventSubscribedWhoCreated :: !(IO [String])
577572#endif
@@ -604,7 +599,7 @@ eventSubscribedFan !subscribed = EventSubscribed
604599 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
605600 , eventSubscribedRetained = toAny subscribed
606601#ifdef DEBUG_CYCLES
607− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
602+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
608603 , eventSubscribedHasOwnHeightRef = False
609604 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
610605#endif
@@ -617,7 +612,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
617612#ifdef DEBUG_CYCLES
618613 , eventSubscribedGetParents = do
619614 s <- readIORef $ switchSubscribedCurrentParent subscribed
620− return [Some $ _eventSubscription_subscribed s]
615+ return [_eventSubscription_subscribed s]
621616 , eventSubscribedHasOwnHeightRef = True
622617 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
623618#endif
@@ -630,8 +625,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
630625#ifdef DEBUG_CYCLES
631626 , eventSubscribedGetParents = do
632627 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
633− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
634− innerParents = maybeToList $ fmap Some innerSubscription
628+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
629+ innerParents = maybeToList $ innerSubscription
635630 return $ outerParent : innerParents
636631 , eventSubscribedHasOwnHeightRef = True
637632 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -645,15 +640,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
645640whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
646641whoCreatedEventSubscribed = eventSubscribedWhoCreated
647642
648−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
643+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
649644walkInvalidHeightParents s0 = do
650− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
645+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
651646 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
652647 when (h == invalidHeight) $ do
653648 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
654− modify (Some s :)
649+ modify (s :)
655650 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
656− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
651+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
657652 return subscribers
658653#endif
659654
@@ -1038,7 +1033,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10381033newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10391034
10401035-- EventM can do everything BehaviorM can, plus create holds
1041−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
1036+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10421037
10431038newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10441039
@@ -1063,7 +1058,8 @@ heightBagFromList :: [Height] -> HeightBag
10631058heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10641059
10651060heightBagAdd :: Height -> HeightBag -> HeightBag
1066−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1061+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1062+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10671063
10681064heightBagRemove :: Height -> HeightBag -> HeightBag
10691065heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1072,6 +1068,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10721068 0 -> IntMap.delete h c
10731069 _ -> IntMap.insert h (pred old) c
10741070
1071+heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1072+heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1073+ removed old = HeightBag (pred s) $ case old of
1074+ 0 -> IntMap.delete h c
1075+ _ -> IntMap.insert h (pred old) c
1076+
1077+
10751078heightBagMax :: HeightBag -> Height
10761079heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10771080 Just ((h, _), _) -> Height h
@@ -1319,55 +1322,110 @@ mkWeakPtrWithDebug x debugNote = do
13191322 x' <- evaluate x
13201323 mkWeakPtr x' $
13211324 if debugFinalize
1322− then Just $ putStrLn $ "finalizing: " ++ debugNote
1325+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13231326 else Nothing
13241327
13251328type WeakList a = [Weak a]
13261329
1327−{-# INLINE withIncreasedDepth #-}
1330+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1331+
1332+
1333+
1334+
13281335#ifdef DEBUG
1329−withIncreasedDepth :: CanTrace x m => m a -> m a
1330−withIncreasedDepth a = do
1331− spiderTimeline <- askSpiderTimelineEnv
1332− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
1336+
1337+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1338+debugSubscriber description = return . debugSubscriber' description
1339+
1340+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1341+debugSubscriber' description subscribed = Subscriber
1342+ {
1343+ subscriberPropagate = \m -> do
1344+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1345+ subscriberPropagate subscribed m
1346+ , subscriberInvalidateHeight = \old -> do
1347+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1348+ subscriberInvalidateHeight subscribed old
1349+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1350+ , subscriberRecalculateHeight = \new -> do
1351+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1352+ subscriberRecalculateHeight subscribed new
1353+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1354+ }
1355+
1356+
1357+{-# INLINE withIncreasedDepth #-}
1358+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1359+withIncreasedDepth _ a = do
1360+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
13331361 result <- a
1334− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1362+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13351363 return result
1336−#else
1337−withIncreasedDepth :: m a -> m a
1338−withIncreasedDepth = id
1339−#endif
1340−
1341−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13421364
13431365{-# INLINE tracePropagate #-}
13441366tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1345−tracePropagate p = traceWhen p debugPropagate
1367+tracePropagate p = when debugPropagate . trace p
13461368
13471369{-# INLINE traceInvalidate #-}
13481370traceInvalidate :: String -> IO ()
1349−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1371+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1372+
1373+{-# INLINE traceInvalidateHeight #-}
1374+traceInvalidateHeight :: String -> IO ()
1375+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13501376
1351−{-# INLINE traceWhen #-}
1352−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1353−traceWhen p b message = traceMWhen p b $ return message
1377+{-# INLINE trace #-}
1378+trace :: (CanTrace x m) => proxy x -> String -> m ()
1379+trace p message = traceM p $ return message
13541380
1355−{-# INLINE traceMWhen #-}
1356−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1357−traceMWhen _ b getMessage = when b $ do
1381+{-# INLINE traceM #-}
1382+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1383+traceM _ getMessage = do
13581384 message <- getMessage
1359−#ifdef DEBUG
1360− spiderTimeline <- askSpiderTimelineEnv
1361− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1385+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1386+ liftIO $ debugStrLn $ replicate d ' ' <> message
1387+
13621388#else
1363− let d = 0
1389+
1390+{-# INLINE withIncreasedDepth #-}
1391+withIncreasedDepth :: proxy x -> m a -> m a
1392+withIncreasedDepth _ = id
1393+
1394+{-# INLINE tracePropagate #-}
1395+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1396+tracePropagate _ _ = return ()
1397+
1398+{-# INLINE traceInvalidate #-}
1399+traceInvalidate :: String -> IO ()
1400+traceInvalidate _ = return ()
1401+
1402+{-# INLINE traceInvalidateHeight #-}
1403+traceInvalidateHeight :: String -> IO ()
1404+traceInvalidateHeight _ = return ()
1405+
1406+{-# INLINE debugSubscriber #-}
1407+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1408+debugSubscriber _ = return
1409+
1410+{-# INLINE debugSubscriber' #-}
1411+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1412+debugSubscriber' _ = id
1413+
1414+
1415+
1416+{-# INLINE trace #-}
1417+trace :: (CanTrace x m) => proxy x -> String -> m ()
1418+trace _ _ = return ()
1419+
1420+{-# INLINE traceM #-}
1421+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1422+traceM _ _ = return ()
1423+
13641424#endif
1365− liftIO $ putStrLn $ replicate d ' ' <> message
13661425
13671426whoCreatedIORef :: IORef a -> IO [String]
13681427whoCreatedIORef (IORef a) = whoCreated $! a
13691428
1370−#ifdef DEBUG_CYCLES
13711429groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13721430groupByHead = \case
13731431 [] -> []
@@ -1378,20 +1436,54 @@ groupByHead = \case
13781436 | otherwise -> (x, xs :| []) : l
13791437
13801438listsToForest :: Eq a => [[a]] -> Forest a
1381−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1439+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1440+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1441+
1442+showStacks :: [[String]] -> String
1443+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1444+
1445+filterStack :: String -> [String] -> [String]
1446+#ifdef DEBUG_HIDE_INTERNALS
1447+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1448+#else
1449+filterStack prefix = id
1450+#endif
1451+
1452+#ifdef DEBUG_CYCLES
1453+
1454+data EventLoopException = EventLoopException [[String]]
1455+instance Exception EventLoopException
1456+
1457+instance Show EventLoopException where
1458+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1459+ then "no location information, compile with profiling enabled for stack tree"
1460+ else showStacks stacks
1461+
1462+#else
1463+
1464+data EventLoopException = EventLoopException
1465+instance Exception EventLoopException
1466+
1467+instance Show EventLoopException where
1468+ show EventLoopException = "causality loop detected: \n" <>
1469+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1470+
13821471#endif
13831472
1473+
13841474{-# INLINE propagateSubscriberHold #-}
13851475propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13861476propagateSubscriberHold h a = do
1387− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1477+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13881478 invalidators <- liftIO $ readIORef $ holdInvalidators h
13891479 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1480+
13901481 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13911482 case {-# SCC "apply" #-} apply a v of
13921483 Nothing -> return ()
13931484 Just v' -> do
1394− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1485+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1486+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13951487 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13961488 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13971489 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1445,7 +1537,7 @@ getDynHold d = do
14451537zeroRef :: IORef Height
14461538zeroRef = unsafePerformIO $ newIORef zeroHeight
14471539
1448−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1540+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14491541getRootSubscribed k r sub = do
14501542 mSubscribed <- readIORef $ rootSubscribed r
14511543 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1459,7 +1551,9 @@ getRootSubscribed k r sub = do
14591551 let !cached = rootSubscribed r
14601552 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14611553 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1462− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1554+
1555+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1556+
14631557 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14641558 writeIORef uninitRef $! uninit
14651559#ifdef DEBUG_NODEIDS
@@ -1509,6 +1603,9 @@ data FanInt x a = FanInt
15091603 { _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
15101604 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15111605 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1606+#ifdef DEBUG_NODEIDS
1607+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1608+#endif
15121609 }
15131610
15141611newFanInt :: IO (FanInt x a)
@@ -1516,10 +1613,16 @@ newFanInt = do
15161613 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
15171614 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15181615 occRef <- newIORef $ error "fanInt: no occurrence"
1616+#ifdef DEBUG_NODEIDS
1617+ nodeId <- newNodeId
1618+#endif
15191619 return $ FanInt
15201620 { _fanInt_subscribers = subscribers
15211621 , _fanInt_subscriptionRef = subscriptionRef
15221622 , _fanInt_occRef = occRef
1623+#ifdef DEBUG_NODEIDS
1624+ , _fanInt_nodeId = nodeId
1625+#endif
15231626 }
15241627
15251628fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1528,20 +1631,21 @@ fanInt p = unsafePerformIO $ do
15281631 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15291632 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15301633 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1531− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1634+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1635+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15321636 { subscriberPropagate = \m -> do
15331637 liftIO $ writeIORef (_fanInt_occRef self) m
15341638 scheduleIntClear $ _fanInt_occRef self
1535− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1536− FastWeakBag.traverse_ b $ \s -> do
1639+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1640+ FastWeakBag.traverse_ b $ \s ->
15371641 subscriberPropagate s v
1538− , subscriberInvalidateHeight = \old -> do
1539− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1540− FastWeakBag.traverse_ b $ \s -> do
1642+ , subscriberInvalidateHeight = \old ->
1643+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1644+ FastWeakBag.traverse_ b $ \s ->
15411645 subscriberInvalidateHeight s old
1542− , subscriberRecalculateHeight = \new -> do
1543− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1544− FastWeakBag.traverse_ b $ \s -> do
1646+ , subscriberRecalculateHeight = \new ->
1647+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1648+ FastWeakBag.traverse_ b $ \s ->
15451649 subscriberRecalculateHeight s new
15461650 }
15471651 liftIO $ do
@@ -1555,10 +1659,25 @@ fanInt p = unsafePerformIO $ do
15551659 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15561660 return b
15571661 Just b -> return b
1558− t <- liftIO $ FastWeakBag.insert sub b
1662+ ticket <- liftIO $ FastWeakBag.insert sub b
15591663 currentOcc <- readIORef (_fanInt_occRef self)
1560− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1561− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
1664+
1665+ subscribed <- fanIntSubscribed ticket self
1666+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1667+
1668+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1669+fanIntSubscribed ticket self = do
1670+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1671+ return $ EventSubscribed
1672+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1673+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1674+#ifdef DEBUG_CYCLES
1675+ , eventSubscribedGetParents = return [subscribedParent]
1676+ , eventSubscribedHasOwnHeightRef = False
1677+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1678+#endif
1679+ }
1680+
15621681
15631682{-# INLINABLE getFanSubscribed #-}
15641683getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1756,7 +1875,7 @@ mergeCheap
17561875 => (forall a. q a -> Event x (v a))
17571876 -> DynamicS x (PatchDMap k q)
17581877 -> Event x (DMap k v)
1759−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1878+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17601879 where
17611880 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17621881 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1771,7 +1890,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17711890 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17721891 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17731892 forM_ mOldSubd $ \oldSubd -> do
1774− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1893+ oldHeight <- liftIO $ getEventSubscribedHeight $
1894+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1895+
17751896 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17761897 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17771898 foldM f ([], oldParents) $ DMap.toList p
@@ -1796,7 +1917,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17961917 => (forall a. q a -> Event x (v a))
17971918 -> DynamicS x (PatchDMapWithMove k q)
17981919 -> Event x (DMap k v)
1799−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1920+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
18001921 where
18011922 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
18021923 updateMe subscriber heightBagRef oldParents p = do
@@ -1815,13 +1936,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18151936 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18161937 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18171938 Nothing -> do
1818− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1939+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1940+ _mergeSubscribedParentWithMove_subscription parent
1941+
18191942 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18201943 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18211944 Just toKey -> do
18221945 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18231946 return Nothing
1824− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1947+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1948+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1949+
18251950 return (toDelete, applyAlways p' oldParents)
18261951 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18271952 getInitialSubscribers initialParents subscriber = do
@@ -1846,6 +1971,8 @@ type MergeUpdateFunc k v x p s
18461971 -> p
18471972 -> EventM x ([EventSubscription x], DMap k s)
18481973
1974+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1975+
18491976type MergeInitFunc k v q x s
18501977 = DMap k q
18511978 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1869,14 +1996,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18691996invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18701997invalidateMergeHeight' heightRef sub = do
18711998 oldHeight <- readIORef heightRef
1872− 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
1999+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2000+ when (oldHeight /= invalidHeight) $ do
18732001 writeIORef heightRef $! invalidHeight
18742002 subscriberInvalidateHeight sub oldHeight
18752003
18762004revalidateMergeHeight :: Merge x k v s -> IO ()
18772005revalidateMergeHeight m = do
18782006 currentHeight <- readIORef $ _merge_heightRef m
1879− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2007+
2008+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2009+ when (currentHeight == invalidHeight) $ do
18802010 heights <- readIORef $ _merge_heightBagRef m
18812011 parents <- readIORef $ _merge_parentsRef m
18822012 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1884,7 +2014,7 @@ revalidateMergeHeight m = do
18842014 LT -> return ()
18852015 EQ -> do
18862016 let height = succHeight $ heightBagMax heights
1887− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2017+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18882018 writeIORef (_merge_heightRef m) $! height
18892019 subscriberRecalculateHeight (_merge_sub m) height
18902020 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1892,36 +2022,45 @@ revalidateMergeHeight m = do
18922022scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18932023scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18942024 vals <- liftIO $ readIORef $ _merge_accumRef m
1895− 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
2025+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2026+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2027+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
18962028 --TODO: Assert that m is not empty
18972029 subscriberPropagate (_merge_sub m) vals
18982030
1899−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1900−mergeSubscriber m getKey = Subscriber
2031+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2032+checkCycle subscribed = liftIO $ do
2033+ height <- readIORef (eventSubscribedHeightRef subscribed)
2034+
2035+ -- currentHeight <- getCurrentHeight
2036+ -- when (height <= currentHeight) $ if height /= invalidHeight
2037+ -- then do
2038+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2039+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2040+ -- else liftIO $
2041+ when (height == invalidHeight) $
2042+#ifdef DEBUG_CYCLES
2043+ do
2044+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2045+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2046+ throwIO (EventLoopException stacks)
2047+#else
2048+ throwIO EventLoopException
2049+#endif
2050+
2051+
2052+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)
2053+mergeSubscriber subscribed m getKey = Subscriber
19012054 { subscriberPropagate = \a -> do
19022055 oldM <- liftIO $ readIORef $ _merge_accumRef m
19032056 k <- getKey
1904− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2057+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
19052058 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19062059 liftIO $ writeIORef (_merge_accumRef m) $! newM
19072060 when (DMap.null oldM) $ do -- Only schedule the firing once
19082061 height <- liftIO $ readIORef $ _merge_heightRef m
1909− --TODO: assertions about height
1910− currentHeight <- getCurrentHeight
1911− when (height <= currentHeight) $ do
1912− if height /= invalidHeight
1913− then do
1914− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1915− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1916− else liftIO $ do
1917−#ifdef DEBUG_CYCLES
1918− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1919− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1920− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1921−#else
1922− let cycleInfo = ""
1923−#endif
1924− error $ "Causality loop found" <> cycleInfo
2062+ checkCycle subscribed
2063+
19252064 scheduleMergeSelf m height
19262065 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19272066 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1932,31 +2071,45 @@ mergeSubscriber m getKey = Subscriber
19322071 }
19332072
19342073--TODO: Be able to run as much of this as possible promptly
1935−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1936−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2074+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2075+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
19372076 where updateMe = do
19382077 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1939− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2078+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19402079 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19412080 return subscriptionsToKill
19422081
19432082{-# INLINE mergeGCheap' #-}
19442083mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1945− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1946−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2084+ => 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)
2085+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19472086 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19482087 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19492088 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19502089 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19512090 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1952− let m = Merge
2091+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2092+
2093+ let subscribed = EventSubscribed
2094+ { eventSubscribedHeightRef = heightRef
2095+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2096+#ifdef DEBUG_CYCLES
2097+ , eventSubscribedGetParents = do
2098+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2099+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2100+ , eventSubscribedHasOwnHeightRef = False
2101+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2102+#endif
2103+ }
2104+
2105+ m = Merge
19532106 { _merge_parentsRef = parentsRef
19542107 , _merge_heightBagRef = heightBagRef
19552108 , _merge_heightRef = heightRef
19562109 , _merge_sub = sub
19572110 , _merge_accumRef = accumRef
19582111 }
1959− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2112+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19602113 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19612114 myHeight = if invalidHeight `elem` heights
19622115 then invalidHeight
@@ -1965,31 +2118,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19652118 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19662119 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19672120 else (Nothing, dm)
1968− unless (DMap.null accum) $ do
1969− scheduleMergeSelf m myHeight
2121+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19702122 liftIO $ writeIORef accumRef $! accum
19712123 liftIO $ writeIORef heightRef $! myHeight
19722124 liftIO $ writeIORef heightBagRef $! myHeightBag
1973− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19742125 liftIO $ writeIORef parentsRef $! initialParentState
19752126 defer $ SomeMergeInit $ do
1976− let s = Subscriber
2127+ let changeSubscriber = Subscriber
19772128 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1978− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1979− defer $ updateMerge m updateFunc a
2129+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2130+ defer $ updateMerge subscribed m updateFunc a
19802131 , subscriberInvalidateHeight = \_ -> return ()
19812132 , subscriberRecalculateHeight = \_ -> return ()
19822133 }
1983− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1984− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2134+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2135+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
19852136 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19862137 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19872138 -- its subscription.
1988− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2139+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19892140 let unsubscribeAll = destroy =<< readIORef parentsRef
1990− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1991− , occ
1992− )
2141+
2142+ return (EventSubscription unsubscribeAll subscribed, occ)
2143+
19932144
19942145mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19952146mergeInt = cacheEvent . mergeIntCheap
@@ -2002,13 +2153,22 @@ mergeIntCheap d = Event $ \sub -> do
20022153 heightRef <- liftIO $ newIORef zeroHeight
20032154 heightBagRef <- liftIO $ newIORef heightBagEmpty
20042155 parents <- liftIO $ FastMutableIntMap.newEmpty
2156+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2157+ let subscribed = EventSubscribed
2158+ { eventSubscribedHeightRef = heightRef
2159+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2160+#ifdef DEBUG_CYCLES
2161+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2162+ , eventSubscribedHasOwnHeightRef = False
2163+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2164+#endif
2165+ }
20052166 let scheduleSelf = do
20062167 height <- liftIO $ readIORef $ heightRef
20072168 scheduleMerge' height heightRef $ do
20082169 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20092170 subscriberPropagate sub vals
2010− invalidateMyHeight = do
2011− invalidateMergeHeight' heightRef sub
2171+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20122172 recalculateMyHeight = do
20132173 currentHeight <- readIORef heightRef
20142174 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?
@@ -2018,12 +2178,14 @@ mergeIntCheap d = Event $ \sub -> do
20182178 LT -> return ()
20192179 EQ -> do
20202180 let height = succHeight $ heightBagMax heights
2021− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2181+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20222182 writeIORef heightRef $! height
20232183 subscriberRecalculateHeight sub height
20242184 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20252185 mySubscriber k = Subscriber
20262186 { subscriberPropagate = \a -> do
2187+ checkCycle subscribed
2188+
20272189 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20282190 liftIO $ FastMutableIntMap.insert accum k a
20292191 when wasEmpty scheduleSelf
@@ -2057,7 +2219,6 @@ mergeIntCheap d = Event $ \sub -> do
20572219 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20582220 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20592221 return Nothing
2060− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20612222 defer $ SomeMergeInit $ do
20622223 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20632224 where
@@ -2071,25 +2232,27 @@ mergeIntCheap d = Event $ \sub -> do
20712232 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20722233 liftIO $ for_ oldParents $ \oldParent -> do
20732234 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2235+
2236+ print ("updateMe", oldParentHeight)
20742237 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20752238 return $ IntMap.elems oldParents
2076− let s = Subscriber
2239+ let changeSubscriber = Subscriber
20772240 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20782241 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20792242 defer $ updateMe a
20802243 , subscriberInvalidateHeight = \_ -> return ()
20812244 , subscriberRecalculateHeight = \_ -> return ()
20822245 }
2083− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2246+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20842247 forM_ change $ \c -> defer $ updateMe c
20852248 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20862249 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20872250 -- its subscription.
2088− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2251+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20892252 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2090− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2091− , occ
2092− )
2253+
2254+
2255+ return (EventSubscription unsubscribeAll subscribed, occ)
20932256
20942257newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20952258newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2172,19 +2335,19 @@ runFrame a = SpiderHost $ do
21722335 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21732336 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21742337 writeIORef vRef v
2175− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2338+ traceInvalidate $ "Invalidating Hold"
21762339 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21772340 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21782341 writeIORef (eventEnvMergeUpdates env) []
2179− when debugPropagate $ putStrLn "Updating merges"
2342+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21802343 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2181− when debugPropagate $ putStrLn "Updating merges done"
2344+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21822345 toReconnect <- readIORef toReconnectRef
21832346 clearEventEnv env
21842347 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21852348 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21862349 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2187− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2350+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21882351 finalize wi
21892352 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21902353 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2198,7 +2361,7 @@ runFrame a = SpiderHost $ do
21982361 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
21992362 {-
22002363 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2201− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2364+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
22022365 EventRoot _ -> "EventRoot"
22032366 EventNever -> "EventNever"
22042367 _ -> "something else"
@@ -2490,13 +2653,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24902653 touch h
24912654 return result
24922655
2493−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2656+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24942657 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24952658 newFanEventWithTrigger f = SpiderHost $ do
24962659 es <- newFanEventWithTriggerIO f
24972660 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24982661
2499−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2662+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
25002663 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
25012664 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
25022665 es <- newFanEventWithTriggerIO f
@@ -2682,12 +2845,12 @@ instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26822845 notReadyUntil _ = pure ()
26832846 notReady = pure ()
26842847
2685−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2848+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26862849newEventWithTriggerIO f = do
26872850 es <- newFanEventWithTriggerIO $ \Refl -> f
26882851 return $ select es Refl
26892852
2690−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2853+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26912854newFanEventWithTriggerIO f = do
26922855 occRef <- newIORef DMap.empty
26932856 subscribedRef <- newIORef DMap.empty
@@ -2728,4 +2891,4 @@ instance NotReady (SpiderTimeline x) (SpiderHost x) where
27282891
27292892instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
27302893 notReadyUntil _ = return ()
2731− notReady = return ()
2894+ notReady = return ()