@@ -9,6 +9,8 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
1214{-# LANGUAGE RankNTypes #-}
1315{-# LANGUAGE RoleAnnotations #-}
1416{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,7 +21,6 @@
1921{-# LANGUAGE DeriveFunctor #-}
2022{-# LANGUAGE StandaloneDeriving #-}
2123{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
2324
2425#ifdef USE_REFLEX_OPTIMIZER
2526{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +39,15 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3839import Control.Monad.Exception
3940import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4041import Control.Monad.Primitive
42+--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4143import Control.Monad.Reader.Class
4244import Control.Monad.IO.Class
4345import Control.Monad.ReaderIO
4446import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4747import Data.Align
4848import Data.Coerce
49−import Data.Dependent.Map (DMap)
49+import Data.Dependent.Map (DMap, DSum (..))
5050import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5251import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5352import qualified Data.FastMutableIntMap as FastMutableIntMap
5453import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +60,12 @@ import qualified Data.IntMap.Strict as IntMap
6160import Data.IORef
6261import Data.Kind (Type)
6362import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
63+import Data.Monoid ((<>))
6564import Data.Proxy
6665import Data.These
6766import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6967import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
68+import GHC.Exts
7169import GHC.IORef (IORef (..))
7270import GHC.Stack
7371import Reflex.FastWeak
@@ -75,27 +73,16 @@ import System.IO.Unsafe
7573import System.Mem.Weak
7674import Unsafe.Coerce
7775
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
81−#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
85−#endif
86−
8776#ifdef DEBUG_CYCLES
8877import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9178import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9279import qualified Data.List.NonEmpty as NonEmpty
80+import Data.Monoid (mempty)
9381import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
82+#endif
9583
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
84+import Data.FastWeakBag (FastWeakBag)
9785import qualified Data.FastWeakBag as FastWeakBag
98−
9986import Data.Reflection
10087import Data.Some (Some(Some))
10188import Data.Type.Coercion
@@ -106,26 +93,20 @@ import qualified Reflex.Class
10693import qualified Reflex.Class as R
10794import qualified Reflex.Host.Class
10895import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
96+import Reflex.Patch
97+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11298
11399#ifdef DEBUG_TRACE_EVENTS
114100import qualified Data.ByteString.Char8 as BS8
115101import System.IO (stderr)
116−import Data.List (isPrefixOf)
117102#endif
118103
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123104#ifdef DEBUG_TRACE_EVENTS
105+
124106withStackOneLine :: (BS8.ByteString -> a) -> a
125107withStackOneLine expr = unsafePerformIO $ do
126108 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
109+ return (expr (BS8.pack (unwords (reverse stack))))
129110
130111#endif
131112
@@ -136,42 +117,28 @@ debugInvalidateHeight :: Bool
136117debugInvalidate :: Bool
137118
138119#ifdef DEBUG
120+
139121#define DEBUG_NODEIDS
140122
141−#ifdef DEBUG_TRACE_PROPAGATION
142123debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146124
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150125debugInvalidateHeight = False
151−#endif
152126
153−#ifdef DEBUG_TRACE_INVALIDATION
154127debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158128
159129class HasNodeId a where
160130 getNodeId :: a -> Int
161131
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
132+instance HasNodeId (Hold x p a) where
169133 getNodeId = holdNodeId
170134
135+instance HasNodeId (PushSubscribed x a b) where
136+ getNodeId = pushSubscribedNodeId
137+
171138instance HasNodeId (SwitchSubscribed x a) where
172139 getNodeId = switchSubscribedNodeId
173140
174−instance HasNodeId (FanSubscribed x v a) where
141+instance HasNodeId (FanSubscribed x a) where
175142 getNodeId = fanSubscribedNodeId
176143
177144instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +152,41 @@ instance HasNodeId (Pull x a) where
185152
186153{-# INLINE showNodeId #-}
187154showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
155+showNodeId = ("#"<>) . show . getNodeId
156+
157+showSubscriberType :: Subscriber x a -> String
158+showSubscriberType = \case
159+ SubscriberPush _ _ -> "SubscriberPush"
160+ SubscriberMerge _ _ -> "SubscriberMerge"
161+ SubscriberFan _ -> "SubscriberFan"
162+ SubscriberMergeChange _ -> "SubscriberMergeChange"
163+ SubscriberHold _ -> "SubscriberHold"
164+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
165+ SubscriberSwitch _ -> "SubscriberSwitch"
166+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
167+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
168+ SubscriberHandle -> "SubscriberHandle"
169+
170+showEventType :: Event x a -> String
171+showEventType = \case
172+ EventRoot _ _ -> "EventRoot"
173+ EventNever -> "EventNever"
174+ EventPush _ -> "EventPush"
175+ EventMerge _ -> "EventMerge"
176+ EventFan _ _ -> "EventFan"
177+ EventSwitch _ -> "EventSwitch"
178+ EventCoincidence _ -> "EventCoincidence"
179+ EventHold _ -> "EventHold"
180+ EventDyn _ -> "EventDyn"
181+ EventHoldIdentity _ -> "EventHoldIdentity"
182+ EventDynIdentity _ -> "EventDynIdentity"
193183
194184#else
195185
196186debugPropagate = False
187+
197188debugInvalidateHeight = False
189+
198190debugInvalidate = False
199191
200192-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +194,6 @@ debugInvalidate = False
202194showNodeId :: a -> String
203195showNodeId _ = ""
204196
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209197#endif
210198
211199#ifdef DEBUG_NODEIDS
@@ -251,9 +239,9 @@ subscribeAndRead = unEvent
251239-- caching; if the computation function is very cheap, this is (much) more
252240-- efficient than 'push'
253241{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
242+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255243pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
244+ (subscription, occ) <- subscribeAndRead e $ sub
257245 { subscriberPropagate = \a -> do
258246 mb <- f a
259247 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +260,10 @@ terminalSubscriber p = Subscriber
272260
273261-- | Subscribe to an Event only for the duration of one occurrence
274262{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
263+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276264subscribeAndReadHead e sub = do
277265 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
266+ (subscription, occ) <- subscribeAndRead e $ sub
279267 { subscriberPropagate = \a -> do
280268 liftIO $ unsubscribe =<< readIORef subscriptionRef
281269 subscriberPropagate sub a
@@ -286,42 +274,24 @@ subscribeAndReadHead e sub = do
286274 return (subscription, occ)
287275
288276--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)
277+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290278headE originalE = do
291279 parent <- liftIO $ newIORef $ Just originalE
292280 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293281 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
282+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295283 when (isJust occ) clearParent
296− return $ Event $ \sub ->
284+ return $ Event $ \sub -> do
297285 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
286+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299287 Just e -> subscribeAndReadHead e sub
300288
301289data CacheSubscribed x a
302290 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303291 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304292 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308293 }
309294
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−
325295-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326296-- repeatedly
327297--
@@ -346,23 +316,18 @@ cacheEvent e =
346316 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347317 Just subscribedTicket -> return subscribedTicket
348318 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352319 subscribers <- liftIO FastWeakBag.empty
353320 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
357321 (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− }
322+ { subscriberPropagate = \a -> do
323+ liftIO $ writeIORef occRef $ Just a
324+ scheduleClear occRef
325+ propagateFast a subscribers
326+ , subscriberInvalidateHeight = \old -> do
327+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
328+ , subscriberRecalculateHeight = \new -> do
329+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
330+ }
366331 when (isJust occ) $ do
367332 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368333 scheduleClear occRef
@@ -370,45 +335,29 @@ cacheEvent e =
370335 { _cacheSubscribed_subscribers = subscribers
371336 , _cacheSubscribed_parent = parentSub
372337 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376338 }
377339 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378340 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379341 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−
342+ liftIO $ do
343+ subscribed <- getFastWeakTicketValue subscribedTicket
344+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
345+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
346+ let es = EventSubscription
347+ { _eventSubscription_unsubscribe = do
348+ FastWeakBag.remove ticket
349+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
350+ when isEmpty $ do
351+ writeIORef mSubscribedRef emptyFastWeak
352+ unsubscribe $ _cacheSubscribed_parent subscribed
353+ touch ticket
354+ touch subscribedTicket
355+ , _eventSubscription_subscribed = EventSubscribed
356+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
357+ , eventSubscribedRetained = toAny subscribedTicket
358+ }
359+ }
360+ return (es, occ)
412361
413362subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414363subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +369,11 @@ wrap tag getSpecificSubscribed sub = do
420369 let es = tag subd
421370 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422371
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
372+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424373eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425374
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429375eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
376+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431377
432378eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433379eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +410,16 @@ data Subscriber x a = Subscriber
464410 , subscriberRecalculateHeight :: !(Height -> IO ())
465411 }
466412
413+--TODO: Move this comment to WeakBag
414+-- These function are constructor functions that are marked NOINLINE so they are
415+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
416+-- so any weak references that are attached to the constructors will have their
417+-- finalizer run. Using the opaque constructor, does not see the
418+-- constructor application, so it behaves like an IORef and cannot be fused away.
419+--
420+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
421+-- the weak pointer to it in some cases.
422+
467423newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468424newSubscriberHold h = return $ Subscriber
469425 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +428,10 @@ newSubscriberHold h = return $ Subscriber
472428 }
473429
474430newSubscriberFan :: 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
431+newSubscriberFan subscribed = return $ Subscriber
476432 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477433 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
434+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479435 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480436 scheduleClear $ fanSubscribedOccurrence subscribed
481437 let f _ (Pair v subsubs) = do
@@ -484,55 +440,72 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484440 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485441 return ()
486442 , subscriberInvalidateHeight = \old -> do
443+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
445+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489447 , subscriberRecalculateHeight = \new -> do
448+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490449 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
450+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492452 }
493453
494454newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
455+newSubscriberSwitch subscribed = return $ Subscriber
496456 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
457+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497458 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498459 scheduleClear $ switchSubscribedOccurrence subscribed
499460 propagate a $ switchSubscribedSubscribers subscribed
500461 , subscriberInvalidateHeight = \_ -> do
462+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501463 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502464 when (oldHeight /= invalidHeight) $ do
503465 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
466+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
467+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
468+ , subscriberRecalculateHeight = \new -> do
469+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
470+ updateSwitchHeight new subscribed
471+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
472+ }
507473
508474newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
475+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510476 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
477+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511478 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512479 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513480 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514481 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515482 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517483 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518484 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519485 case occ of
520− Nothing ->
486+ Nothing -> do
521487 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522488 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
489+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
490+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525491 Just o -> do -- Since it's already firing, no need to adjust height
526492 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527493 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528494 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
495+ , subscriberInvalidateHeight = \_ -> do
496+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
497+ invalidateCoincidenceHeight subscribed
498+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
499+ , subscriberRecalculateHeight = \_ -> do
500+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
501+ recalculateCoincidenceHeight subscribed
502+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531503 }
532504
533505newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
506+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535507 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
508+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536509 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537510 case occ of
538511 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +513,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540513 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541514 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542515 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
516+ , subscriberInvalidateHeight = \_ -> do
517+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
518+ invalidateCoincidenceHeight subscribed
519+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
520+ , subscriberRecalculateHeight = \_ -> do
521+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
522+ recalculateCoincidenceHeight subscribed
523+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545524 }
546525
547526invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +530,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551530recalculateSubscriberHeight = flip subscriberRecalculateHeight
552531
553532-- | 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) $
533+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
534+propagate a subscribers = withIncreasedDepth $ do
556535 -- 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
557536 --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
537+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559538
560539-- | 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) $
540+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
541+propagateFast a subscribers = withIncreasedDepth $ do
563542 -- 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
564543 --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
544+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566545
567546--------------------------------------------------------------------------------
568547-- EventSubscribed
@@ -580,7 +559,7 @@ data EventSubscribed x = EventSubscribed
580559 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581560 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582561#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
562+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584563 , eventSubscribedHasOwnHeightRef :: !Bool
585564 , eventSubscribedWhoCreated :: !(IO [String])
586565#endif
@@ -607,23 +586,13 @@ eventSubscribedNever = EventSubscribed
607586 , eventSubscribedWhoCreated = return ["never"]
608587#endif
609588 }
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− }
620589
621590eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622591eventSubscribedFan !subscribed = EventSubscribed
623592 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624593 , eventSubscribedRetained = toAny subscribed
625594#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
595+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627596 , eventSubscribedHasOwnHeightRef = False
628597 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629598#endif
@@ -636,7 +605,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636605#ifdef DEBUG_CYCLES
637606 , eventSubscribedGetParents = do
638607 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
608+ return [Some $ _eventSubscription_subscribed s]
640609 , eventSubscribedHasOwnHeightRef = True
641610 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642611#endif
@@ -649,8 +618,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649618#ifdef DEBUG_CYCLES
650619 , eventSubscribedGetParents = do
651620 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
621+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
622+ innerParents = maybeToList $ fmap Some innerSubscription
654623 return $ outerParent : innerParents
655624 , eventSubscribedHasOwnHeightRef = True
656625 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +633,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664633whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665634whoCreatedEventSubscribed = eventSubscribedWhoCreated
666635
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
636+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668637walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
638+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670639 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671640 when (h == invalidHeight) $ do
672641 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
642+ modify (Some s :)
674643 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
644+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676645 return subscribers
677646#endif
678647
@@ -994,10 +963,8 @@ instance Monad (BehaviorM x) where
994963 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995964 {-# INLINE return #-}
996965 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998966 {-# INLINE fail #-}
999967 fail s = BehaviorM $ fail s
1000−#endif
1001968
1002969data BehaviorSubscribed x a
1003970 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +1024,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571024newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581025
10591026-- 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)
1027+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
10611028
10621029newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631030
@@ -1082,8 +1049,7 @@ heightBagFromList :: [Height] -> HeightBag
10821049heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831050
10841051heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1052+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871053
10881054heightBagRemove :: Height -> HeightBag -> HeightBag
10891055heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1058,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921058 0 -> IntMap.delete h c
10931059 _ -> IntMap.insert h (pred old) c
10941060
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−
11021061heightBagMax :: HeightBag -> Height
11031062heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041063 Just ((h, _), _) -> Height h
@@ -1199,13 +1158,6 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991158 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001159 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011160
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1206− zip x y = mapMaybe justThese $ align x y
1207−#endif
1208−
12091161data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101162 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111163 | HoldDyn !(Hold x p)
@@ -1346,110 +1298,55 @@ mkWeakPtrWithDebug x debugNote = do
13461298 x' <- evaluate x
13471299 mkWeakPtr x' $
13481300 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1301+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501302 else Nothing
13511303
13521304type WeakList a = [Weak a]
13531305
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−
13811306{-# 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
1307+#ifdef DEBUG
1308+withIncreasedDepth :: CanTrace x m => m a -> m a
1309+withIncreasedDepth a = do
1310+ spiderTimeline <- askSpiderTimelineEnv
1311+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
13851312 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1313+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
13871314 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−
14121315#else
1316+withIncreasedDepth :: m a -> m a
1317+withIncreasedDepth = id
1318+#endif
14131319
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1320+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171321
14181322{-# INLINE tracePropagate #-}
14191323tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1324+tracePropagate p = traceWhen p debugPropagate
14211325
14221326{-# INLINE traceInvalidate #-}
14231327traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1328+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14371329
1330+{-# INLINE traceWhen #-}
1331+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1332+traceWhen p b message = traceMWhen p b $ return message
14381333
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1447−
1334+{-# INLINE traceMWhen #-}
1335+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1336+traceMWhen _ b getMessage = when b $ do
1337+ message <- getMessage
1338+#ifdef DEBUG
1339+ spiderTimeline <- askSpiderTimelineEnv
1340+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1341+#else
1342+ let d = 0
14481343#endif
1344+ liftIO $ putStrLn $ replicate d ' ' <> message
14491345
14501346whoCreatedIORef :: IORef a -> IO [String]
14511347whoCreatedIORef (IORef a) = whoCreated $! a
14521348
1349+#ifdef DEBUG_CYCLES
14531350groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541351groupByHead = \case
14551352 [] -> []
@@ -1460,54 +1357,20 @@ groupByHead = \case
14601357 | otherwise -> (x, xs :| []) : l
14611358
14621359listsToForest :: 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
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1360+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951361#endif
14961362
1497−
14981363{-# INLINE propagateSubscriberHold #-}
14991364propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001365propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1366+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021367 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031368 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051369 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061370 case {-# SCC "apply" #-} apply a v of
15071371 Nothing -> return ()
15081372 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1373+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111374 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121375 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131376 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1561,7 +1424,7 @@ getDynHold d = do
15611424zeroRef :: IORef Height
15621425zeroRef = unsafePerformIO $ newIORef zeroHeight
15631426
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)
1427+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651428getRootSubscribed k r sub = do
15661429 mSubscribed <- readIORef $ rootSubscribed r
15671430 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1438,7 @@ getRootSubscribed k r sub = do
15751438 let !cached = rootSubscribed r
15761439 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771440 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1441+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811442 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821443 writeIORef uninitRef $! uninit
15831444#ifdef DEBUG_NODEIDS
@@ -1627,9 +1488,6 @@ data FanInt x a = FanInt
16271488 { _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
16281489 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291490 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331491 }
16341492
16351493newFanInt :: IO (FanInt x a)
@@ -1637,16 +1495,10 @@ newFanInt = do
16371495 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
16381496 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391497 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431498 return $ FanInt
16441499 { _fanInt_subscribers = subscribers
16451500 , _fanInt_subscriptionRef = subscriptionRef
16461501 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501502 }
16511503
16521504fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1507,20 @@ fanInt p = unsafePerformIO $ do
16551507 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561508 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571509 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
1510+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601511 { subscriberPropagate = \m -> do
16611512 liftIO $ writeIORef (_fanInt_occRef self) m
16621513 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 ->
1514+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1515+ FastWeakBag.traverse b $ \s -> do
16651516 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1517+ , subscriberInvalidateHeight = \old -> do
1518+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1519+ FastWeakBag.traverse b $ \s -> do
16691520 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1521+ , subscriberRecalculateHeight = \new -> do
1522+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1523+ FastWeakBag.traverse b $ \s -> do
16731524 subscriberRecalculateHeight s new
16741525 }
16751526 liftIO $ do
@@ -1683,25 +1534,10 @@ fanInt p = unsafePerformIO $ do
16831534 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841535 return b
16851536 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1537+ t <- liftIO $ FastWeakBag.insert sub b
16871538 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−
1539+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1540+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051541
17061542{-# INLINABLE getFanSubscribed #-}
17071543getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1899,7 +1735,7 @@ mergeCheap
18991735 => (forall a. q a -> Event x (v a))
19001736 -> DynamicS x (PatchDMap k q)
19011737 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1738+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031739 where
19041740 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051741 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1750,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141750 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151751 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161752 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1753+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201754 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211755 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221756 foldM f ([], oldParents) $ DMap.toList p
@@ -1927,7 +1761,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19271761 let s = subscriber $ return k
19281762 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19291763 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1764+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311765 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321766 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331767 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1941,7 +1775,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411775 => (forall a. q a -> Event x (v a))
19421776 -> DynamicS x (PatchDMapWithMove k q)
19431777 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1778+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451779 where
19461780 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471781 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1794,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601794 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611795 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621796 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1797+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661798 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671799 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681800 Just toKey -> do
19691801 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701802 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1803+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741804 return (toDelete, applyAlways p' oldParents)
19751805 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761806 getInitialSubscribers initialParents subscriber = do
@@ -1979,7 +1809,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19791809 let s = subscriber $ liftIO $ readIORef keyRef
19801810 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19811811 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1812+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831813 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841814 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851815 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1995,8 +1825,6 @@ type MergeUpdateFunc k v x p s
19951825 -> p
19961826 -> EventM x ([EventSubscription x], DMap k s)
19971827
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001828type MergeInitFunc k v q x s
20011829 = DMap k q
20021830 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1848,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201848invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211849invalidateMergeHeight' heightRef sub = do
20221850 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
1851+ 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
20251852 writeIORef heightRef $! invalidHeight
20261853 subscriberInvalidateHeight sub oldHeight
20271854
20281855revalidateMergeHeight :: Merge x k v s -> IO ()
20291856revalidateMergeHeight m = do
20301857 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
1858+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341859 heights <- readIORef $ _merge_heightBagRef m
20351860 parents <- readIORef $ _merge_parentsRef m
20361861 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1863,7 @@ revalidateMergeHeight m = do
20381863 LT -> return ()
20391864 EQ -> do
20401865 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1866+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421867 writeIORef (_merge_heightRef m) $! height
20431868 subscriberRecalculateHeight (_merge_sub m) height
20441869 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1871,36 @@ revalidateMergeHeight m = do
20461871scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471872scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481873 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
1874+ 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
20521875 --TODO: Assert that m is not empty
20531876 subscriberPropagate (_merge_sub m) vals
20541877
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
1878+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1879+mergeSubscriber m getKey = Subscriber
20781880 { subscriberPropagate = \a -> do
20791881 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801882 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1883+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821884 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831885 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841886 when (DMap.null oldM) $ do -- Only schedule the firing once
20851887 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1888+ --TODO: assertions about height
1889+ currentHeight <- getCurrentHeight
1890+ when (height <= currentHeight) $ do
1891+ if height /= invalidHeight
1892+ then do
1893+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1894+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1895+ else liftIO $ do
1896+#ifdef DEBUG_CYCLES
1897+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1898+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1899+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1900+#else
1901+ let cycleInfo = ""
1902+#endif
1903+ error $ "Causality loop found" <> cycleInfo
20881904 scheduleMergeSelf m height
20891905 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901906 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1911,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951911 }
20961912
20971913--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)
1914+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1915+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001916 where updateMe = do
21011917 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1918+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031919 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041920 return subscriptionsToKill
21051921
21061922{-# INLINE mergeGCheap' #-}
21071923mergeGCheap' :: 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
1924+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
1925+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101926 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111927 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121928 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131929 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141930 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
1931+ let m = Merge
21301932 { _merge_parentsRef = parentsRef
21311933 , _merge_heightBagRef = heightBagRef
21321934 , _merge_heightRef = heightRef
21331935 , _merge_sub = sub
21341936 , _merge_accumRef = accumRef
21351937 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1938+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371939 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381940 myHeight = if invalidHeight `elem` heights
21391941 then invalidHeight
@@ -2142,29 +1944,31 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421944 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431945 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441946 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1947+ unless (DMap.null accum) $ do
1948+ scheduleMergeSelf m myHeight
21461949 liftIO $ writeIORef accumRef $! accum
21471950 liftIO $ writeIORef heightRef $! myHeight
21481951 liftIO $ writeIORef heightBagRef $! myHeightBag
1952+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491953 liftIO $ writeIORef parentsRef $! initialParentState
21501954 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1955+ let s = Subscriber
21521956 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1957+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1958+ defer $ updateMerge m updateFunc a
21551959 , subscriberInvalidateHeight = \_ -> return ()
21561960 , subscriberRecalculateHeight = \_ -> return ()
21571961 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1962+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1963+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601964 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611965 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621966 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1967+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641968 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
1969+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1970+ , occ
1971+ )
21681972
21691973mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701974mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +1981,13 @@ mergeIntCheap d = Event $ \sub -> do
21771981 heightRef <- liftIO $ newIORef zeroHeight
21781982 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791983 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− }
21901984 let scheduleSelf = do
21911985 height <- liftIO $ readIORef $ heightRef
21921986 scheduleMerge' height heightRef $ do
21931987 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941988 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1989+ invalidateMyHeight = do
1990+ invalidateMergeHeight' heightRef sub
21961991 recalculateMyHeight = do
21971992 currentHeight <- readIORef heightRef
21981993 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 +1997,12 @@ mergeIntCheap d = Event $ \sub -> do
22021997 LT -> return ()
22031998 EQ -> do
22041999 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2000+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22062001 writeIORef heightRef $! height
22072002 subscriberRecalculateHeight sub height
22082003 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22092004 mySubscriber k = Subscriber
22102005 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22132006 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22142007 liftIO $ FastMutableIntMap.insert accum k a
22152008 when wasEmpty scheduleSelf
@@ -2243,6 +2036,7 @@ mergeIntCheap d = Event $ \sub -> do
22432036 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442037 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452038 return Nothing
2039+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462040 defer $ SomeMergeInit $ do
22472041 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482042 where
@@ -2256,27 +2050,25 @@ mergeIntCheap d = Event $ \sub -> do
22562050 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572051 liftIO $ for_ oldParents $ \oldParent -> do
22582052 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612053 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622054 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2055+ let s = Subscriber
22642056 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652057 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662058 defer $ updateMe a
22672059 , subscriberInvalidateHeight = \_ -> return ()
22682060 , subscriberRecalculateHeight = \_ -> return ()
22692061 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2062+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712063 forM_ change $ \c -> defer $ updateMe c
22722064 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732065 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742066 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2067+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762068 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2069+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2070+ , occ
2071+ )
22802072
22812073newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
22822074newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2359,19 +2151,19 @@ runFrame a = SpiderHost $ do
23592151 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602152 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612153 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2154+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632155 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642156 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652157 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2158+ when debugPropagate $ putStrLn "Updating merges"
23672159 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2160+ when debugPropagate $ putStrLn "Updating merges done"
23692161 toReconnect <- readIORef toReconnectRef
23702162 clearEventEnv env
23712163 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722164 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732165 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2166+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752167 finalize wi
23762168 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772169 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2177,7 @@ runFrame a = SpiderHost $ do
23852177 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
23862178 {-
23872179 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2180+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892181 EventRoot _ -> "EventRoot"
23902182 EventNever -> "EventNever"
23912183 _ -> "something else"
@@ -2400,7 +2192,7 @@ runFrame a = SpiderHost $ do
24002192 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012193 when (parentHeight /= myHeight) $ do
24022194 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2195+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042196 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
24052197 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062198 unsubscribe subscription
@@ -2441,7 +2233,7 @@ invalidateCoincidenceHeight subscribed = do
24412233 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422234 when (oldHeight /= invalidHeight) $ do
24432235 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2236+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452237
24462238updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472239updateSwitchHeight new subscribed = do
@@ -2449,7 +2241,7 @@ updateSwitchHeight new subscribed = do
24492241 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502242 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512243 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2244+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532245
24542246recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552247recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2250,7 @@ recalculateCoincidenceHeight subscribed = do
24582250 height <- calculateCoincidenceHeight subscribed
24592251 when (height /= invalidHeight) $ do
24602252 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2253+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622254
24632255calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642256calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2312,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202312 {-# INLINABLE headE #-}
25212313 headE = R.slowHeadE
25222314-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252315
25262316instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272317 {-# INLINABLE sample #-}
@@ -2543,9 +2333,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432333 {-# INLINABLE headE #-}
25442334 headE = R.slowHeadE
25452335-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492336
25502337instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512338 {-# INLINE return #-}
@@ -2554,10 +2341,8 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542341 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552342 {-# INLINE (>>) #-}
25562343 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582344 {-# INLINE fail #-}
25592345 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612346
25622347{-# INLINABLE newJoinDyn #-}
25632348newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2609,9 +2394,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092394 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102395 {-# INLINABLE headE #-}
26112396 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152397
26162398instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172399 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2410,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282410 {-# INLINABLE headE #-}
26292411 headE = R.slowHeadE
26302412-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332413
26342414instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352415 {-# INLINABLE sample #-}
@@ -2650,8 +2430,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502430 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512431 {-# INLINABLE headE #-}
26522432 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552433
26562434--------------------------------------------------------------------------------
26572435-- Deprecated items
@@ -2689,13 +2467,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892467 touch h
26902468 return result
26912469
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2470+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932471 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942472 newFanEventWithTrigger f = SpiderHost $ do
26952473 es <- newFanEventWithTriggerIO f
26962474 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972475
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2476+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992477 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002478 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012479 es <- newFanEventWithTriggerIO f
@@ -2775,7 +2553,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752553 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762554 {-# INLINABLE mergeG #-}
27772555 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2556+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792557 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802558 -> DMap k q
27812559 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2843,14 +2621,8 @@ instance Monad (SpiderHost x) where
28432621 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442622 {-# INLINABLE return #-}
28452623 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472624 {-# 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
2625+ fail s = SpiderHost $ fail s
28542626
28552627-- | Run an action affecting the global Spider timeline; this will be guarded by
28562628-- a mutex for that timeline
@@ -2872,21 +2644,19 @@ instance Monad (SpiderHostFrame x) where
28722644 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732645 {-# INLINABLE return #-}
28742646 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762647 {-# INLINABLE fail #-}
28772648 fail s = SpiderHostFrame $ fail s
2878−#endif
28792649
28802650instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812651 notReadyUntil _ = pure ()
28822652 notReady = pure ()
28832653
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2654+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852655newEventWithTriggerIO f = do
28862656 es <- newFanEventWithTriggerIO $ \Refl -> f
28872657 return $ select es Refl
28882658
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2659+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902660newFanEventWithTriggerIO f = do
28912661 occRef <- newIORef DMap.empty
28922662 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2690,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202690instance PrimMonad (SpiderHostFrame x) where
29212691 type PrimState (SpiderHostFrame x) = PrimState IO
29222692 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 ()