@@ -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 #-}
@@ -16,10 +18,7 @@
1618{-# LANGUAGE TypeOperators #-}
1719{-# LANGUAGE UndecidableInstances #-}
1820{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
2121{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
2322
2423#ifdef USE_REFLEX_OPTIMIZER
2524{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +37,12 @@ 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
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
40+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4441import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4742import Data.Align
4843import Data.Coerce
49−import Data.Dependent.Map (DMap)
44+import Data.Dependent.Map (DMap, DSum (..))
5045import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5246import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5347import qualified Data.FastMutableIntMap as FastMutableIntMap
5448import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +55,12 @@ import qualified Data.IntMap.Strict as IntMap
6155import Data.IORef
6256import Data.Kind (Type)
6357import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
58+import Data.Monoid ((<>))
6559import Data.Proxy
6660import Data.These
6761import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6962import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
63+import GHC.Exts
7164import GHC.IORef (IORef (..))
7265import GHC.Stack
7366import Reflex.FastWeak
@@ -75,27 +68,16 @@ import System.IO.Unsafe
7568import System.Mem.Weak
7669import Unsafe.Coerce
7770
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−
8771#ifdef DEBUG_CYCLES
8872import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9173import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9274import qualified Data.List.NonEmpty as NonEmpty
75+import Data.Monoid (mempty)
9376import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
77+#endif
9578
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
79+import Data.FastWeakBag (FastWeakBag)
9780import qualified Data.FastWeakBag as FastWeakBag
98−
9981import Data.Reflection
10082import Data.Some (Some(Some))
10183import Data.Type.Coercion
@@ -106,26 +88,20 @@ import qualified Reflex.Class
10688import qualified Reflex.Class as R
10789import qualified Reflex.Host.Class
10890import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
91+import Reflex.Patch
92+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11293
11394#ifdef DEBUG_TRACE_EVENTS
11495import qualified Data.ByteString.Char8 as BS8
11596import System.IO (stderr)
116−import Data.List (isPrefixOf)
11797#endif
11898
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12399#ifdef DEBUG_TRACE_EVENTS
100+
124101withStackOneLine :: (BS8.ByteString -> a) -> a
125102withStackOneLine expr = unsafePerformIO $ do
126103 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
104+ return (expr (BS8.pack (unwords (reverse stack))))
129105
130106#endif
131107
@@ -136,42 +112,28 @@ debugInvalidateHeight :: Bool
136112debugInvalidate :: Bool
137113
138114#ifdef DEBUG
115+
139116#define DEBUG_NODEIDS
140117
141−#ifdef DEBUG_TRACE_PROPAGATION
142118debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146119
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150120debugInvalidateHeight = False
151−#endif
152121
153−#ifdef DEBUG_TRACE_INVALIDATION
154122debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158123
159124class HasNodeId a where
160125 getNodeId :: a -> Int
161126
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
127+instance HasNodeId (Hold x p a) where
169128 getNodeId = holdNodeId
170129
130+instance HasNodeId (PushSubscribed x a b) where
131+ getNodeId = pushSubscribedNodeId
132+
171133instance HasNodeId (SwitchSubscribed x a) where
172134 getNodeId = switchSubscribedNodeId
173135
174−instance HasNodeId (FanSubscribed x v a) where
136+instance HasNodeId (FanSubscribed x a) where
175137 getNodeId = fanSubscribedNodeId
176138
177139instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +147,41 @@ instance HasNodeId (Pull x a) where
185147
186148{-# INLINE showNodeId #-}
187149showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
150+showNodeId = ("#"<>) . show . getNodeId
151+
152+showSubscriberType :: Subscriber x a -> String
153+showSubscriberType = \case
154+ SubscriberPush _ _ -> "SubscriberPush"
155+ SubscriberMerge _ _ -> "SubscriberMerge"
156+ SubscriberFan _ -> "SubscriberFan"
157+ SubscriberMergeChange _ -> "SubscriberMergeChange"
158+ SubscriberHold _ -> "SubscriberHold"
159+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
160+ SubscriberSwitch _ -> "SubscriberSwitch"
161+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
162+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
163+ SubscriberHandle -> "SubscriberHandle"
164+
165+showEventType :: Event x a -> String
166+showEventType = \case
167+ EventRoot _ _ -> "EventRoot"
168+ EventNever -> "EventNever"
169+ EventPush _ -> "EventPush"
170+ EventMerge _ -> "EventMerge"
171+ EventFan _ _ -> "EventFan"
172+ EventSwitch _ -> "EventSwitch"
173+ EventCoincidence _ -> "EventCoincidence"
174+ EventHold _ -> "EventHold"
175+ EventDyn _ -> "EventDyn"
176+ EventHoldIdentity _ -> "EventHoldIdentity"
177+ EventDynIdentity _ -> "EventDynIdentity"
193178
194179#else
195180
196181debugPropagate = False
182+
197183debugInvalidateHeight = False
184+
198185debugInvalidate = False
199186
200187-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +189,6 @@ debugInvalidate = False
202189showNodeId :: a -> String
203190showNodeId _ = ""
204191
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209192#endif
210193
211194#ifdef DEBUG_NODEIDS
@@ -251,9 +234,9 @@ subscribeAndRead = unEvent
251234-- caching; if the computation function is very cheap, this is (much) more
252235-- efficient than 'push'
253236{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
237+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255238pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
239+ (subscription, occ) <- subscribeAndRead e $ sub
257240 { subscriberPropagate = \a -> do
258241 mb <- f a
259242 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +255,10 @@ terminalSubscriber p = Subscriber
272255
273256-- | Subscribe to an Event only for the duration of one occurrence
274257{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
258+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276259subscribeAndReadHead e sub = do
277260 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
261+ (subscription, occ) <- subscribeAndRead e $ sub
279262 { subscriberPropagate = \a -> do
280263 liftIO $ unsubscribe =<< readIORef subscriptionRef
281264 subscriberPropagate sub a
@@ -286,42 +269,24 @@ subscribeAndReadHead e sub = do
286269 return (subscription, occ)
287270
288271--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)
272+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290273headE originalE = do
291274 parent <- liftIO $ newIORef $ Just originalE
292275 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293276 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
277+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295278 when (isJust occ) clearParent
296− return $ Event $ \sub ->
279+ return $ Event $ \sub -> do
297280 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
281+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299282 Just e -> subscribeAndReadHead e sub
300283
301284data CacheSubscribed x a
302285 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303286 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304287 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308288 }
309289
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−
325290-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326291-- repeatedly
327292--
@@ -346,23 +311,18 @@ cacheEvent e =
346311 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347312 Just subscribedTicket -> return subscribedTicket
348313 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352314 subscribers <- liftIO FastWeakBag.empty
353315 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
357316 (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− }
317+ { subscriberPropagate = \a -> do
318+ liftIO $ writeIORef occRef $ Just a
319+ scheduleClear occRef
320+ propagateFast a subscribers
321+ , subscriberInvalidateHeight = \old -> do
322+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
323+ , subscriberRecalculateHeight = \new -> do
324+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
325+ }
366326 when (isJust occ) $ do
367327 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368328 scheduleClear occRef
@@ -370,45 +330,29 @@ cacheEvent e =
370330 { _cacheSubscribed_subscribers = subscribers
371331 , _cacheSubscribed_parent = parentSub
372332 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376333 }
377334 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378335 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379336 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−
337+ liftIO $ do
338+ subscribed <- getFastWeakTicketValue subscribedTicket
339+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
340+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
341+ let es = EventSubscription
342+ { _eventSubscription_unsubscribe = do
343+ FastWeakBag.remove ticket
344+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
345+ when isEmpty $ do
346+ writeIORef mSubscribedRef emptyFastWeak
347+ unsubscribe $ _cacheSubscribed_parent subscribed
348+ touch ticket
349+ touch subscribedTicket
350+ , _eventSubscription_subscribed = EventSubscribed
351+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
352+ , eventSubscribedRetained = toAny subscribedTicket
353+ }
354+ }
355+ return (es, occ)
412356
413357subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414358subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +364,11 @@ wrap tag getSpecificSubscribed sub = do
420364 let es = tag subd
421365 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422366
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
367+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424368eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425369
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429370eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
371+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431372
432373eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433374eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +405,16 @@ data Subscriber x a = Subscriber
464405 , subscriberRecalculateHeight :: !(Height -> IO ())
465406 }
466407
408+--TODO: Move this comment to WeakBag
409+-- These function are constructor functions that are marked NOINLINE so they are
410+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
411+-- so any weak references that are attached to the constructors will have their
412+-- finalizer run. Using the opaque constructor, does not see the
413+-- constructor application, so it behaves like an IORef and cannot be fused away.
414+--
415+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
416+-- the weak pointer to it in some cases.
417+
467418newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468419newSubscriberHold h = return $ Subscriber
469420 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +423,10 @@ newSubscriberHold h = return $ Subscriber
472423 }
473424
474425newSubscriberFan :: 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
426+newSubscriberFan subscribed = return $ Subscriber
476427 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477428 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
429+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479430 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480431 scheduleClear $ fanSubscribedOccurrence subscribed
481432 let f _ (Pair v subsubs) = do
@@ -484,55 +435,72 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484435 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485436 return ()
486437 , subscriberInvalidateHeight = \old -> do
438+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487439 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
441+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489442 , subscriberRecalculateHeight = \new -> do
443+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
445+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
446+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492447 }
493448
494449newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
450+newSubscriberSwitch subscribed = return $ Subscriber
496451 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
452+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497453 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498454 scheduleClear $ switchSubscribedOccurrence subscribed
499455 propagate a $ switchSubscribedSubscribers subscribed
500456 , subscriberInvalidateHeight = \_ -> do
457+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501458 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502459 when (oldHeight /= invalidHeight) $ do
503460 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
461+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
462+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
463+ , subscriberRecalculateHeight = \new -> do
464+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
465+ updateSwitchHeight new subscribed
466+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
467+ }
507468
508469newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
470+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510471 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
472+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511473 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512474 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513475 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514476 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515477 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517478 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518479 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519480 case occ of
520− Nothing ->
481+ Nothing -> do
521482 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522483 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
484+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
485+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525486 Just o -> do -- Since it's already firing, no need to adjust height
526487 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527488 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528489 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
490+ , subscriberInvalidateHeight = \_ -> do
491+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
492+ invalidateCoincidenceHeight subscribed
493+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
494+ , subscriberRecalculateHeight = \_ -> do
495+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
496+ recalculateCoincidenceHeight subscribed
497+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531498 }
532499
533500newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
501+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535502 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
503+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536504 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537505 case occ of
538506 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +508,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540508 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541509 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542510 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
511+ , subscriberInvalidateHeight = \_ -> do
512+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
513+ invalidateCoincidenceHeight subscribed
514+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
515+ , subscriberRecalculateHeight = \_ -> do
516+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
517+ recalculateCoincidenceHeight subscribed
518+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545519 }
546520
547521invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +525,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551525recalculateSubscriberHeight = flip subscriberRecalculateHeight
552526
553527-- | 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) $
528+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
529+propagate a subscribers = withIncreasedDepth $ do
556530 -- 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
557531 --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
532+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559533
560534-- | 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) $
535+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
536+propagateFast a subscribers = withIncreasedDepth $ do
563537 -- 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
564538 --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
539+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566540
567541--------------------------------------------------------------------------------
568542-- EventSubscribed
@@ -571,16 +545,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571545toAny :: a -> Any
572546toAny = unsafeCoerce
573547
574−-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575−-- existential type? Sadly, GHC does not currently know how to unbox types
576−-- with existentially quantified fields. So instead we just coerce values
577−-- to type Any on the way in. Since we never coerce them back, this is
578−-- perfectly safe.
579548data EventSubscribed x = EventSubscribed
580549 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581550 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582551#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
552+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584553 , eventSubscribedHasOwnHeightRef :: !Bool
585554 , eventSubscribedWhoCreated :: !(IO [String])
586555#endif
@@ -607,23 +576,13 @@ eventSubscribedNever = EventSubscribed
607576 , eventSubscribedWhoCreated = return ["never"]
608577#endif
609578 }
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− }
620579
621580eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622581eventSubscribedFan !subscribed = EventSubscribed
623582 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624583 , eventSubscribedRetained = toAny subscribed
625584#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
585+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627586 , eventSubscribedHasOwnHeightRef = False
628587 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629588#endif
@@ -636,7 +595,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636595#ifdef DEBUG_CYCLES
637596 , eventSubscribedGetParents = do
638597 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
598+ return [Some $ _eventSubscription_subscribed s]
640599 , eventSubscribedHasOwnHeightRef = True
641600 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642601#endif
@@ -649,8 +608,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649608#ifdef DEBUG_CYCLES
650609 , eventSubscribedGetParents = do
651610 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
611+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
612+ innerParents = maybeToList $ fmap Some innerSubscription
654613 return $ outerParent : innerParents
655614 , eventSubscribedHasOwnHeightRef = True
656615 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +623,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664623whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665624whoCreatedEventSubscribed = eventSubscribedWhoCreated
666625
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
626+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668627walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
628+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670629 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671630 when (h == invalidHeight) $ do
672631 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
632+ modify (Some s :)
674633 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
634+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676635 return subscribers
677636#endif
678637
@@ -709,7 +668,7 @@ behaviorPull !p = Behavior $ do
709668 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710669 parentsRef <- liftIO $ newIORef []
711670 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
671+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713672 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714673 parents <- liftIO $ readIORef parentsRef
715674 let subscribed = PullSubscribed
@@ -744,46 +703,42 @@ readBehaviorUntracked b = do
744703-- Dynamic
745704--------------------------------------------------------------------------------
746705
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
706+data Dynamic x p = Dynamic
707+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751708 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752709 }
753710
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
711+dynamicHold :: Hold x p -> Dynamic x p
760712dynamicHold !h = Dynamic
761713 { dynamicCurrent = behaviorHold h
762714 , dynamicUpdated = eventHold h
763715 }
764716
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
717+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766718dynamicHoldIdentity = dynamicHold
767719
768−dynamicConst :: PatchTarget p -> DynamicS x p
720+dynamicConst :: PatchTarget p -> Dynamic x p
769721dynamicConst !a = Dynamic
770722 { dynamicCurrent = behaviorConst a
771723 , dynamicUpdated = eventNever
772724 }
773725
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
726+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775727dynamicDyn !d = Dynamic
776728 { dynamicCurrent = behaviorDyn d
777729 , dynamicUpdated = eventDyn d
778730 }
779731
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
732+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781733dynamicDynIdentity = dynamicDyn
782734
783735--------------------------------------------------------------------------------
784736-- Combinators
785737--------------------------------------------------------------------------------
786738
739+--TODO: Figure out why certain things are not 'representational', then make them
740+--representational so we can use coerce
741+
787742--type role Hold representational
788743data Hold x p
789744 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +759,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804759
805760-- | Stores all global data relevant to a particular Spider timeline; only one
806761-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
811−
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
762+data SpiderTimelineEnv x = SpiderTimelineEnv
813763 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814764 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815765#ifdef DEBUG
816766 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817767#endif
818768 }
819−type role SpiderTimelineEnv' phantom
769+type role SpiderTimelineEnv nominal
820770
821771instance Eq (SpiderTimelineEnv x) where
822772 _ == _ = True -- Since only one exists of each type
823773
824774instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
775+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826776 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827777 else Nothing
828778
@@ -845,7 +795,7 @@ runEventM :: EventM x a -> IO a
845795runEventM = unEventM
846796
847797asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
798+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849799
850800class MonadIO m => Defer a m where
851801 getDeferralQueue :: m (IORef [a])
@@ -983,9 +933,9 @@ getHoldEventSubscription h = do
983933
984934type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985935
936+--type role BehaviorM representational
986937-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
938+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989939
990940instance Monad (BehaviorM x) where
991941 {-# INLINE (>>=) #-}
@@ -994,10 +944,8 @@ instance Monad (BehaviorM x) where
994944 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995945 {-# INLINE return #-}
996946 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998947 {-# INLINE fail #-}
999948 fail s = BehaviorM $ fail s
1000−#endif
1001949
1002950data BehaviorSubscribed x a
1003951 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +1005,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571005newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581006
10591007-- 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)
1008+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
10611009
10621010newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631011
@@ -1082,8 +1030,7 @@ heightBagFromList :: [Height] -> HeightBag
10821030heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831031
10841032heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1033+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871034
10881035heightBagRemove :: Height -> HeightBag -> HeightBag
10891036heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1039,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921039 0 -> IntMap.delete h c
10931040 _ -> IntMap.insert h (pred old) c
10941041
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−
11021042heightBagMax :: HeightBag -> Height
11031043heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041044 Just ((h, _), _) -> Height h
@@ -1199,24 +1139,17 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991139 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001140 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011141
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−
12091142data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101143 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111144 | HoldDyn !(Hold x p)
12121145
12131146newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
12141147
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1148+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161149newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171150
12181151--TODO: Avoid the duplication between this and R.zipDynWith
1219−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1152+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201153zipDynWith f da db =
12211154 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221155 ec = flip push eab $ \o -> do
@@ -1292,7 +1225,7 @@ run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> Res
12921225run roots after = do
12931226 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941227 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1228+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961229 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971230 occBefore <- liftIO $ do
12981231 occBefore <- readIORef occRef
@@ -1346,110 +1279,55 @@ mkWeakPtrWithDebug x debugNote = do
13461279 x' <- evaluate x
13471280 mkWeakPtr x' $
13481281 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1282+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501283 else Nothing
13511284
13521285type WeakList a = [Weak a]
13531286
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−
13811287{-# 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
1288+#ifdef DEBUG
1289+withIncreasedDepth :: CanTrace x m => m a -> m a
1290+withIncreasedDepth a = do
1291+ spiderTimeline <- askSpiderTimelineEnv
1292+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851293 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1294+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871295 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−
14121296#else
1297+withIncreasedDepth :: m a -> m a
1298+withIncreasedDepth = id
1299+#endif
14131300
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1301+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171302
14181303{-# INLINE tracePropagate #-}
14191304tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1305+tracePropagate p = traceWhen p debugPropagate
14211306
14221307{-# INLINE traceInvalidate #-}
14231308traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1309+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14391310
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 ()
1311+{-# INLINE traceWhen #-}
1312+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1313+traceWhen p b message = traceMWhen p b $ return message
14471314
1315+{-# INLINE traceMWhen #-}
1316+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1317+traceMWhen _ b getMessage = when b $ do
1318+ message <- getMessage
1319+#ifdef DEBUG
1320+ spiderTimeline <- askSpiderTimelineEnv
1321+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1322+#else
1323+ let d = 0
14481324#endif
1325+ liftIO $ putStrLn $ replicate d ' ' <> message
14491326
14501327whoCreatedIORef :: IORef a -> IO [String]
14511328whoCreatedIORef (IORef a) = whoCreated $! a
14521329
1330+#ifdef DEBUG_CYCLES
14531331groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541332groupByHead = \case
14551333 [] -> []
@@ -1460,54 +1338,20 @@ groupByHead = \case
14601338 | otherwise -> (x, xs :| []) : l
14611339
14621340listsToForest :: 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−
1341+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951342#endif
14961343
1497−
14981344{-# INLINE propagateSubscriberHold #-}
14991345propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001346propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1347+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021348 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031349 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051350 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061351 case {-# SCC "apply" #-} apply a v of
15071352 Nothing -> return ()
15081353 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1354+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111355 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121356 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131357 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1359,25 @@ propagateSubscriberHold h a = do
15151359data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161360
15171361runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1362+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191363
15201364askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211365askInvalidator = do
1522− (!m, _) <- ask
1366+ (!m, _) <- BehaviorM ask
15231367 case m of
15241368 Nothing -> return Nothing
15251369 Just (!wi, _) -> return $ Just wi
15261370
15271371askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281372askParentsRef = do
1529− (!m, _) <- ask
1373+ (!m, _) <- BehaviorM ask
15301374 case m of
15311375 Nothing -> return Nothing
15321376 Just (_, !p) -> return $ Just p
15331377
15341378askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351379askBehaviorHoldInits = do
1536− (_, !his) <- ask
1380+ (_, !his) <- BehaviorM ask
15371381 return his
15381382
15391383{-# INLINE getDynHold #-}
@@ -1561,7 +1405,7 @@ getDynHold d = do
15611405zeroRef :: IORef Height
15621406zeroRef = unsafePerformIO $ newIORef zeroHeight
15631407
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)
1408+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651409getRootSubscribed k r sub = do
15661410 mSubscribed <- readIORef $ rootSubscribed r
15671411 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1419,7 @@ getRootSubscribed k r sub = do
15751419 let !cached = rootSubscribed r
15761420 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771421 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1422+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811423 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821424 writeIORef uninitRef $! uninit
15831425#ifdef DEBUG_NODEIDS
@@ -1627,9 +1469,6 @@ data FanInt x a = FanInt
16271469 { _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
16281470 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291471 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331472 }
16341473
16351474newFanInt :: IO (FanInt x a)
@@ -1637,16 +1476,10 @@ newFanInt = do
16371476 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
16381477 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391478 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431479 return $ FanInt
16441480 { _fanInt_subscribers = subscribers
16451481 , _fanInt_subscriptionRef = subscriptionRef
16461482 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501483 }
16511484
16521485fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1488,20 @@ fanInt p = unsafePerformIO $ do
16551488 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561489 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571490 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
1491+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601492 { subscriberPropagate = \m -> do
16611493 liftIO $ writeIORef (_fanInt_occRef self) m
16621494 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 ->
1495+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1496+ FastWeakBag.traverse b $ \s -> do
16651497 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1498+ , subscriberInvalidateHeight = \old -> do
1499+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1500+ FastWeakBag.traverse b $ \s -> do
16691501 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1502+ , subscriberRecalculateHeight = \new -> do
1503+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1504+ FastWeakBag.traverse b $ \s -> do
16731505 subscriberRecalculateHeight s new
16741506 }
16751507 liftIO $ do
@@ -1683,25 +1515,10 @@ fanInt p = unsafePerformIO $ do
16831515 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841516 return b
16851517 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1518+ t <- liftIO $ FastWeakBag.insert sub b
16871519 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−
1520+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1521+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051522
17061523{-# INLINABLE getFanSubscribed #-}
17071524getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1884,22 +1701,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
18841701{-# INLINE mergeG #-}
18851702mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
18861703 => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1704+ -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
18881705mergeG nt d = cacheEvent (mergeCheap nt d)
18891706
18901707{-# INLINE mergeWithMove #-}
18911708mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
18921709 => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1710+ -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
18941711mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
18951712
18961713{-# INLINE [1] mergeCheap #-}
18971714mergeCheap
18981715 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
18991716 => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1717+ -> Dynamic x (PatchDMap k q)
19011718 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1719+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031720 where
19041721 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051722 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1731,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141731 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151732 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161733 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1734+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201735 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211736 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221737 foldM f ([], oldParents) $ DMap.toList p
@@ -1927,7 +1742,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19271742 let s = subscriber $ return k
19281743 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19291744 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1745+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311746 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321747 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331748 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1939,9 +1754,9 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19391754{-# INLINE [1] mergeCheapWithMove #-}
19401755mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411756 => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1757+ -> Dynamic x (PatchDMapWithMove k q)
19431758 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1759+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451760 where
19461761 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471762 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1775,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601775 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611776 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621777 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1778+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661779 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671780 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681781 Just toKey -> do
19691782 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701783 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1784+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741785 return (toDelete, applyAlways p' oldParents)
19751786 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761787 getInitialSubscribers initialParents subscriber = do
@@ -1979,7 +1790,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19791790 let s = subscriber $ liftIO $ readIORef keyRef
19801791 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19811792 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1793+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831794 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841795 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851796 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1995,8 +1806,6 @@ type MergeUpdateFunc k v x p s
19951806 -> p
19961807 -> EventM x ([EventSubscription x], DMap k s)
19971808
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001809type MergeInitFunc k v q x s
20011810 = DMap k q
20021811 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1829,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201829invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211830invalidateMergeHeight' heightRef sub = do
20221831 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
1832+ 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
20251833 writeIORef heightRef $! invalidHeight
20261834 subscriberInvalidateHeight sub oldHeight
20271835
20281836revalidateMergeHeight :: Merge x k v s -> IO ()
20291837revalidateMergeHeight m = do
20301838 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
1839+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341840 heights <- readIORef $ _merge_heightBagRef m
20351841 parents <- readIORef $ _merge_parentsRef m
20361842 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1844,7 @@ revalidateMergeHeight m = do
20381844 LT -> return ()
20391845 EQ -> do
20401846 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1847+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421848 writeIORef (_merge_heightRef m) $! height
20431849 subscriberRecalculateHeight (_merge_sub m) height
20441850 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1852,36 @@ revalidateMergeHeight m = do
20461852scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471853scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481854 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
1855+ 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
20521856 --TODO: Assert that m is not empty
20531857 subscriberPropagate (_merge_sub m) vals
20541858
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
1859+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1860+mergeSubscriber m getKey = Subscriber
20781861 { subscriberPropagate = \a -> do
20791862 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801863 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1864+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821865 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831866 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841867 when (DMap.null oldM) $ do -- Only schedule the firing once
20851868 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1869+ --TODO: assertions about height
1870+ currentHeight <- getCurrentHeight
1871+ when (height <= currentHeight) $ do
1872+ if height /= invalidHeight
1873+ then do
1874+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1875+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1876+ else liftIO $ do
1877+#ifdef DEBUG_CYCLES
1878+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1879+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1880+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1881+#else
1882+ let cycleInfo = ""
1883+#endif
1884+ error $ "Causality loop found" <> cycleInfo
20881885 scheduleMergeSelf m height
20891886 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901887 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1892,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951892 }
20961893
20971894--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)
1895+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1896+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001897 where updateMe = do
21011898 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1899+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031900 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041901 return subscriptionsToKill
21051902
21061903{-# INLINE mergeGCheap' #-}
21071904mergeGCheap' :: 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
1905+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
1906+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101907 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111908 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121909 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131910 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141911 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
1912+ let m = Merge
21301913 { _merge_parentsRef = parentsRef
21311914 , _merge_heightBagRef = heightBagRef
21321915 , _merge_heightRef = heightRef
21331916 , _merge_sub = sub
21341917 , _merge_accumRef = accumRef
21351918 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1919+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371920 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381921 myHeight = if invalidHeight `elem` heights
21391922 then invalidHeight
@@ -2142,57 +1925,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421925 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431926 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441927 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1928+ unless (DMap.null accum) $ do
1929+ scheduleMergeSelf m myHeight
21461930 liftIO $ writeIORef accumRef $! accum
21471931 liftIO $ writeIORef heightRef $! myHeight
21481932 liftIO $ writeIORef heightBagRef $! myHeightBag
1933+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491934 liftIO $ writeIORef parentsRef $! initialParentState
21501935 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1936+ let s = Subscriber
21521937 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1938+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1939+ defer $ updateMerge m updateFunc a
21551940 , subscriberInvalidateHeight = \_ -> return ()
21561941 , subscriberRecalculateHeight = \_ -> return ()
21571942 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1943+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1944+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601945 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611946 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621947 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1948+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641949 let unsubscribeAll = destroy =<< readIORef parentsRef
1950+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1951+ , occ
1952+ )
21651953
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
2168−
2169−mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1954+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701955mergeInt = cacheEvent . mergeIntCheap
21711956
21721957{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1958+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741959mergeIntCheap d = Event $ \sub -> do
21751960 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761961 accum <- liftIO $ FastMutableIntMap.newEmpty
21771962 heightRef <- liftIO $ newIORef zeroHeight
21781963 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791964 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− }
21901965 let scheduleSelf = do
21911966 height <- liftIO $ readIORef $ heightRef
21921967 scheduleMerge' height heightRef $ do
21931968 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941969 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1970+ invalidateMyHeight = do
1971+ invalidateMergeHeight' heightRef sub
21961972 recalculateMyHeight = do
21971973 currentHeight <- readIORef heightRef
21981974 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 +1978,12 @@ mergeIntCheap d = Event $ \sub -> do
22021978 LT -> return ()
22031979 EQ -> do
22041980 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1981+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061982 writeIORef heightRef $! height
22071983 subscriberRecalculateHeight sub height
22081984 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091985 mySubscriber k = Subscriber
22101986 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131987 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141988 liftIO $ FastMutableIntMap.insert accum k a
22151989 when wasEmpty scheduleSelf
@@ -2243,6 +2017,7 @@ mergeIntCheap d = Event $ \sub -> do
22432017 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442018 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452019 return Nothing
2020+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462021 defer $ SomeMergeInit $ do
22472022 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482023 where
@@ -2256,27 +2031,25 @@ mergeIntCheap d = Event $ \sub -> do
22562031 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572032 liftIO $ for_ oldParents $ \oldParent -> do
22582033 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612034 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622035 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2036+ let s = Subscriber
22642037 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652038 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662039 defer $ updateMe a
22672040 , subscriberInvalidateHeight = \_ -> return ()
22682041 , subscriberRecalculateHeight = \_ -> return ()
22692042 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2043+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712044 forM_ change $ \c -> defer $ updateMe c
22722045 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732046 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742047 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2048+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762049 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2050+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2051+ , occ
2052+ )
22802053
22812054newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
22822055newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2342,7 +2115,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422115-- | Run an event action outside of a frame
23432116runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442117runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2118+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462119 let go = do
23472120 result <- a
23482121 runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
@@ -2359,19 +2132,19 @@ runFrame a = SpiderHost $ do
23592132 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602133 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612134 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2135+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632136 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642137 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652138 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2139+ when debugPropagate $ putStrLn "Updating merges"
23672140 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2141+ when debugPropagate $ putStrLn "Updating merges done"
23692142 toReconnect <- readIORef toReconnectRef
23702143 clearEventEnv env
23712144 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722145 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732146 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2147+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752148 finalize wi
23762149 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772150 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2158,7 @@ runFrame a = SpiderHost $ do
23852158 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
23862159 {-
23872160 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2161+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892162 EventRoot _ -> "EventRoot"
23902163 EventNever -> "EventNever"
23912164 _ -> "something else"
@@ -2400,7 +2173,7 @@ runFrame a = SpiderHost $ do
24002173 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012174 when (parentHeight /= myHeight) $ do
24022175 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2176+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042177 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
24052178 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062179 unsubscribe subscription
@@ -2441,7 +2214,7 @@ invalidateCoincidenceHeight subscribed = do
24412214 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422215 when (oldHeight /= invalidHeight) $ do
24432216 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2217+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452218
24462219updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472220updateSwitchHeight new subscribed = do
@@ -2449,7 +2222,7 @@ updateSwitchHeight new subscribed = do
24492222 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502223 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512224 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2225+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532226
24542227recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552228recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2231,7 @@ recalculateCoincidenceHeight subscribed = do
24582231 height <- calculateCoincidenceHeight subscribed
24592232 when (height /= invalidHeight) $ do
24602233 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2234+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622235
24632236calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642237calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2293,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202293 {-# INLINABLE headE #-}
25212294 headE = R.slowHeadE
25222295-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252296
25262297instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272298 {-# INLINABLE sample #-}
@@ -2543,9 +2314,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432314 {-# INLINABLE headE #-}
25442315 headE = R.slowHeadE
25452316-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492317
25502318instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512319 {-# INLINE return #-}
@@ -2554,13 +2322,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542322 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552323 {-# INLINE (>>) #-}
25562324 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582325 {-# INLINE fail #-}
25592326 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612327
25622328{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2329+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642330newJoinDyn d =
25652331 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662332 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2375,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092375 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102376 {-# INLINABLE headE #-}
26112377 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152378
26162379instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172380 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2391,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282391 {-# INLINABLE headE #-}
26292392 headE = R.slowHeadE
26302393-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332394
26342395instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352396 {-# INLINABLE sample #-}
@@ -2650,8 +2411,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502411 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512412 {-# INLINABLE headE #-}
26522413 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552414
26562415--------------------------------------------------------------------------------
26572416-- Deprecated items
@@ -2689,13 +2448,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892448 touch h
26902449 return result
26912450
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2451+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932452 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942453 newFanEventWithTrigger f = SpiderHost $ do
26952454 es <- newFanEventWithTriggerIO f
26962455 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972456
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2457+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992458 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002459 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012460 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2476,7 @@ unsafeNewSpiderTimelineEnv = do
27172476#ifdef DEBUG
27182477 depthRef <- newIORef 0
27192478#endif
2720− return $ STE $ SpiderTimelineEnv
2479+ return $ SpiderTimelineEnv
27212480 { _spiderTimeline_lock = lock
27222481 , _spiderTimeline_eventEnv = env
27232482#ifdef DEBUG
@@ -2733,13 +2492,13 @@ data LocalSpiderTimeline (x :: Type) s
27332492
27342493instance Reifies s (SpiderTimelineEnv x) =>
27352494 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2495+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372496
27382497localSpiderTimeline
2739− :: proxy s
2498+ :: Proxy s
27402499 -> SpiderTimelineEnv x
27412500 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2501+localSpiderTimeline _ = unsafeCoerce
27432502
27442503-- | Pass a new timeline to the given function.
27452504withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2757,8 +2516,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572516 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582517 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592518 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2519+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2520+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622521 type PullM (SpiderTimeline x) = SpiderPullM x
27632522 type PushM (SpiderTimeline x) = SpiderPushM x
27642523 {-# INLINABLE never #-}
@@ -2775,7 +2534,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752534 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762535 {-# INLINABLE mergeG #-}
27772536 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2537+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792538 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802539 -> DMap k q
27812540 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2787,7 +2546,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872546 {-# INLINABLE current #-}
27882547 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892548 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2549+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912550 {-# INLINABLE unsafeBuildDynamic #-}
27922551 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932552 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2806,10 +2565,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062565 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072566 eventCoercion Coercion = Coercion
28082567 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2568+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112569 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2570+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132571 {-# INLINABLE fanInt #-}
28142572 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152573
@@ -2843,14 +2601,8 @@ instance Monad (SpiderHost x) where
28432601 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442602 {-# INLINABLE return #-}
28452603 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472604 {-# 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
2605+ fail s = SpiderHost $ fail s
28542606
28552607-- | Run an action affecting the global Spider timeline; this will be guarded by
28562608-- a mutex for that timeline
@@ -2872,21 +2624,19 @@ instance Monad (SpiderHostFrame x) where
28722624 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732625 {-# INLINABLE return #-}
28742626 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762627 {-# INLINABLE fail #-}
28772628 fail s = SpiderHostFrame $ fail s
2878−#endif
28792629
28802630instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812631 notReadyUntil _ = pure ()
28822632 notReady = pure ()
28832633
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2634+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852635newEventWithTriggerIO f = do
28862636 es <- newFanEventWithTriggerIO $ \Refl -> f
28872637 return $ select es Refl
28882638
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2639+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902640newFanEventWithTriggerIO f = do
28912641 occRef <- newIORef DMap.empty
28922642 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2670,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202670instance PrimMonad (SpiderHostFrame x) where
29212671 type PrimState (SpiderHostFrame x) = PrimState IO
29222672 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 ()