@@ -9,6 +9,7 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
1213{-# LANGUAGE RankNTypes #-}
1314{-# LANGUAGE RoleAnnotations #-}
1415{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,7 +20,6 @@
1920{-# LANGUAGE DeriveFunctor #-}
2021{-# LANGUAGE StandaloneDeriving #-}
2122{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
2323
2424#ifdef USE_REFLEX_OPTIMIZER
2525{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +38,16 @@ 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_)
4142import Control.Monad.Reader.Class
4243import Control.Monad.IO.Class
4344import Control.Monad.ReaderIO
4445import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
4646import qualified Control.Monad.Fail as MonadFail
4747import Data.Align
4848import Data.Coerce
49−import Data.Dependent.Map (DMap)
49+import Data.Dependent.Map (DMap, DSum (..))
5050import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5251import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5352import qualified Data.FastMutableIntMap as FastMutableIntMap
5453import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +60,12 @@ import qualified Data.IntMap.Strict as IntMap
6160import Data.IORef
6261import Data.Kind (Type)
6362import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
63+import Data.Monoid ((<>))
6564import Data.Proxy
6665import Data.These
6766import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6967import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
68+import GHC.Exts
7169import GHC.IORef (IORef (..))
7270import GHC.Stack
7371import Reflex.FastWeak
@@ -86,16 +84,14 @@ import Data.Zip (Zip (..))
8684
8785#ifdef DEBUG_CYCLES
8886import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9187import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9288import qualified Data.List.NonEmpty as NonEmpty
89+import Data.Monoid (mempty)
9390import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
91+#endif
9592
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
93+import Data.FastWeakBag (FastWeakBag)
9794import qualified Data.FastWeakBag as FastWeakBag
98−
9995import Data.Reflection
10096import Data.Some (Some(Some))
10197import Data.Type.Coercion
@@ -106,26 +102,21 @@ import qualified Reflex.Class
106102import qualified Reflex.Class as R
107103import qualified Reflex.Host.Class
108104import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
105+import Reflex.Patch
106+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
111107import Reflex.PerformEvent.Base (PerformEventT)
112108
113109#ifdef DEBUG_TRACE_EVENTS
114110import qualified Data.ByteString.Char8 as BS8
115111import System.IO (stderr)
116−import Data.List (isPrefixOf)
117112#endif
118113
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123114#ifdef DEBUG_TRACE_EVENTS
115+
124116withStackOneLine :: (BS8.ByteString -> a) -> a
125117withStackOneLine expr = unsafePerformIO $ do
126118 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
119+ return (expr (BS8.pack (unwords (reverse stack))))
129120
130121#endif
131122
@@ -136,42 +127,28 @@ debugInvalidateHeight :: Bool
136127debugInvalidate :: Bool
137128
138129#ifdef DEBUG
130+
139131#define DEBUG_NODEIDS
140132
141−#ifdef DEBUG_TRACE_PROPAGATION
142133debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146134
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150135debugInvalidateHeight = False
151−#endif
152136
153−#ifdef DEBUG_TRACE_INVALIDATION
154137debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158138
159139class HasNodeId a where
160140 getNodeId :: a -> Int
161141
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
142+instance HasNodeId (Hold x p a) where
169143 getNodeId = holdNodeId
170144
145+instance HasNodeId (PushSubscribed x a b) where
146+ getNodeId = pushSubscribedNodeId
147+
171148instance HasNodeId (SwitchSubscribed x a) where
172149 getNodeId = switchSubscribedNodeId
173150
174−instance HasNodeId (FanSubscribed x v a) where
151+instance HasNodeId (FanSubscribed x a) where
175152 getNodeId = fanSubscribedNodeId
176153
177154instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +162,41 @@ instance HasNodeId (Pull x a) where
185162
186163{-# INLINE showNodeId #-}
187164showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
165+showNodeId = ("#"<>) . show . getNodeId
166+
167+showSubscriberType :: Subscriber x a -> String
168+showSubscriberType = \case
169+ SubscriberPush _ _ -> "SubscriberPush"
170+ SubscriberMerge _ _ -> "SubscriberMerge"
171+ SubscriberFan _ -> "SubscriberFan"
172+ SubscriberMergeChange _ -> "SubscriberMergeChange"
173+ SubscriberHold _ -> "SubscriberHold"
174+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
175+ SubscriberSwitch _ -> "SubscriberSwitch"
176+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
177+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
178+ SubscriberHandle -> "SubscriberHandle"
179+
180+showEventType :: Event x a -> String
181+showEventType = \case
182+ EventRoot _ _ -> "EventRoot"
183+ EventNever -> "EventNever"
184+ EventPush _ -> "EventPush"
185+ EventMerge _ -> "EventMerge"
186+ EventFan _ _ -> "EventFan"
187+ EventSwitch _ -> "EventSwitch"
188+ EventCoincidence _ -> "EventCoincidence"
189+ EventHold _ -> "EventHold"
190+ EventDyn _ -> "EventDyn"
191+ EventHoldIdentity _ -> "EventHoldIdentity"
192+ EventDynIdentity _ -> "EventDynIdentity"
193193
194194#else
195195
196196debugPropagate = False
197+
197198debugInvalidateHeight = False
199+
198200debugInvalidate = False
199201
200202-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +204,6 @@ debugInvalidate = False
202204showNodeId :: a -> String
203205showNodeId _ = ""
204206
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209207#endif
210208
211209#ifdef DEBUG_NODEIDS
@@ -251,9 +249,9 @@ subscribeAndRead = unEvent
251249-- caching; if the computation function is very cheap, this is (much) more
252250-- efficient than 'push'
253251{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
252+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255253pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
254+ (subscription, occ) <- subscribeAndRead e $ sub
257255 { subscriberPropagate = \a -> do
258256 mb <- f a
259257 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +270,10 @@ terminalSubscriber p = Subscriber
272270
273271-- | Subscribe to an Event only for the duration of one occurrence
274272{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
273+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276274subscribeAndReadHead e sub = do
277275 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
276+ (subscription, occ) <- subscribeAndRead e $ sub
279277 { subscriberPropagate = \a -> do
280278 liftIO $ unsubscribe =<< readIORef subscriptionRef
281279 subscriberPropagate sub a
@@ -286,42 +284,24 @@ subscribeAndReadHead e sub = do
286284 return (subscription, occ)
287285
288286--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
287+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290288headE originalE = do
291289 parent <- liftIO $ newIORef $ Just originalE
292290 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293291 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
292+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295293 when (isJust occ) clearParent
296− return $ Event $ \sub ->
294+ return $ Event $ \sub -> do
297295 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
296+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299297 Just e -> subscribeAndReadHead e sub
300298
301299data CacheSubscribed x a
302300 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303301 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304302 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308303 }
309304
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−
325305-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326306-- repeatedly
327307--
@@ -346,23 +326,18 @@ cacheEvent e =
346326 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347327 Just subscribedTicket -> return subscribedTicket
348328 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352329 subscribers <- liftIO FastWeakBag.empty
353330 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
357331 (parentSub, occ) <- subscribeAndRead e $ Subscriber
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− }
332+ { subscriberPropagate = \a -> do
333+ liftIO $ writeIORef occRef $ Just a
334+ scheduleClear occRef
335+ propagateFast a subscribers
336+ , subscriberInvalidateHeight = \old -> do
337+ FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
338+ , subscriberRecalculateHeight = \new -> do
339+ FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
340+ }
366341 when (isJust occ) $ do
367342 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368343 scheduleClear occRef
@@ -370,45 +345,29 @@ cacheEvent e =
370345 { _cacheSubscribed_subscribers = subscribers
371346 , _cacheSubscribed_parent = parentSub
372347 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376348 }
377349 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378350 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379351 return subscribedTicket
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−
352+ liftIO $ do
353+ subscribed <- getFastWeakTicketValue subscribedTicket
354+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
355+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
356+ let es = EventSubscription
357+ { _eventSubscription_unsubscribe = do
358+ FastWeakBag.remove ticket
359+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
360+ when isEmpty $ do
361+ writeIORef mSubscribedRef emptyFastWeak
362+ unsubscribe $ _cacheSubscribed_parent subscribed
363+ touch ticket
364+ touch subscribedTicket
365+ , _eventSubscription_subscribed = EventSubscribed
366+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
367+ , eventSubscribedRetained = toAny subscribedTicket
368+ }
369+ }
370+ return (es, occ)
412371
413372subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414373subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +379,11 @@ wrap tag getSpecificSubscribed sub = do
420379 let es = tag subd
421380 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422381
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
382+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424383eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425384
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429385eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
386+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431387
432388eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433389eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +420,16 @@ data Subscriber x a = Subscriber
464420 , subscriberRecalculateHeight :: !(Height -> IO ())
465421 }
466422
423+--TODO: Move this comment to WeakBag
424+-- These function are constructor functions that are marked NOINLINE so they are
425+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
426+-- so any weak references that are attached to the constructors will have their
427+-- finalizer run. Using the opaque constructor, does not see the
428+-- constructor application, so it behaves like an IORef and cannot be fused away.
429+--
430+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
431+-- the weak pointer to it in some cases.
432+
467433newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468434newSubscriberHold h = return $ Subscriber
469435 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +438,10 @@ newSubscriberHold h = return $ Subscriber
472438 }
473439
474440newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
441+newSubscriberFan subscribed = return $ Subscriber
476442 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477443 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
444+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479445 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480446 scheduleClear $ fanSubscribedOccurrence subscribed
481447 let f _ (Pair v subsubs) = do
@@ -484,40 +450,50 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484450 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485451 return ()
486452 , subscriberInvalidateHeight = \old -> do
453+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487454 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488455 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
456+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489457 , subscriberRecalculateHeight = \new -> do
458+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490459 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491460 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
461+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492462 }
493463
494464newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
465+newSubscriberSwitch subscribed = return $ Subscriber
496466 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
467+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497468 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498469 scheduleClear $ switchSubscribedOccurrence subscribed
499470 propagate a $ switchSubscribedSubscribers subscribed
500471 , subscriberInvalidateHeight = \_ -> do
472+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501473 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502474 when (oldHeight /= invalidHeight) $ do
503475 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504476 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
477+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
478+ , subscriberRecalculateHeight = \new -> do
479+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
480+ updateSwitchHeight new subscribed
481+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
482+ }
507483
508484newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
485+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510486 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
487+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511488 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512489 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513490 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514491 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515492 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517493 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518494 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519495 case occ of
520− Nothing ->
496+ Nothing -> do
521497 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522498 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523499 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -526,13 +502,20 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
526502 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527503 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528504 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
505+ , subscriberInvalidateHeight = \_ -> do
506+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
507+ invalidateCoincidenceHeight subscribed
508+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
509+ , subscriberRecalculateHeight = \_ -> do
510+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
511+ recalculateCoincidenceHeight subscribed
512+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531513 }
532514
533515newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
516+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535517 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
518+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536519 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537520 case occ of
538521 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +523,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540523 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541524 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542525 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
526+ , subscriberInvalidateHeight = \_ -> do
527+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
528+ invalidateCoincidenceHeight subscribed
529+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
530+ , subscriberRecalculateHeight = \_ -> do
531+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
532+ recalculateCoincidenceHeight subscribed
533+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545534 }
546535
547536invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,15 +540,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551540recalculateSubscriberHeight = flip subscriberRecalculateHeight
552541
553542-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
543+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
544+propagate a subscribers = withIncreasedDepth $ do
556545 -- 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
557546 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558547 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
559548
560549-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
550+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
551+propagateFast a subscribers = withIncreasedDepth $ do
563552 -- 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
564553 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565554 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -580,7 +569,7 @@ data EventSubscribed x = EventSubscribed
580569 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581570 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582571#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
572+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584573 , eventSubscribedHasOwnHeightRef :: !Bool
585574 , eventSubscribedWhoCreated :: !(IO [String])
586575#endif
@@ -607,23 +596,13 @@ eventSubscribedNever = EventSubscribed
607596 , eventSubscribedWhoCreated = return ["never"]
608597#endif
609598 }
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− }
620599
621600eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622601eventSubscribedFan !subscribed = EventSubscribed
623602 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624603 , eventSubscribedRetained = toAny subscribed
625604#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
605+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627606 , eventSubscribedHasOwnHeightRef = False
628607 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629608#endif
@@ -636,7 +615,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636615#ifdef DEBUG_CYCLES
637616 , eventSubscribedGetParents = do
638617 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
618+ return [Some $ _eventSubscription_subscribed s]
640619 , eventSubscribedHasOwnHeightRef = True
641620 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642621#endif
@@ -649,8 +628,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649628#ifdef DEBUG_CYCLES
650629 , eventSubscribedGetParents = do
651630 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
631+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
632+ innerParents = maybeToList $ fmap Some innerSubscription
654633 return $ outerParent : innerParents
655634 , eventSubscribedHasOwnHeightRef = True
656635 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +643,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664643whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665644whoCreatedEventSubscribed = eventSubscribedWhoCreated
666645
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
646+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668647walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
648+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670649 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671650 when (h == invalidHeight) $ do
672651 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
652+ modify (Some s :)
674653 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
654+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676655 return subscribers
677656#endif
678657
@@ -996,9 +975,13 @@ instance Monad (BehaviorM x) where
996975 return x = BehaviorM $ return x
997976#if !MIN_VERSION_base(4,13,0)
998977 {-# INLINE fail #-}
999− fail s = BehaviorM $ fail s
978+ fail s = MonadFail.fail
1000979#endif
1001980
981+instance MonadFail (SpiderHost x) where
982+ {-# INLINABLE fail #-}
983+ fail s = BehaviorM $ fail s
984+
1002985data BehaviorSubscribed x a
1003986 = forall p. BehaviorSubscribedHold (Hold x p)
1004987 | BehaviorSubscribedPull (PullSubscribed x a)
@@ -1057,7 +1040,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571040newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581041
10591042-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1043+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
10611044
10621045newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631046
@@ -1082,8 +1065,7 @@ heightBagFromList :: [Height] -> HeightBag
10821065heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831066
10841067heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1068+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871069
10881070heightBagRemove :: Height -> HeightBag -> HeightBag
10891071heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1074,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921074 0 -> IntMap.delete h c
10931075 _ -> IntMap.insert h (pred old) c
10941076
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−
11021077heightBagMax :: HeightBag -> Height
11031078heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041079 Just ((h, _), _) -> Height h
@@ -1346,110 +1321,55 @@ mkWeakPtrWithDebug x debugNote = do
13461321 x' <- evaluate x
13471322 mkWeakPtr x' $
13481323 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1324+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501325 else Nothing
13511326
13521327type WeakList a = [Weak a]
13531328
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
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−
13811329{-# 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
1330+#ifdef DEBUG
1331+withIncreasedDepth :: CanTrace x m => m a -> m a
1332+withIncreasedDepth a = do
1333+ spiderTimeline <- askSpiderTimelineEnv
1334+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
13851335 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1336+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
13871337 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121338#else
1339+withIncreasedDepth :: m a -> m a
1340+withIncreasedDepth = id
1341+#endif
14131342
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1343+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171344
14181345{-# INLINE tracePropagate #-}
14191346tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1347+tracePropagate p = traceWhen p debugPropagate
14211348
14221349{-# INLINE traceInvalidate #-}
14231350traceInvalidate :: 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
1351+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331352
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 ()
1353+{-# INLINE traceWhen #-}
1354+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1355+traceWhen p b message = traceMWhen p b $ return message
14471356
1357+{-# INLINE traceMWhen #-}
1358+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1359+traceMWhen _ b getMessage = when b $ do
1360+ message <- getMessage
1361+#ifdef DEBUG
1362+ spiderTimeline <- askSpiderTimelineEnv
1363+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1364+#else
1365+ let d = 0
14481366#endif
1367+ liftIO $ putStrLn $ replicate d ' ' <> message
14491368
14501369whoCreatedIORef :: IORef a -> IO [String]
14511370whoCreatedIORef (IORef a) = whoCreated $! a
14521371
1372+#ifdef DEBUG_CYCLES
14531373groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541374groupByHead = \case
14551375 [] -> []
@@ -1460,54 +1380,20 @@ groupByHead = \case
14601380 | otherwise -> (x, xs :| []) : l
14611381
14621382listsToForest :: Eq a => [[a]] -> Forest a
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
1383+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741384#endif
14751385
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1495−#endif
1496−
1497−
14981386{-# INLINE propagateSubscriberHold #-}
14991387propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001388propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1389+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021390 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031391 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051392 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061393 case {-# SCC "apply" #-} apply a v of
15071394 Nothing -> return ()
15081395 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1396+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111397 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121398 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131399 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1561,7 +1447,7 @@ getDynHold d = do
15611447zeroRef :: IORef Height
15621448zeroRef = unsafePerformIO $ newIORef zeroHeight
15631449
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)
1450+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651451getRootSubscribed k r sub = do
15661452 mSubscribed <- readIORef $ rootSubscribed r
15671453 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1461,7 @@ getRootSubscribed k r sub = do
15751461 let !cached = rootSubscribed r
15761462 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771463 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1464+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811465 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821466 writeIORef uninitRef $! uninit
15831467#ifdef DEBUG_NODEIDS
@@ -1627,9 +1511,6 @@ data FanInt x a = FanInt
16271511 { _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
16281512 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291513 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331514 }
16341515
16351516newFanInt :: IO (FanInt x a)
@@ -1637,16 +1518,10 @@ newFanInt = do
16371518 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
16381519 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391520 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431521 return $ FanInt
16441522 { _fanInt_subscribers = subscribers
16451523 , _fanInt_subscriptionRef = subscriptionRef
16461524 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501525 }
16511526
16521527fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1530,20 @@ fanInt p = unsafePerformIO $ do
16551530 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561531 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571532 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1533+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601534 { subscriberPropagate = \m -> do
16611535 liftIO $ writeIORef (_fanInt_occRef self) m
16621536 scheduleIntClear $ _fanInt_occRef self
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 ->
1537+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1538+ FastWeakBag.traverse_ b $ \s -> do
16651539 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1540+ , subscriberInvalidateHeight = \old -> do
1541+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1542+ FastWeakBag.traverse_ b $ \s -> do
16691543 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1544+ , subscriberRecalculateHeight = \new -> do
1545+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1546+ FastWeakBag.traverse_ b $ \s -> do
16731547 subscriberRecalculateHeight s new
16741548 }
16751549 liftIO $ do
@@ -1683,25 +1557,10 @@ fanInt p = unsafePerformIO $ do
16831557 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841558 return b
16851559 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1560+ t <- liftIO $ FastWeakBag.insert sub b
16871561 currentOcc <- readIORef (_fanInt_occRef self)
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−
1562+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1563+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051564
17061565{-# INLINABLE getFanSubscribed #-}
17071566getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1899,7 +1758,7 @@ mergeCheap
18991758 => (forall a. q a -> Event x (v a))
19001759 -> DynamicS x (PatchDMap k q)
19011760 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1761+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031762 where
19041763 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051764 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1773,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141773 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151774 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161775 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1776+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201777 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211778 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221779 foldM f ([], oldParents) $ DMap.toList p
@@ -1941,7 +1798,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411798 => (forall a. q a -> Event x (v a))
19421799 -> DynamicS x (PatchDMapWithMove k q)
19431800 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1801+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451802 where
19461803 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471804 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1817,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601817 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611818 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621819 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1820+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661821 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671822 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681823 Just toKey -> do
19691824 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701825 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1826+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741827 return (toDelete, applyAlways p' oldParents)
19751828 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761829 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1848,6 @@ type MergeUpdateFunc k v x p s
19951848 -> p
19961849 -> EventM x ([EventSubscription x], DMap k s)
19971850
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001851type MergeInitFunc k v q x s
20011852 = DMap k q
20021853 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1871,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201871invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211872invalidateMergeHeight' heightRef sub = do
20221873 oldHeight <- readIORef heightRef
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
1874+ when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
20251875 writeIORef heightRef $! invalidHeight
20261876 subscriberInvalidateHeight sub oldHeight
20271877
20281878revalidateMergeHeight :: Merge x k v s -> IO ()
20291879revalidateMergeHeight m = do
20301880 currentHeight <- readIORef $ _merge_heightRef m
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
1881+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341882 heights <- readIORef $ _merge_heightBagRef m
20351883 parents <- readIORef $ _merge_parentsRef m
20361884 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1886,7 @@ revalidateMergeHeight m = do
20381886 LT -> return ()
20391887 EQ -> do
20401888 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1889+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421890 writeIORef (_merge_heightRef m) $! height
20431891 subscriberRecalculateHeight (_merge_sub m) height
20441892 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1894,36 @@ revalidateMergeHeight m = do
20461894scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471895scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481896 vals <- liftIO $ readIORef $ _merge_accumRef m
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
1897+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
20521898 --TODO: Assert that m is not empty
20531899 subscriberPropagate (_merge_sub m) vals
20541900
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
1901+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1902+mergeSubscriber m getKey = Subscriber
20781903 { subscriberPropagate = \a -> do
20791904 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801905 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1906+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821907 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831908 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841909 when (DMap.null oldM) $ do -- Only schedule the firing once
20851910 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1911+ --TODO: assertions about height
1912+ currentHeight <- getCurrentHeight
1913+ when (height <= currentHeight) $ do
1914+ if height /= invalidHeight
1915+ then do
1916+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1917+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1918+ else liftIO $ do
1919+#ifdef DEBUG_CYCLES
1920+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1921+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1922+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1923+#else
1924+ let cycleInfo = ""
1925+#endif
1926+ error $ "Causality loop found" <> cycleInfo
20881927 scheduleMergeSelf m height
20891928 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901929 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1934,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951934 }
20961935
20971936--TODO: Be able to run as much of this as possible promptly
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)
1937+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1938+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001939 where updateMe = do
21011940 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1941+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031942 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041943 return subscriptionsToKill
21051944
21061945{-# INLINE mergeGCheap' #-}
21071946mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
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
1947+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1948+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101949 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111950 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121951 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131952 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141953 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
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
1954+ let m = Merge
21301955 { _merge_parentsRef = parentsRef
21311956 , _merge_heightBagRef = heightBagRef
21321957 , _merge_heightRef = heightRef
21331958 , _merge_sub = sub
21341959 , _merge_accumRef = accumRef
21351960 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1961+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371962 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381963 myHeight = if invalidHeight `elem` heights
21391964 then invalidHeight
@@ -2142,29 +1967,31 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421967 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431968 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441969 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1970+ unless (DMap.null accum) $ do
1971+ scheduleMergeSelf m myHeight
21461972 liftIO $ writeIORef accumRef $! accum
21471973 liftIO $ writeIORef heightRef $! myHeight
21481974 liftIO $ writeIORef heightBagRef $! myHeightBag
1975+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491976 liftIO $ writeIORef parentsRef $! initialParentState
21501977 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1978+ let s = Subscriber
21521979 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1980+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1981+ defer $ updateMerge m updateFunc a
21551982 , subscriberInvalidateHeight = \_ -> return ()
21561983 , subscriberRecalculateHeight = \_ -> return ()
21571984 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1985+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1986+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601987 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611988 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621989 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1990+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641991 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
1992+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1993+ , occ
1994+ )
21681995
21691996mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701997mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +2004,13 @@ mergeIntCheap d = Event $ \sub -> do
21772004 heightRef <- liftIO $ newIORef zeroHeight
21782005 heightBagRef <- liftIO $ newIORef heightBagEmpty
21792006 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− }
21902007 let scheduleSelf = do
21912008 height <- liftIO $ readIORef $ heightRef
21922009 scheduleMerge' height heightRef $ do
21932010 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21942011 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2012+ invalidateMyHeight = do
2013+ invalidateMergeHeight' heightRef sub
21962014 recalculateMyHeight = do
21972015 currentHeight <- readIORef heightRef
21982016 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?
@@ -2202,14 +2020,12 @@ mergeIntCheap d = Event $ \sub -> do
22022020 LT -> return ()
22032021 EQ -> do
22042022 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2023+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22062024 writeIORef heightRef $! height
22072025 subscriberRecalculateHeight sub height
22082026 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22092027 mySubscriber k = Subscriber
22102028 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22132029 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22142030 liftIO $ FastMutableIntMap.insert accum k a
22152031 when wasEmpty scheduleSelf
@@ -2243,6 +2059,7 @@ mergeIntCheap d = Event $ \sub -> do
22432059 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442060 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452061 return Nothing
2062+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462063 defer $ SomeMergeInit $ do
22472064 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482065 where
@@ -2256,27 +2073,25 @@ mergeIntCheap d = Event $ \sub -> do
22562073 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572074 liftIO $ for_ oldParents $ \oldParent -> do
22582075 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612076 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622077 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2078+ let s = Subscriber
22642079 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652080 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662081 defer $ updateMe a
22672082 , subscriberInvalidateHeight = \_ -> return ()
22682083 , subscriberRecalculateHeight = \_ -> return ()
22692084 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2085+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712086 forM_ change $ \c -> defer $ updateMe c
22722087 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732088 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742089 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2090+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762091 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2092+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2093+ , occ
2094+ )
22802095
22812096newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
22822097newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2359,19 +2174,19 @@ runFrame a = SpiderHost $ do
23592174 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602175 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612176 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2177+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632178 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642179 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652180 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2181+ when debugPropagate $ putStrLn "Updating merges"
23672182 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2183+ when debugPropagate $ putStrLn "Updating merges done"
23692184 toReconnect <- readIORef toReconnectRef
23702185 clearEventEnv env
23712186 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722187 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732188 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2189+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752190 finalize wi
23762191 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772192 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2200,7 @@ runFrame a = SpiderHost $ do
23852200 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
23862201 {-
23872202 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2203+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892204 EventRoot _ -> "EventRoot"
23902205 EventNever -> "EventNever"
23912206 _ -> "something else"
@@ -2520,8 +2335,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202335 {-# INLINABLE headE #-}
25212336 headE = R.slowHeadE
25222337-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252338
25262339instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272340 {-# INLINABLE sample #-}
@@ -2543,9 +2356,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432356 {-# INLINABLE headE #-}
25442357 headE = R.slowHeadE
25452358-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492359
25502360instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512361 {-# INLINE return #-}
@@ -2609,9 +2419,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092419 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102420 {-# INLINABLE headE #-}
26112421 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152422
26162423instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172424 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2435,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282435 {-# INLINABLE headE #-}
26292436 headE = R.slowHeadE
26302437-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332438
26342439instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352440 {-# INLINABLE sample #-}
@@ -2650,8 +2455,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502455 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512456 {-# INLINABLE headE #-}
26522457 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552458
26562459--------------------------------------------------------------------------------
26572460-- Deprecated items
@@ -2689,13 +2492,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892492 touch h
26902493 return result
26912494
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2495+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932496 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942497 newFanEventWithTrigger f = SpiderHost $ do
26952498 es <- newFanEventWithTriggerIO f
26962499 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972500
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2501+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992502 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002503 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012504 es <- newFanEventWithTriggerIO f
@@ -2775,7 +2578,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752578 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762579 {-# INLINABLE mergeG #-}
27772580 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2581+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792582 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802583 -> DMap k q
27812584 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2845,12 +2648,12 @@ instance Monad (SpiderHost x) where
28452648 return x = SpiderHost $ return x
28462649#if !MIN_VERSION_base(4,13,0)
28472650 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2651+ fail s = MonadFail.fail
28492652#endif
28502653
28512654instance MonadFail (SpiderHost x) where
28522655 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2656+ fail s = SpiderHost $ fail s
28542657
28552658-- | Run an action affecting the global Spider timeline; this will be guarded by
28562659-- a mutex for that timeline
@@ -2874,19 +2677,23 @@ instance Monad (SpiderHostFrame x) where
28742677 return x = SpiderHostFrame $ return x
28752678#if !MIN_VERSION_base(4,13,0)
28762679 {-# INLINABLE fail #-}
2877− fail s = SpiderHostFrame $ fail s
2680+ fail s = MonadFail.fail
28782681#endif
28792682
2683+instance MonadFail (SpiderHostFrame x) where
2684+ {-# INLINABLE fail #-}
2685+ fail s = SpiderHostFrame $ fail s
2686+
28802687instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812688 notReadyUntil _ = pure ()
28822689 notReady = pure ()
28832690
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2691+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852692newEventWithTriggerIO f = do
28862693 es <- newFanEventWithTriggerIO $ \Refl -> f
28872694 return $ select es Refl
28882695
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2696+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902697newFanEventWithTriggerIO f = do
28912698 occRef <- newIORef DMap.empty
28922699 subscribedRef <- newIORef DMap.empty