@@ -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,21 +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
106111import Reflex.PerformEvent.Base (PerformEventT)
107112
108113#ifdef DEBUG_TRACE_EVENTS
109114import qualified Data.ByteString.Char8 as BS8
110115import System.IO (stderr)
116+import Data.List (isPrefixOf)
111117#endif
112118
113−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
114122
123+#ifdef DEBUG_TRACE_EVENTS
115124withStackOneLine :: (BS8.ByteString -> a) -> a
116125withStackOneLine expr = unsafePerformIO $ do
117126 stack <- currentCallStack
118− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
119129
120130#endif
121131
@@ -126,28 +136,42 @@ debugInvalidateHeight :: Bool
126136debugInvalidate :: Bool
127137
128138#ifdef DEBUG
129−
130139#define DEBUG_NODEIDS
131140
141+#ifdef DEBUG_TRACE_PROPAGATION
132142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
133146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
134150debugInvalidateHeight = False
151+#endif
135152
153+#ifdef DEBUG_TRACE_INVALIDATION
136154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
137158
138159class HasNodeId a where
139160 getNodeId :: a -> Int
140161
141−instance HasNodeId (Hold x p a) where
142− 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
143167
144−instance HasNodeId (PushSubscribed x a b) where
145− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
146170
147171instance HasNodeId (SwitchSubscribed x a) where
148172 getNodeId = switchSubscribedNodeId
149173
150−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
151175 getNodeId = fanSubscribedNodeId
152176
153177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -161,41 +185,16 @@ instance HasNodeId (Pull x a) where
161185
162186{-# INLINE showNodeId #-}
163187showNodeId :: HasNodeId a => a -> String
164−showNodeId = ("#"<>) . show . getNodeId
165−
166−showSubscriberType :: Subscriber x a -> String
167−showSubscriberType = \case
168− SubscriberPush _ _ -> "SubscriberPush"
169− SubscriberMerge _ _ -> "SubscriberMerge"
170− SubscriberFan _ -> "SubscriberFan"
171− SubscriberMergeChange _ -> "SubscriberMergeChange"
172− SubscriberHold _ -> "SubscriberHold"
173− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
174− SubscriberSwitch _ -> "SubscriberSwitch"
175− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
176− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
177− SubscriberHandle -> "SubscriberHandle"
178−
179−showEventType :: Event x a -> String
180−showEventType = \case
181− EventRoot _ _ -> "EventRoot"
182− EventNever -> "EventNever"
183− EventPush _ -> "EventPush"
184− EventMerge _ -> "EventMerge"
185− EventFan _ _ -> "EventFan"
186− EventSwitch _ -> "EventSwitch"
187− EventCoincidence _ -> "EventCoincidence"
188− EventHold _ -> "EventHold"
189− EventDyn _ -> "EventDyn"
190− EventHoldIdentity _ -> "EventHoldIdentity"
191− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
192193
193194#else
194195
195196debugPropagate = False
196−
197197debugInvalidateHeight = False
198−
199198debugInvalidate = False
200199
201200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -203,6 +202,10 @@ debugInvalidate = False
203202showNodeId :: a -> String
204203showNodeId _ = ""
205204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
206209#endif
207210
208211#ifdef DEBUG_NODEIDS
@@ -248,9 +251,9 @@ subscribeAndRead = unEvent
248251-- caching; if the computation function is very cheap, this is (much) more
249252-- efficient than 'push'
250253{-# INLINE [1] pushCheap #-}
251−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
252255pushCheap !f e = Event $ \sub -> do
253− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
254257 { subscriberPropagate = \a -> do
255258 mb <- f a
256259 mapM_ (subscriberPropagate sub) mb
@@ -269,10 +272,10 @@ terminalSubscriber p = Subscriber
269272
270273-- | Subscribe to an Event only for the duration of one occurrence
271274{-# INLINE subscribeAndReadHead #-}
272−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)
273276subscribeAndReadHead e sub = do
274277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
275− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
276279 { subscriberPropagate = \a -> do
277280 liftIO $ unsubscribe =<< readIORef subscriptionRef
278281 subscriberPropagate sub a
@@ -283,24 +286,42 @@ subscribeAndReadHead e sub = do
283286 return (subscription, occ)
284287
285288--TODO: Make this lazy in its input event
286−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)
287290headE originalE = do
288291 parent <- liftIO $ newIORef $ Just originalE
289292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
290293 let clearParent = liftIO $ writeIORef parent Nothing
291− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
292295 when (isJust occ) clearParent
293− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
294297 liftIO (readIORef parent) >>= \case
295− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
296299 Just e -> subscribeAndReadHead e sub
297300
298301data CacheSubscribed x a
299302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
300303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
301304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
302308 }
303309
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+
304325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
305326-- repeatedly
306327--
@@ -325,18 +346,23 @@ cacheEvent e =
325346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
326347 Just subscribedTicket -> return subscribedTicket
327348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
328352 subscribers <- liftIO FastWeakBag.empty
329353 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
330357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
331− { subscriberPropagate = \a -> do
332− liftIO $ writeIORef occRef $ Just a
333− scheduleClear occRef
334− propagateFast a subscribers
335− , subscriberInvalidateHeight = \old -> do
336− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
337− , subscriberRecalculateHeight = \new -> do
338− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
339− }
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+ }
340366 when (isJust occ) $ do
341367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
342368 scheduleClear occRef
@@ -344,29 +370,45 @@ cacheEvent e =
344370 { _cacheSubscribed_subscribers = subscribers
345371 , _cacheSubscribed_parent = parentSub
346372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
347376 }
348377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
349378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
350379 return subscribedTicket
351− liftIO $ do
352− subscribed <- getFastWeakTicketValue subscribedTicket
353− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
354− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
355− let es = EventSubscription
356− { _eventSubscription_unsubscribe = do
357− FastWeakBag.remove ticket
358− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
359− when isEmpty $ do
360− writeIORef mSubscribedRef emptyFastWeak
361− unsubscribe $ _cacheSubscribed_parent subscribed
362− touch ticket
363− touch subscribedTicket
364− , _eventSubscription_subscribed = EventSubscribed
365− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
366− , eventSubscribedRetained = toAny subscribedTicket
367− }
368− }
369− 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+
370412
371413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
372414subscribe e s = fst <$> subscribeAndRead e s
@@ -378,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
378420 let es = tag subd
379421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
380422
381−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
382424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
383425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
384429eventNever :: Event x a
385−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
386431
387432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
388433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -419,16 +464,6 @@ data Subscriber x a = Subscriber
419464 , subscriberRecalculateHeight :: !(Height -> IO ())
420465 }
421466
422−--TODO: Move this comment to WeakBag
423−-- These function are constructor functions that are marked NOINLINE so they are
424−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
425−-- so any weak references that are attached to the constructors will have their
426−-- finalizer run. Using the opaque constructor, does not see the
427−-- constructor application, so it behaves like an IORef and cannot be fused away.
428−--
429−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
430−-- the weak pointer to it in some cases.
431−
432467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
433468newSubscriberHold h = return $ Subscriber
434469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -437,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
437472 }
438473
439474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
440−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
441476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
442477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
443− 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"
444479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
445480 scheduleClear $ fanSubscribedOccurrence subscribed
446481 let f _ (Pair v subsubs) = do
@@ -449,50 +484,40 @@ newSubscriberFan subscribed = return $ Subscriber
449484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
450485 return ()
451486 , subscriberInvalidateHeight = \old -> do
452− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
453487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
454488 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
455− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
456489 , subscriberRecalculateHeight = \new -> do
457− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
458490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
459491 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
460− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
461492 }
462493
463494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
464−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
465496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
466− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
467497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
468498 scheduleClear $ switchSubscribedOccurrence subscribed
469499 propagate a $ switchSubscribedSubscribers subscribed
470500 , subscriberInvalidateHeight = \_ -> do
471− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
472501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
473502 when (oldHeight /= invalidHeight) $ do
474503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
475504 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
476− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
477− , subscriberRecalculateHeight = \new -> do
478− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
479− updateSwitchHeight new subscribed
480− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
481− }
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
482507
483508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
484−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
485510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
486− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
487511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
488512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
489513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
490514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
491515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
492517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
493518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
494519 case occ of
495− Nothing -> do
520+ Nothing ->
496521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
497522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
498523 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -501,20 +526,13 @@ newSubscriberCoincidenceOuter subscribed = return $ Subscriber
501526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
502527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
503528 propagate o $ coincidenceSubscribedSubscribers subscribed
504− , subscriberInvalidateHeight = \_ -> do
505− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
506− invalidateCoincidenceHeight subscribed
507− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
508− , subscriberRecalculateHeight = \_ -> do
509− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
510− recalculateCoincidenceHeight subscribed
511− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
512531 }
513532
514533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
515−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
516535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
517− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
518536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
519537 case occ of
520538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -522,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
522540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
523541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
524542 propagate a $ coincidenceSubscribedSubscribers subscribed
525− , subscriberInvalidateHeight = \_ -> do
526− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
527− invalidateCoincidenceHeight subscribed
528− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
529− , subscriberRecalculateHeight = \_ -> do
530− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
531− recalculateCoincidenceHeight subscribed
532− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
533545 }
534546
535547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -539,15 +551,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
539551recalculateSubscriberHeight = flip subscriberRecalculateHeight
540552
541553-- | Propagate everything at the current height
542−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
543−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) $
544556 -- 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
545557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
546558 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
547559
548560-- | Propagate everything at the current height
549−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
550−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) $
551563 -- 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
552564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
553565 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -568,7 +580,7 @@ data EventSubscribed x = EventSubscribed
568580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
569581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
570582#ifdef DEBUG_CYCLES
571− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
572584 , eventSubscribedHasOwnHeightRef :: !Bool
573585 , eventSubscribedWhoCreated :: !(IO [String])
574586#endif
@@ -595,13 +607,23 @@ eventSubscribedNever = EventSubscribed
595607 , eventSubscribedWhoCreated = return ["never"]
596608#endif
597609 }
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+ }
598620
599621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
600622eventSubscribedFan !subscribed = EventSubscribed
601623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
602624 , eventSubscribedRetained = toAny subscribed
603625#ifdef DEBUG_CYCLES
604− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
605627 , eventSubscribedHasOwnHeightRef = False
606628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
607629#endif
@@ -614,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
614636#ifdef DEBUG_CYCLES
615637 , eventSubscribedGetParents = do
616638 s <- readIORef $ switchSubscribedCurrentParent subscribed
617− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
618640 , eventSubscribedHasOwnHeightRef = True
619641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
620642#endif
@@ -627,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
627649#ifdef DEBUG_CYCLES
628650 , eventSubscribedGetParents = do
629651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
630− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
631− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
632654 return $ outerParent : innerParents
633655 , eventSubscribedHasOwnHeightRef = True
634656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -642,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
642664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
643665whoCreatedEventSubscribed = eventSubscribedWhoCreated
644666
645−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
646668walkInvalidHeightParents s0 = do
647− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
648670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
649671 when (h == invalidHeight) $ do
650672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
651− modify (Some s :)
673+ modify (s :)
652674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
653− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
654676 return subscribers
655677#endif
656678
@@ -972,8 +994,10 @@ instance Monad (BehaviorM x) where
972994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
973995 {-# INLINE return #-}
974996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
975998 {-# INLINE fail #-}
976999 fail s = BehaviorM $ fail s
1000+#endif
9771001
9781002data BehaviorSubscribed x a
9791003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1033,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10331057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10341058
10351059-- EventM can do everything BehaviorM can, plus create holds
1036−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)
10371061
10381062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10391063
@@ -1058,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10581082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10591083
10601084heightBagAdd :: Height -> HeightBag -> HeightBag
1061−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
10621087
10631088heightBagRemove :: Height -> HeightBag -> HeightBag
10641089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1067,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10671092 0 -> IntMap.delete h c
10681093 _ -> IntMap.insert h (pred old) c
10691094
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+
10701102heightBagMax :: HeightBag -> Height
10711103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10721104 Just ((h, _), _) -> Height h
@@ -1314,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
13141346 x' <- evaluate x
13151347 mkWeakPtr x' $
13161348 if debugFinalize
1317− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
13181350 else Nothing
13191351
13201352type WeakList a = [Weak a]
13211353
1322−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
13231359#ifdef DEBUG
1324−withIncreasedDepth :: CanTrace x m => m a -> m a
1325−withIncreasedDepth a = do
1326− spiderTimeline <- askSpiderTimelineEnv
1327− 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
13281385 result <- a
1329− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13301387 return result
1331−#else
1332−withIncreasedDepth :: m a -> m a
1333−withIncreasedDepth = id
1334−#endif
1335−
1336−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13371388
13381389{-# INLINE tracePropagate #-}
13391390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1340−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13411392
13421393{-# INLINE traceInvalidate #-}
13431394traceInvalidate :: String -> IO ()
1344−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13451400
1346−{-# INLINE traceWhen #-}
1347−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1348−traceWhen p b message = traceMWhen p b $ return message
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
13491404
1350−{-# INLINE traceMWhen #-}
1351−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1352−traceMWhen _ b getMessage = when b $ do
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13531408 message <- getMessage
1354−#ifdef DEBUG
1355− spiderTimeline <- askSpiderTimelineEnv
1356− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13571412#else
1358− 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+
13591448#endif
1360− liftIO $ putStrLn $ replicate d ' ' <> message
13611449
13621450whoCreatedIORef :: IORef a -> IO [String]
13631451whoCreatedIORef (IORef a) = whoCreated $! a
13641452
1365−#ifdef DEBUG_CYCLES
13661453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13671454groupByHead = \case
13681455 [] -> []
@@ -1373,20 +1460,54 @@ groupByHead = \case
13731460 | otherwise -> (x, xs :| []) : l
13741461
13751462listsToForest :: Eq a => [[a]] -> Forest a
1376−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+
13771495#endif
13781496
1497+
13791498{-# INLINE propagateSubscriberHold #-}
13801499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13811500propagateSubscriberHold h a = do
1382− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13831502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13841503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13851505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13861506 case {-# SCC "apply" #-} apply a v of
13871507 Nothing -> return ()
13881508 Just v' -> do
1389− {-# 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)
13901511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13911512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13921513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1440,7 +1561,7 @@ getDynHold d = do
14401561zeroRef :: IORef Height
14411562zeroRef = unsafePerformIO $ newIORef zeroHeight
14421563
1443−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)
14441565getRootSubscribed k r sub = do
14451566 mSubscribed <- readIORef $ rootSubscribed r
14461567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1454,7 +1575,9 @@ getRootSubscribed k r sub = do
14541575 let !cached = rootSubscribed r
14551576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14561577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1457− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14581581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14591582 writeIORef uninitRef $! uninit
14601583#ifdef DEBUG_NODEIDS
@@ -1504,6 +1627,9 @@ data FanInt x a = FanInt
15041627 { _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
15051628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
15061629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
15071633 }
15081634
15091635newFanInt :: IO (FanInt x a)
@@ -1511,10 +1637,16 @@ newFanInt = do
15111637 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
15121638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
15131639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
15141643 return $ FanInt
15151644 { _fanInt_subscribers = subscribers
15161645 , _fanInt_subscriptionRef = subscriptionRef
15171646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
15181650 }
15191651
15201652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1523,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
15231655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15241656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15251657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1526− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
15271660 { subscriberPropagate = \m -> do
15281661 liftIO $ writeIORef (_fanInt_occRef self) m
15291662 scheduleIntClear $ _fanInt_occRef self
1530− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1531− 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 ->
15321665 subscriberPropagate s v
1533− , subscriberInvalidateHeight = \old -> do
1534− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1535− FastWeakBag.traverse_ b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15361669 subscriberInvalidateHeight s old
1537− , subscriberRecalculateHeight = \new -> do
1538− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1539− FastWeakBag.traverse_ b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15401673 subscriberRecalculateHeight s new
15411674 }
15421675 liftIO $ do
@@ -1550,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15501683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15511684 return b
15521685 Just b -> return b
1553− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15541687 currentOcc <- readIORef (_fanInt_occRef self)
1555− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1556− 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+
15571705
15581706{-# INLINABLE getFanSubscribed #-}
15591707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1751,7 +1899,7 @@ mergeCheap
17511899 => (forall a. q a -> Event x (v a))
17521900 -> DynamicS x (PatchDMap k q)
17531901 -> Event x (DMap k v)
1754−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17551903 where
17561904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17571905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1766,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17661914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17671915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17681916 forM_ mOldSubd $ \oldSubd -> do
1769− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17701920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17711921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17721922 foldM f ([], oldParents) $ DMap.toList p
@@ -1791,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17911941 => (forall a. q a -> Event x (v a))
17921942 -> DynamicS x (PatchDMapWithMove k q)
17931943 -> Event x (DMap k v)
1794−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17951945 where
17961946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17971947 updateMe subscriber heightBagRef oldParents p = do
@@ -1810,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
18101960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
18111961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
18121962 Nothing -> do
1813− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
18141966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
18151967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
18161968 Just toKey -> do
18171969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
18181970 return Nothing
1819− 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+
18201974 return (toDelete, applyAlways p' oldParents)
18211975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
18221976 getInitialSubscribers initialParents subscriber = do
@@ -1841,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18411995 -> p
18421996 -> EventM x ([EventSubscription x], DMap k s)
18431997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18442000type MergeInitFunc k v q x s
18452001 = DMap k q
18462002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1864,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18642020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18652021invalidateMergeHeight' heightRef sub = do
18662022 oldHeight <- readIORef heightRef
1867− 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
18682025 writeIORef heightRef $! invalidHeight
18692026 subscriberInvalidateHeight sub oldHeight
18702027
18712028revalidateMergeHeight :: Merge x k v s -> IO ()
18722029revalidateMergeHeight m = do
18732030 currentHeight <- readIORef $ _merge_heightRef m
1874− 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
18752034 heights <- readIORef $ _merge_heightBagRef m
18762035 parents <- readIORef $ _merge_parentsRef m
18772036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1879,7 +2038,7 @@ revalidateMergeHeight m = do
18792038 LT -> return ()
18802039 EQ -> do
18812040 let height = succHeight $ heightBagMax heights
1882− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18832042 writeIORef (_merge_heightRef m) $! height
18842043 subscriberRecalculateHeight (_merge_sub m) height
18852044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1887,36 +2046,45 @@ revalidateMergeHeight m = do
18872046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18882047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18892048 vals <- liftIO $ readIORef $ _merge_accumRef m
1890− 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
18912052 --TODO: Assert that m is not empty
18922053 subscriberPropagate (_merge_sub m) vals
18932054
1894−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1895−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
18962078 { subscriberPropagate = \a -> do
18972079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18982080 k <- getKey
1899− 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
19002082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
19012083 liftIO $ writeIORef (_merge_accumRef m) $! newM
19022084 when (DMap.null oldM) $ do -- Only schedule the firing once
19032085 height <- liftIO $ readIORef $ _merge_heightRef m
1904− --TODO: assertions about height
1905− currentHeight <- getCurrentHeight
1906− when (height <= currentHeight) $ do
1907− if height /= invalidHeight
1908− then do
1909− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1910− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1911− else liftIO $ do
1912−#ifdef DEBUG_CYCLES
1913− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1914− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1915− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1916−#else
1917− let cycleInfo = ""
1918−#endif
1919− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
19202088 scheduleMergeSelf m height
19212089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
19222090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1927,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
19272095 }
19282096
19292097--TODO: Be able to run as much of this as possible promptly
1930−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1931−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)
19322100 where updateMe = do
19332101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1934− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19352103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19362104 return subscriptionsToKill
19372105
19382106{-# INLINE mergeGCheap' #-}
19392107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1940− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1941−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
19422110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19432111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19442112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19452113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19462114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1947− 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
19482130 { _merge_parentsRef = parentsRef
19492131 , _merge_heightBagRef = heightBagRef
19502132 , _merge_heightRef = heightRef
19512133 , _merge_sub = sub
19522134 , _merge_accumRef = accumRef
19532135 }
1954− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19552137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19562138 myHeight = if invalidHeight `elem` heights
19572139 then invalidHeight
@@ -1960,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19602142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19612143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19622144 else (Nothing, dm)
1963− unless (DMap.null accum) $ do
1964− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19652146 liftIO $ writeIORef accumRef $! accum
19662147 liftIO $ writeIORef heightRef $! myHeight
19672148 liftIO $ writeIORef heightBagRef $! myHeightBag
1968− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19692149 liftIO $ writeIORef parentsRef $! initialParentState
19702150 defer $ SomeMergeInit $ do
1971− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19722152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1973− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1974− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19752155 , subscriberInvalidateHeight = \_ -> return ()
19762156 , subscriberRecalculateHeight = \_ -> return ()
19772157 }
1978− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1979− 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
19802160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19812161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19822162 -- its subscription.
1983− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19842164 let unsubscribeAll = destroy =<< readIORef parentsRef
1985− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1986− , occ
1987− )
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
19882168
19892169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19902170mergeInt = cacheEvent . mergeIntCheap
@@ -1997,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
19972177 heightRef <- liftIO $ newIORef zeroHeight
19982178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19992179 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+ }
20002190 let scheduleSelf = do
20012191 height <- liftIO $ readIORef $ heightRef
20022192 scheduleMerge' height heightRef $ do
20032193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
20042194 subscriberPropagate sub vals
2005− invalidateMyHeight = do
2006− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
20072196 recalculateMyHeight = do
20082197 currentHeight <- readIORef heightRef
20092198 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?
@@ -2013,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
20132202 LT -> return ()
20142203 EQ -> do
20152204 let height = succHeight $ heightBagMax heights
2016− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
20172206 writeIORef heightRef $! height
20182207 subscriberRecalculateHeight sub height
20192208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
20202209 mySubscriber k = Subscriber
20212210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
20222213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
20232214 liftIO $ FastMutableIntMap.insert accum k a
20242215 when wasEmpty scheduleSelf
@@ -2052,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20522243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20532244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20542245 return Nothing
2055− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20562246 defer $ SomeMergeInit $ do
20572247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20582248 where
@@ -2066,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20662256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20672257 liftIO $ for_ oldParents $ \oldParent -> do
20682258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20692261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20702262 return $ IntMap.elems oldParents
2071− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20722264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20732265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20742266 defer $ updateMe a
20752267 , subscriberInvalidateHeight = \_ -> return ()
20762268 , subscriberRecalculateHeight = \_ -> return ()
20772269 }
2078− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20792271 forM_ change $ \c -> defer $ updateMe c
20802272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20812273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20822274 -- its subscription.
2083− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20842276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2085− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2086− , occ
2087− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20882280
20892281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20902282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2167,19 +2359,19 @@ runFrame a = SpiderHost $ do
21672359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21682360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21692361 writeIORef vRef v
2170− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21712363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21722364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21732365 writeIORef (eventEnvMergeUpdates env) []
2174− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21752367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2176− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21772369 toReconnect <- readIORef toReconnectRef
21782370 clearEventEnv env
21792371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21802372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21812373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2182− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21832375 finalize wi
21842376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21852377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2193,7 +2385,7 @@ runFrame a = SpiderHost $ do
21932385 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
21942386 {-
21952387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2196− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21972389 EventRoot _ -> "EventRoot"
21982390 EventNever -> "EventNever"
21992391 _ -> "something else"
@@ -2328,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
23282520 {-# INLINABLE headE #-}
23292521 headE = R.slowHeadE
23302522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
23312525
23322526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
23332527 {-# INLINABLE sample #-}
@@ -2349,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23492543 {-# INLINABLE headE #-}
23502544 headE = R.slowHeadE
23512545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23522549
23532550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23542551 {-# INLINE return #-}
@@ -2357,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23572554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23582555 {-# INLINE (>>) #-}
23592556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
23602558 {-# INLINE fail #-}
23612559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23622561
23632562{-# INLINABLE newJoinDyn #-}
23642563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2410,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24102609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
24112610 {-# INLINABLE headE #-}
24122611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
24132615
24142616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
24152617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2426,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
24262628 {-# INLINABLE headE #-}
24272629 headE = R.slowHeadE
24282630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
24292633
24302634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
24312635 {-# INLINABLE sample #-}
@@ -2446,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24462650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24472651 {-# INLINABLE headE #-}
24482652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24492655
24502656--------------------------------------------------------------------------------
24512657-- Deprecated items
@@ -2483,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24832689 touch h
24842690 return result
24852691
2486−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24872693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24882694 newFanEventWithTrigger f = SpiderHost $ do
24892695 es <- newFanEventWithTriggerIO f
24902696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24912697
2492−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24932699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24942700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24952701 es <- newFanEventWithTriggerIO f
@@ -2569,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25692775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25702776 {-# INLINABLE mergeG #-}
25712777 mergeG
2572− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25732779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25742780 -> DMap k q
25752781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2637,8 +2843,14 @@ instance Monad (SpiderHost x) where
26372843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
26382844 {-# INLINABLE return #-}
26392845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
26402847 {-# INLINABLE fail #-}
2641− fail s = SpiderHost $ fail s
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2853+ fail s = SpiderHost $ MonadFail.fail s
26422854
26432855-- | Run an action affecting the global Spider timeline; this will be guarded by
26442856-- a mutex for that timeline
@@ -2660,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
26602872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26612873 {-# INLINABLE return #-}
26622874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
26632876 {-# INLINABLE fail #-}
26642877 fail s = SpiderHostFrame $ fail s
2878+#endif
26652879
26662880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26672881 notReadyUntil _ = pure ()
26682882 notReady = pure ()
26692883
2670−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)
26712885newEventWithTriggerIO f = do
26722886 es <- newFanEventWithTriggerIO $ \Refl -> f
26732887 return $ select es Refl
26742888
2675−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)
26762890newFanEventWithTriggerIO f = do
26772891 occRef <- newIORef DMap.empty
26782892 subscribedRef <- newIORef DMap.empty
@@ -2713,4 +2927,4 @@ instance NotReady (SpiderTimeline x) (SpiderHost x) where
27132927
27142928instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
27152929 notReadyUntil _ = return ()
2716− notReady = return ()
2930+ notReady = return ()