@@ -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,8 +20,6 @@
1920{-# LANGUAGE DeriveFunctor #-}
2021{-# LANGUAGE StandaloneDeriving #-}
2122{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2423#ifdef USE_REFLEX_OPTIMIZER
2524{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2625#endif
@@ -38,17 +37,15 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3837import Control.Monad.Exception
3938import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4039import Control.Monad.Primitive
40+--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4141import Control.Monad.Reader.Class
4242import Control.Monad.IO.Class
4343import Control.Monad.ReaderIO
4444import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4745import Data.Align
4846import Data.Coerce
49−import Data.Dependent.Map (DMap)
47+import Data.Dependent.Map (DMap, DSum (..))
5048import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5249import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5350import qualified Data.FastMutableIntMap as FastMutableIntMap
5451import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +58,12 @@ import qualified Data.IntMap.Strict as IntMap
6158import Data.IORef
6259import Data.Kind (Type)
6360import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
61+import Data.Monoid ((<>))
6562import Data.Proxy
6663import Data.These
6764import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6965import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
66+import GHC.Exts
7167import GHC.IORef (IORef (..))
7268import GHC.Stack
7369import Reflex.FastWeak
@@ -86,16 +82,14 @@ import Data.Zip (Zip (..))
8682
8783#ifdef DEBUG_CYCLES
8884import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9185import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9286import qualified Data.List.NonEmpty as NonEmpty
87+import Data.Monoid (mempty)
9388import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
89+#endif
9590
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
91+import Data.FastWeakBag (FastWeakBag)
9792import qualified Data.FastWeakBag as FastWeakBag
98−
9993import Data.Reflection
10094import Data.Some (Some(Some))
10195import Data.Type.Coercion
@@ -106,26 +100,20 @@ import qualified Reflex.Class
106100import qualified Reflex.Class as R
107101import qualified Reflex.Host.Class
108102import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
103+import Reflex.Patch
104+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
112105
113106#ifdef DEBUG_TRACE_EVENTS
114107import qualified Data.ByteString.Char8 as BS8
115108import System.IO (stderr)
116−import Data.List (isPrefixOf)
117109#endif
118110
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123111#ifdef DEBUG_TRACE_EVENTS
112+
124113withStackOneLine :: (BS8.ByteString -> a) -> a
125114withStackOneLine expr = unsafePerformIO $ do
126115 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
116+ return (expr (BS8.pack (unwords (reverse stack))))
129117
130118#endif
131119
@@ -136,42 +124,28 @@ debugInvalidateHeight :: Bool
136124debugInvalidate :: Bool
137125
138126#ifdef DEBUG
127+
139128#define DEBUG_NODEIDS
140129
141−#ifdef DEBUG_TRACE_PROPAGATION
142130debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146131
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150132debugInvalidateHeight = False
151−#endif
152133
153−#ifdef DEBUG_TRACE_INVALIDATION
154134debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158135
159136class HasNodeId a where
160137 getNodeId :: a -> Int
161138
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
139+instance HasNodeId (Hold x p a) where
169140 getNodeId = holdNodeId
170141
142+instance HasNodeId (PushSubscribed x a b) where
143+ getNodeId = pushSubscribedNodeId
144+
171145instance HasNodeId (SwitchSubscribed x a) where
172146 getNodeId = switchSubscribedNodeId
173147
174−instance HasNodeId (FanSubscribed x v a) where
148+instance HasNodeId (FanSubscribed x a) where
175149 getNodeId = fanSubscribedNodeId
176150
177151instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +159,41 @@ instance HasNodeId (Pull x a) where
185159
186160{-# INLINE showNodeId #-}
187161showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
162+showNodeId = ("#"<>) . show . getNodeId
163+
164+showSubscriberType :: Subscriber x a -> String
165+showSubscriberType = \case
166+ SubscriberPush _ _ -> "SubscriberPush"
167+ SubscriberMerge _ _ -> "SubscriberMerge"
168+ SubscriberFan _ -> "SubscriberFan"
169+ SubscriberMergeChange _ -> "SubscriberMergeChange"
170+ SubscriberHold _ -> "SubscriberHold"
171+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
172+ SubscriberSwitch _ -> "SubscriberSwitch"
173+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
174+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
175+ SubscriberHandle -> "SubscriberHandle"
176+
177+showEventType :: Event x a -> String
178+showEventType = \case
179+ EventRoot _ _ -> "EventRoot"
180+ EventNever -> "EventNever"
181+ EventPush _ -> "EventPush"
182+ EventMerge _ -> "EventMerge"
183+ EventFan _ _ -> "EventFan"
184+ EventSwitch _ -> "EventSwitch"
185+ EventCoincidence _ -> "EventCoincidence"
186+ EventHold _ -> "EventHold"
187+ EventDyn _ -> "EventDyn"
188+ EventHoldIdentity _ -> "EventHoldIdentity"
189+ EventDynIdentity _ -> "EventDynIdentity"
193190
194191#else
195192
196193debugPropagate = False
194+
197195debugInvalidateHeight = False
196+
198197debugInvalidate = False
199198
200199-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +201,6 @@ debugInvalidate = False
202201showNodeId :: a -> String
203202showNodeId _ = ""
204203
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209204#endif
210205
211206#ifdef DEBUG_NODEIDS
@@ -215,6 +210,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215210
216211newNodeId :: IO Int
217212newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
213+
214+{-# NOINLINE unsafeNodeId #-}
215+unsafeNodeId :: a -> Int
216+unsafeNodeId a = unsafePerformIO $ do
217+ touch a
218+ newNodeId
218219#endif
219220
220221--------------------------------------------------------------------------------
@@ -251,9 +252,9 @@ subscribeAndRead = unEvent
251252-- caching; if the computation function is very cheap, this is (much) more
252253-- efficient than 'push'
253254{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255256pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
257+ (subscription, occ) <- subscribeAndRead e $ sub
257258 { subscriberPropagate = \a -> do
258259 mb <- f a
259260 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +273,10 @@ terminalSubscriber p = Subscriber
272273
273274-- | Subscribe to an Event only for the duration of one occurrence
274275{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276277subscribeAndReadHead e sub = do
277278 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279+ (subscription, occ) <- subscribeAndRead e $ sub
279280 { subscriberPropagate = \a -> do
280281 liftIO $ unsubscribe =<< readIORef subscriptionRef
281282 subscriberPropagate sub a
@@ -286,42 +287,24 @@ subscribeAndReadHead e sub = do
286287 return (subscription, occ)
287288
288289--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)
290+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290291headE originalE = do
291292 parent <- liftIO $ newIORef $ Just originalE
292293 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293294 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295296 when (isJust occ) clearParent
296− return $ Event $ \sub ->
297+ return $ Event $ \sub -> do
297298 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
299+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299300 Just e -> subscribeAndReadHead e sub
300301
301302data CacheSubscribed x a
302303 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303304 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304305 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308306 }
309307
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−
325308-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326309-- repeatedly
327310--
@@ -336,33 +319,27 @@ cacheEvent e =
336319#else
337320 Event $
338321#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
322+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
323+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
324+ in \sub -> {-# SCC "cacheEvent" #-} do
343325#ifdef DEBUG_TRACE_EVENTS
344326 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345327#endif
346328 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347329 Just subscribedTicket -> return subscribedTicket
348330 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352331 subscribers <- liftIO FastWeakBag.empty
353332 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
357333 (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− }
334+ { subscriberPropagate = \a -> do
335+ liftIO $ writeIORef occRef $ Just a
336+ scheduleClear occRef
337+ propagateFast a subscribers
338+ , subscriberInvalidateHeight = \old -> do
339+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
340+ , subscriberRecalculateHeight = \new -> do
341+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
342+ }
366343 when (isJust occ) $ do
367344 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368345 scheduleClear occRef
@@ -370,45 +347,29 @@ cacheEvent e =
370347 { _cacheSubscribed_subscribers = subscribers
371348 , _cacheSubscribed_parent = parentSub
372349 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376350 }
377351 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378352 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379353 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−
354+ liftIO $ do
355+ subscribed <- getFastWeakTicketValue subscribedTicket
356+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
357+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
358+ let es = EventSubscription
359+ { _eventSubscription_unsubscribe = do
360+ FastWeakBag.remove ticket
361+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
362+ when isEmpty $ do
363+ writeIORef mSubscribedRef emptyFastWeak
364+ unsubscribe $ _cacheSubscribed_parent subscribed
365+ touch ticket
366+ touch subscribedTicket
367+ , _eventSubscription_subscribed = EventSubscribed
368+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
369+ , eventSubscribedRetained = toAny subscribedTicket
370+ }
371+ }
372+ return (es, occ)
412373
413374subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414375subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +381,13 @@ wrap tag getSpecificSubscribed sub = do
420381 let es = tag subd
421382 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422383
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
384+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424385eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425386
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429387eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
388+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431389
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
390+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433391eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434392
435393eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +422,16 @@ data Subscriber x a = Subscriber
464422 , subscriberRecalculateHeight :: !(Height -> IO ())
465423 }
466424
425+--TODO: Move this comment to WeakBag
426+-- These function are constructor functions that are marked NOINLINE so they are
427+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
428+-- so any weak references that are attached to the constructors will have their
429+-- finalizer run. Using the opaque constructor, does not see the
430+-- constructor application, so it behaves like an IORef and cannot be fused away.
431+--
432+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
433+-- the weak pointer to it in some cases.
434+
467435newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468436newSubscriberHold h = return $ Subscriber
469437 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +439,85 @@ newSubscriberHold h = return $ Subscriber
471439 , subscriberRecalculateHeight = \_ -> return ()
472440 }
473441
474−newSubscriberFan :: 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
442+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
443+newSubscriberFan subscribed = return $ Subscriber
476444 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477445 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
446+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479447 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480448 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
449+ let f _ (Pair (Identity v) subsubs) = do
482450 propagate v $ _fanSubscribedChildren_list subsubs
483451 return $ Constant ()
484452 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485453 return ()
486454 , subscriberInvalidateHeight = \old -> do
455+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487456 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
457+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
458+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489459 , subscriberRecalculateHeight = \new -> do
460+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490461 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
462+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
463+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492464 }
493465
494466newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
467+newSubscriberSwitch subscribed = return $ Subscriber
496468 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
469+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497470 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498471 scheduleClear $ switchSubscribedOccurrence subscribed
499472 propagate a $ switchSubscribedSubscribers subscribed
500473 , subscriberInvalidateHeight = \_ -> do
474+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501475 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502476 when (oldHeight /= invalidHeight) $ do
503477 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
478+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
479+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
480+ , subscriberRecalculateHeight = \new -> do
481+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
482+ updateSwitchHeight new subscribed
483+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
484+ }
507485
508486newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
487+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510488 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
489+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511490 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512491 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513492 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514493 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515494 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517495 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518496 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519497 case occ of
520− Nothing ->
498+ Nothing -> do
521499 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522500 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
501+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
502+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525503 Just o -> do -- Since it's already firing, no need to adjust height
526504 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527505 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528506 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
507+ , subscriberInvalidateHeight = \_ -> do
508+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
509+ invalidateCoincidenceHeight subscribed
510+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
511+ , subscriberRecalculateHeight = \_ -> do
512+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
513+ recalculateCoincidenceHeight subscribed
514+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531515 }
532516
533517newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
518+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535519 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
520+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536521 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537522 case occ of
538523 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +525,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540525 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541526 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542527 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
528+ , subscriberInvalidateHeight = \_ -> do
529+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
530+ invalidateCoincidenceHeight subscribed
531+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
532+ , subscriberRecalculateHeight = \_ -> do
533+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
534+ recalculateCoincidenceHeight subscribed
535+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545536 }
546537
547538invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +542,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551542recalculateSubscriberHeight = flip subscriberRecalculateHeight
552543
553544-- | 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) $
545+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
546+propagate a subscribers = withIncreasedDepth $ do
556547 -- 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
557548 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
549+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559550
560551-- | 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) $
552+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
553+propagateFast a subscribers = withIncreasedDepth $ do
563554 -- 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
564555 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
556+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566557
567558--------------------------------------------------------------------------------
568559-- EventSubscribed
@@ -580,7 +571,7 @@ data EventSubscribed x = EventSubscribed
580571 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581572 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582573#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
574+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584575 , eventSubscribedHasOwnHeightRef :: !Bool
585576 , eventSubscribedWhoCreated :: !(IO [String])
586577#endif
@@ -607,23 +598,13 @@ eventSubscribedNever = EventSubscribed
607598 , eventSubscribedWhoCreated = return ["never"]
608599#endif
609600 }
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− }
620601
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
602+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622603eventSubscribedFan !subscribed = EventSubscribed
623604 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624605 , eventSubscribedRetained = toAny subscribed
625606#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
607+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627608 , eventSubscribedHasOwnHeightRef = False
628609 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629610#endif
@@ -636,7 +617,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636617#ifdef DEBUG_CYCLES
637618 , eventSubscribedGetParents = do
638619 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
620+ return [Some $ _eventSubscription_subscribed s]
640621 , eventSubscribedHasOwnHeightRef = True
641622 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642623#endif
@@ -649,8 +630,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649630#ifdef DEBUG_CYCLES
650631 , eventSubscribedGetParents = do
651632 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
633+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
634+ innerParents = maybeToList $ fmap Some innerSubscription
654635 return $ outerParent : innerParents
655636 , eventSubscribedHasOwnHeightRef = True
656637 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +645,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664645whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665646whoCreatedEventSubscribed = eventSubscribedWhoCreated
666647
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
648+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668649walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
650+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670651 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671652 when (h == invalidHeight) $ do
672653 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
654+ modify (Some s :)
674655 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
656+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676657 return subscribers
677658#endif
678659
@@ -994,10 +975,8 @@ instance Monad (BehaviorM x) where
994975 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995976 {-# INLINE return #-}
996977 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998978 {-# INLINE fail #-}
999979 fail s = BehaviorM $ fail s
1000−#endif
1001980
1002981data BehaviorSubscribed x a
1003982 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +1017,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
10381017#endif
10391018 }
10401019
1041−data Root x k
1020+data Root x (k :: * -> *)
10421021 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
10431022 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
10441023 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1036,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571036newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581037
10591038-- 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)
1039+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
10611040
10621041newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631042
@@ -1082,8 +1061,7 @@ heightBagFromList :: [Height] -> HeightBag
10821061heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831062
10841063heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1064+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871065
10881066heightBagRemove :: Height -> HeightBag -> HeightBag
10891067heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1070,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921070 0 -> IntMap.delete h c
10931071 _ -> IntMap.insert h (pred old) c
10941072
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−
11021073heightBagMax :: HeightBag -> Height
11031074heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041075 Just ((h, _), _) -> Height h
@@ -1116,25 +1087,25 @@ heightBagVerify b@(HeightBag s c) = if
11161087heightBagVerify = id
11171088#endif
11181089
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1090+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1091+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1092+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1093+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231094 }
11241095
1125−data FanSubscribed x k v
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1096+data FanSubscribed (x :: *) k
1097+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1098+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1099+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291100 , fanSubscribedParent :: !(EventSubscription x)
11301101#ifdef DEBUG_NODEIDS
11311102 , fanSubscribedNodeId :: Int
11321103#endif
11331104 }
11341105
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1106+data Fan x k
1107+ = Fan { fanParent :: !(Event x (DMap k Identity))
1108+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381109 }
11391110
11401111data SwitchSubscribed x a
@@ -1239,12 +1210,18 @@ buildDynamic readV0 v' = do
12391210 return d
12401211
12411212unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1213+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1214+ where x = (readV0, v')
12441215
12451216-- ResultM can read behaviors and events
12461217type ResultM = EventM
12471218
1219+{-# NOINLINE unsafeNewIORef #-}
1220+unsafeNewIORef :: a -> b -> IORef b
1221+unsafeNewIORef a b = unsafePerformIO $ do
1222+ touch a
1223+ newIORef b
1224+
12481225instance HasSpiderTimeline x => Functor (Event x) where
12491226 fmap f = push $ return . Just . f
12501227
@@ -1257,35 +1234,26 @@ push f e = cacheEvent (pushCheap f e)
12571234
12581235{-# INLINABLE pull #-}
12591236pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1237+pull a = behaviorPull $ Pull
1238+ { pullCompute = a
1239+ , pullValue = unsafeNewIORef a Nothing
12621240#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1241+ , pullNodeId = unsafeNodeId a
12641242#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1243+ }
12721244
12731245{-# INLINABLE switch #-}
12741246switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
1247+switch a = eventSwitch $ Switch
1248+ { switchParent = a
1249+ , switchSubscribed = unsafeNewIORef a Nothing
1250+ }
12811251
12821252coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
1253+coincidence a = eventCoincidence $ Coincidence
1254+ { coincidenceParent = a
1255+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1256+ }
12891257
12901258-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911259run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
@@ -1346,110 +1314,55 @@ mkWeakPtrWithDebug x debugNote = do
13461314 x' <- evaluate x
13471315 mkWeakPtr x' $
13481316 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1317+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501318 else Nothing
13511319
13521320type WeakList a = [Weak a]
13531321
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−
13811322{-# 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
1323+#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
13851328 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1329+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
13871330 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−
14121331#else
1332+withIncreasedDepth :: m a -> m a
1333+withIncreasedDepth = id
1334+#endif
14131335
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1336+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171337
14181338{-# INLINE tracePropagate #-}
14191339tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1340+tracePropagate p = traceWhen p debugPropagate
14211341
14221342{-# INLINE traceInvalidate #-}
14231343traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1344+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14291345
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 ()
1346+{-# INLINE traceWhen #-}
1347+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1348+traceWhen p b message = traceMWhen p b $ return message
14471349
1350+{-# INLINE traceMWhen #-}
1351+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1352+traceMWhen _ b getMessage = when b $ do
1353+ message <- getMessage
1354+#ifdef DEBUG
1355+ spiderTimeline <- askSpiderTimelineEnv
1356+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1357+#else
1358+ let d = 0
14481359#endif
1360+ liftIO $ putStrLn $ replicate d ' ' <> message
14491361
14501362whoCreatedIORef :: IORef a -> IO [String]
14511363whoCreatedIORef (IORef a) = whoCreated $! a
14521364
1365+#ifdef DEBUG_CYCLES
14531366groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541367groupByHead = \case
14551368 [] -> []
@@ -1460,54 +1373,20 @@ groupByHead = \case
14601373 | otherwise -> (x, xs :| []) : l
14611374
14621375listsToForest :: 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
1376+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741377#endif
14751378
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−
14981379{-# INLINE propagateSubscriberHold #-}
14991380propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001381propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1382+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021383 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031384 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051385 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061386 case {-# SCC "apply" #-} apply a v of
15071387 Nothing -> return ()
15081388 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1389+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111390 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121391 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131392 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1561,7 +1440,7 @@ getDynHold d = do
15611440zeroRef :: IORef Height
15621441zeroRef = unsafePerformIO $ newIORef zeroHeight
15631442
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)
1443+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651444getRootSubscribed k r sub = do
15661445 mSubscribed <- readIORef $ rootSubscribed r
15671446 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1454,9 @@ getRootSubscribed k r sub = do
15751454 let !cached = rootSubscribed r
15761455 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771456 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1457+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811458 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821459 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861460 let !subscribed = RootSubscribed
15871461 { rootSubscribedKey = k
15881462 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1465,7 @@ getRootSubscribed k r sub = do
15911465 , rootSubscribedUninit = uninit
15921466 , rootSubscribedWeakSelf = weakSelf
15931467#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1468+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951469#endif
15961470 }
15971471 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1501,6 @@ data FanInt x a = FanInt
16271501 { _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
16281502 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291503 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331504 }
16341505
16351506newFanInt :: IO (FanInt x a)
@@ -1637,39 +1508,38 @@ newFanInt = do
16371508 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
16381509 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391510 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431511 return $ FanInt
16441512 { _fanInt_subscribers = subscribers
16451513 , _fanInt_subscriptionRef = subscriptionRef
16461514 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501515 }
16511516
1517+{-# NOINLINE unsafeNewFanInt #-}
1518+unsafeNewFanInt :: b -> FanInt x a
1519+unsafeNewFanInt b = unsafePerformIO $ do
1520+ touch b
1521+ newFanInt
1522+
16521523fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1524+fanInt p =
1525+ let self = unsafeNewFanInt p
1526+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561527 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571528 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
1529+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601530 { subscriberPropagate = \m -> do
16611531 liftIO $ writeIORef (_fanInt_occRef self) m
16621532 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 ->
1533+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1534+ FastWeakBag.traverse b $ \s -> do
16651535 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1536+ , subscriberInvalidateHeight = \old -> do
1537+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1538+ FastWeakBag.traverse b $ \s -> do
16691539 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1540+ , subscriberRecalculateHeight = \new -> do
1541+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1542+ FastWeakBag.traverse b $ \s -> do
16731543 subscriberRecalculateHeight s new
16741544 }
16751545 liftIO $ do
@@ -1683,28 +1553,13 @@ fanInt p = unsafePerformIO $ do
16831553 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841554 return b
16851555 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1556+ t <- liftIO $ FastWeakBag.insert sub b
16871557 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−
1558+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1559+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051560
17061561{-# INLINABLE getFanSubscribed #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1562+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081563getFanSubscribed k f sub = do
17091564 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101565 case mSubscribed of
@@ -1722,16 +1577,13 @@ getFanSubscribed k f sub = do
17221577 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231578 occRef <- liftIO $ newIORef parentOcc
17241579 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281580 let subscribed = FanSubscribed
17291581 { fanSubscribedCachedSubscribed = fanSubscribed f
17301582 , fanSubscribedOccurrence = occRef
17311583 , fanSubscribedParent = subscription
17321584 , fanSubscribedSubscribers = subscribersRef
17331585#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1586+ , fanSubscribedNodeId = unsafeNodeId f
17351587#endif
17361588 }
17371589 let !self = (k, subscribed)
@@ -1741,7 +1593,7 @@ getFanSubscribed k f sub = do
17411593 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421594 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431595
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1596+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451597cleanupFanSubscribed (k, subscribed) = do
17461598 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471599 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1605,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531605 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541606
17551607{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1608+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571609subscribeFanSubscribed k subscribed sub = do
17581610 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591611 case DMap.lookup k subscribers of
@@ -1791,9 +1643,6 @@ getSwitchSubscribed s sub = do
17911643 when (isJust parentOcc) $ scheduleClear occRef
17921644 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931645 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971646 let !subscribed = SwitchSubscribed
17981647 { switchSubscribedCachedSubscribed = switchSubscribed s
17991648 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1655,7 @@ getSwitchSubscribed s sub = do
18061655 , switchSubscribedCurrentParent = subscriptionRef
18071656 , switchSubscribedWeakSelf = weakSelf
18081657#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1658+ , switchSubscribedNodeId = unsafeNodeId s
18101659#endif
18111660 }
18121661 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1700,6 @@ getCoincidenceSubscribed c sub = do
18511700 scheduleClear innerSubdRef
18521701 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531702 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571703 let subscribed = CoincidenceSubscribed
18581704 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591705 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1710,7 @@ getCoincidenceSubscribed c sub = do
18641710 , coincidenceSubscribedInnerParent = innerSubdRef
18651711 , coincidenceSubscribedWeakSelf = weakSelf
18661712#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1713+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681714#endif
18691715 }
18701716 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1899,7 +1745,7 @@ mergeCheap
18991745 => (forall a. q a -> Event x (v a))
19001746 -> DynamicS x (PatchDMap k q)
19011747 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1748+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031749 where
19041750 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051751 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1760,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141760 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151761 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161762 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1763+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201764 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211765 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221766 foldM f ([], oldParents) $ DMap.toList p
@@ -1941,7 +1785,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411785 => (forall a. q a -> Event x (v a))
19421786 -> DynamicS x (PatchDMapWithMove k q)
19431787 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1788+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451789 where
19461790 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471791 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1804,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601804 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611805 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621806 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1807+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661808 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671809 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681810 Just toKey -> do
19691811 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701812 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1813+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741814 return (toDelete, applyAlways p' oldParents)
19751815 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761816 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1835,6 @@ type MergeUpdateFunc k v x p s
19951835 -> p
19961836 -> EventM x ([EventSubscription x], DMap k s)
19971837
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001838type MergeInitFunc k v q x s
20011839 = DMap k q
20021840 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1858,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201858invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211859invalidateMergeHeight' heightRef sub = do
20221860 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
1861+ 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
20251862 writeIORef heightRef $! invalidHeight
20261863 subscriberInvalidateHeight sub oldHeight
20271864
20281865revalidateMergeHeight :: Merge x k v s -> IO ()
20291866revalidateMergeHeight m = do
20301867 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
1868+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341869 heights <- readIORef $ _merge_heightBagRef m
20351870 parents <- readIORef $ _merge_parentsRef m
20361871 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1873,7 @@ revalidateMergeHeight m = do
20381873 LT -> return ()
20391874 EQ -> do
20401875 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1876+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421877 writeIORef (_merge_heightRef m) $! height
20431878 subscriberRecalculateHeight (_merge_sub m) height
20441879 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1881,36 @@ revalidateMergeHeight m = do
20461881scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471882scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481883 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
1884+ 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
20521885 --TODO: Assert that m is not empty
20531886 subscriberPropagate (_merge_sub m) vals
20541887
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
1888+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1889+mergeSubscriber m getKey = Subscriber
20781890 { subscriberPropagate = \a -> do
20791891 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801892 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1893+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821894 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831895 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841896 when (DMap.null oldM) $ do -- Only schedule the firing once
20851897 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1898+ --TODO: assertions about height
1899+ currentHeight <- getCurrentHeight
1900+ when (height <= currentHeight) $ do
1901+ if height /= invalidHeight
1902+ then do
1903+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1904+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1905+ else liftIO $ do
1906+#ifdef DEBUG_CYCLES
1907+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1908+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1909+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1910+#else
1911+ let cycleInfo = ""
1912+#endif
1913+ error $ "Causality loop found" <> cycleInfo
20881914 scheduleMergeSelf m height
20891915 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901916 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1921,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951921 }
20961922
20971923--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)
1924+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1925+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001926 where updateMe = do
21011927 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1928+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031929 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041930 return subscriptionsToKill
21051931
21061932{-# INLINE mergeGCheap' #-}
21071933mergeGCheap' :: 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
1934+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1935+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101936 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111937 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121938 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131939 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141940 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
1941+ let m = Merge
21301942 { _merge_parentsRef = parentsRef
21311943 , _merge_heightBagRef = heightBagRef
21321944 , _merge_heightRef = heightRef
21331945 , _merge_sub = sub
21341946 , _merge_accumRef = accumRef
21351947 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1948+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371949 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381950 myHeight = if invalidHeight `elem` heights
21391951 then invalidHeight
@@ -2142,29 +1954,31 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421954 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431955 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441956 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1957+ unless (DMap.null accum) $ do
1958+ scheduleMergeSelf m myHeight
21461959 liftIO $ writeIORef accumRef $! accum
21471960 liftIO $ writeIORef heightRef $! myHeight
21481961 liftIO $ writeIORef heightBagRef $! myHeightBag
1962+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491963 liftIO $ writeIORef parentsRef $! initialParentState
21501964 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1965+ let s = Subscriber
21521966 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1967+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1968+ defer $ updateMerge m updateFunc a
21551969 , subscriberInvalidateHeight = \_ -> return ()
21561970 , subscriberRecalculateHeight = \_ -> return ()
21571971 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1972+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1973+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601974 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611975 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621976 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1977+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641978 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
1979+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1980+ , occ
1981+ )
21681982
21691983mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701984mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +1991,13 @@ mergeIntCheap d = Event $ \sub -> do
21771991 heightRef <- liftIO $ newIORef zeroHeight
21781992 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791993 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− }
21901994 let scheduleSelf = do
21911995 height <- liftIO $ readIORef $ heightRef
21921996 scheduleMerge' height heightRef $ do
21931997 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941998 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1999+ invalidateMyHeight = do
2000+ invalidateMergeHeight' heightRef sub
21962001 recalculateMyHeight = do
21972002 currentHeight <- readIORef heightRef
21982003 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 +2007,12 @@ mergeIntCheap d = Event $ \sub -> do
22022007 LT -> return ()
22032008 EQ -> do
22042009 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2010+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22062011 writeIORef heightRef $! height
22072012 subscriberRecalculateHeight sub height
22082013 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22092014 mySubscriber k = Subscriber
22102015 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22132016 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22142017 liftIO $ FastMutableIntMap.insert accum k a
22152018 when wasEmpty scheduleSelf
@@ -2243,6 +2046,7 @@ mergeIntCheap d = Event $ \sub -> do
22432046 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442047 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452048 return Nothing
2049+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462050 defer $ SomeMergeInit $ do
22472051 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482052 where
@@ -2256,39 +2060,35 @@ mergeIntCheap d = Event $ \sub -> do
22562060 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572061 liftIO $ for_ oldParents $ \oldParent -> do
22582062 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612063 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622064 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2065+ let s = Subscriber
22642066 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652067 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662068 defer $ updateMe a
22672069 , subscriberInvalidateHeight = \_ -> return ()
22682070 , subscriberRecalculateHeight = \_ -> return ()
22692071 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2072+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712073 forM_ change $ \c -> defer $ updateMe c
22722074 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732075 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742076 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2077+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762078 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2079+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2080+ , occ
2081+ )
22802082
22812083newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282−newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
22832084
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2085+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2086+fan e =
22872087 let f = Fan
22882088 { fanParent = e
2289− , fanSubscribed = ref
2089+ , fanSubscribed = unsafeNewIORef e Nothing
22902090 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2091+ in EventSelector $ \k -> eventFan k f
22922092
22932093runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942094runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2359,19 +2159,19 @@ runFrame a = SpiderHost $ do
23592159 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602160 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612161 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2162+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632163 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642164 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652165 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2166+ when debugPropagate $ putStrLn "Updating merges"
23672167 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2168+ when debugPropagate $ putStrLn "Updating merges done"
23692169 toReconnect <- readIORef toReconnectRef
23702170 clearEventEnv env
23712171 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722172 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732173 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2174+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752175 finalize wi
23762176 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772177 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2185,7 @@ runFrame a = SpiderHost $ do
23852185 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
23862186 {-
23872187 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2188+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892189 EventRoot _ -> "EventRoot"
23902190 EventNever -> "EventNever"
23912191 _ -> "something else"
@@ -2400,7 +2200,7 @@ runFrame a = SpiderHost $ do
24002200 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012201 when (parentHeight /= myHeight) $ do
24022202 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2203+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042204 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
24052205 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062206 unsubscribe subscription
@@ -2441,7 +2241,7 @@ invalidateCoincidenceHeight subscribed = do
24412241 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422242 when (oldHeight /= invalidHeight) $ do
24432243 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2244+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452245
24462246updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472247updateSwitchHeight new subscribed = do
@@ -2449,7 +2249,7 @@ updateSwitchHeight new subscribed = do
24492249 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502250 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512251 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2252+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532253
24542254recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552255recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2258,7 @@ recalculateCoincidenceHeight subscribed = do
24582258 height <- calculateCoincidenceHeight subscribed
24592259 when (height /= invalidHeight) $ do
24602260 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2261+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622262
24632263calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642264calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2320,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202320 {-# INLINABLE headE #-}
25212321 headE = R.slowHeadE
25222322-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252323
25262324instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272325 {-# INLINABLE sample #-}
@@ -2543,9 +2341,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432341 {-# INLINABLE headE #-}
25442342 headE = R.slowHeadE
25452343-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492344
25502345instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512346 {-# INLINE return #-}
@@ -2554,10 +2349,8 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542349 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552350 {-# INLINE (>>) #-}
25562351 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582352 {-# INLINE fail #-}
25592353 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612354
25622355{-# INLINABLE newJoinDyn #-}
25632356newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2609,9 +2402,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092402 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102403 {-# INLINABLE headE #-}
26112404 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152405
26162406instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172407 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2418,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282418 {-# INLINABLE headE #-}
26292419 headE = R.slowHeadE
26302420-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332421
26342422instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352423 {-# INLINABLE sample #-}
@@ -2650,8 +2438,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502438 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512439 {-# INLINABLE headE #-}
26522440 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552441
26562442--------------------------------------------------------------------------------
26572443-- Deprecated items
@@ -2689,13 +2475,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892475 touch h
26902476 return result
26912477
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2478+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932479 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942480 newFanEventWithTrigger f = SpiderHost $ do
26952481 es <- newFanEventWithTriggerIO f
26962482 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972483
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2484+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992485 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002486 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012487 es <- newFanEventWithTriggerIO f
@@ -2771,15 +2557,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712557 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722558 {-# INLINABLE pull #-}
27732559 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762560 {-# INLINABLE mergeG #-}
27772561 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2562+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792563 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802564 -> DMap k q
27812565 -> R.Event (SpiderTimeline x) (DMap k v)
27822566 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2567+ {-# INLINABLE fan #-}
2568+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832569 {-# INLINABLE switch #-}
27842570 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852571 {-# INLINABLE coincidence #-}
@@ -2843,14 +2629,8 @@ instance Monad (SpiderHost x) where
28432629 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442630 {-# INLINABLE return #-}
28452631 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472632 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2633+ fail s = SpiderHost $ fail s
28542634
28552635-- | Run an action affecting the global Spider timeline; this will be guarded by
28562636-- a mutex for that timeline
@@ -2872,21 +2652,19 @@ instance Monad (SpiderHostFrame x) where
28722652 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732653 {-# INLINABLE return #-}
28742654 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762655 {-# INLINABLE fail #-}
28772656 fail s = SpiderHostFrame $ fail s
2878−#endif
28792657
28802658instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812659 notReadyUntil _ = pure ()
28822660 notReady = pure ()
28832661
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2662+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852663newEventWithTriggerIO f = do
28862664 es <- newFanEventWithTriggerIO $ \Refl -> f
28872665 return $ select es Refl
28882666
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2667+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902668newFanEventWithTriggerIO f = do
28912669 occRef <- newIORef DMap.empty
28922670 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2698,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202698instance PrimMonad (SpiderHostFrame x) where
29212699 type PrimState (SpiderHostFrame x) = PrimState IO
29222700 primitive = SpiderHostFrame . EventM . primitive
2923−
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2927−
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()