@@ -9,8 +9,6 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiParamTypeClasses #-}
13−{-# LANGUAGE MultiWayIf #-}
1412{-# LANGUAGE RankNTypes #-}
1513{-# LANGUAGE RoleAnnotations #-}
1614{-# LANGUAGE ScopedTypeVariables #-}
@@ -18,7 +16,10 @@
1816{-# LANGUAGE TypeOperators #-}
1917{-# LANGUAGE UndecidableInstances #-}
2018{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
2121{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
2223
2324#ifdef USE_REFLEX_OPTIMIZER
2425{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -37,12 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3738import Control.Monad.Exception
3839import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3940import Control.Monad.Primitive
40−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
41+import Control.Monad.Reader.Class
42+import Control.Monad.IO.Class
43+import Control.Monad.ReaderIO
4144import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4247import Data.Align
4348import Data.Coerce
44−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4550import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
4652import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
4753import qualified Data.FastMutableIntMap as FastMutableIntMap
4854import Data.Foldable hiding (concat, elem, sequence_)
@@ -55,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
5561import Data.IORef
5662import Data.Kind (Type)
5763import Data.Maybe hiding (mapMaybe)
58−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
5965import Data.Proxy
6066import Data.These
6167import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
6269import Data.Witherable (Filterable, mapMaybe)
63−import GHC.Exts
70+import GHC.Exts hiding (toList)
6471import GHC.IORef (IORef (..))
6572import GHC.Stack
6673import Reflex.FastWeak
@@ -68,16 +75,27 @@ import System.IO.Unsafe
6875import System.Mem.Weak
6976import Unsafe.Coerce
7077
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+
7187#ifdef DEBUG_CYCLES
7288import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7391import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7492import qualified Data.List.NonEmpty as NonEmpty
75−import Data.Monoid (mempty)
7693import Data.Tree (Forest, Tree (..), drawForest)
77−#endif
94+import Data.List (isPrefixOf)
7895
79−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
8097import qualified Data.FastWeakBag as FastWeakBag
98+
8199import Data.Reflection
82100import Data.Some (Some(Some))
83101import Data.Type.Coercion
@@ -88,20 +106,26 @@ import qualified Reflex.Class
88106import qualified Reflex.Class as R
89107import qualified Reflex.Host.Class
90108import Reflex.NotReady.Class
91−import Reflex.Patch
92−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
93112
94113#ifdef DEBUG_TRACE_EVENTS
95114import qualified Data.ByteString.Char8 as BS8
96115import System.IO (stderr)
116+import Data.List (isPrefixOf)
97117#endif
98118
99−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
100122
123+#ifdef DEBUG_TRACE_EVENTS
101124withStackOneLine :: (BS8.ByteString -> a) -> a
102125withStackOneLine expr = unsafePerformIO $ do
103126 stack <- currentCallStack
104− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
105129
106130#endif
107131
@@ -112,28 +136,42 @@ debugInvalidateHeight :: Bool
112136debugInvalidate :: Bool
113137
114138#ifdef DEBUG
115−
116139#define DEBUG_NODEIDS
117140
141+#ifdef DEBUG_TRACE_PROPAGATION
118142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
119146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
120150debugInvalidateHeight = False
151+#endif
121152
153+#ifdef DEBUG_TRACE_INVALIDATION
122154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
123158
124159class HasNodeId a where
125160 getNodeId :: a -> Int
126161
127−instance HasNodeId (Hold x p a) where
128− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
129167
130−instance HasNodeId (PushSubscribed x a b) where
131− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
132170
133171instance HasNodeId (SwitchSubscribed x a) where
134172 getNodeId = switchSubscribedNodeId
135173
136−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
137175 getNodeId = fanSubscribedNodeId
138176
139177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -147,41 +185,16 @@ instance HasNodeId (Pull x a) where
147185
148186{-# INLINE showNodeId #-}
149187showNodeId :: HasNodeId a => a -> String
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"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
178193
179194#else
180195
181196debugPropagate = False
182−
183197debugInvalidateHeight = False
184−
185198debugInvalidate = False
186199
187200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -189,6 +202,10 @@ debugInvalidate = False
189202showNodeId :: a -> String
190203showNodeId _ = ""
191204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
192209#endif
193210
194211#ifdef DEBUG_NODEIDS
@@ -234,9 +251,9 @@ subscribeAndRead = unEvent
234251-- caching; if the computation function is very cheap, this is (much) more
235252-- efficient than 'push'
236253{-# INLINE [1] pushCheap #-}
237−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
238255pushCheap !f e = Event $ \sub -> do
239− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
240257 { subscriberPropagate = \a -> do
241258 mb <- f a
242259 mapM_ (subscriberPropagate sub) mb
@@ -255,10 +272,10 @@ terminalSubscriber p = Subscriber
255272
256273-- | Subscribe to an Event only for the duration of one occurrence
257274{-# INLINE subscribeAndReadHead #-}
258−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
259276subscribeAndReadHead e sub = do
260277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
261− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
262279 { subscriberPropagate = \a -> do
263280 liftIO $ unsubscribe =<< readIORef subscriptionRef
264281 subscriberPropagate sub a
@@ -269,24 +286,42 @@ subscribeAndReadHead e sub = do
269286 return (subscription, occ)
270287
271288--TODO: Make this lazy in its input event
272−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
273290headE originalE = do
274291 parent <- liftIO $ newIORef $ Just originalE
275292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
276293 let clearParent = liftIO $ writeIORef parent Nothing
277− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
278295 when (isJust occ) clearParent
279− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
280297 liftIO (readIORef parent) >>= \case
281− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
282299 Just e -> subscribeAndReadHead e sub
283300
284301data CacheSubscribed x a
285302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
286303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
287304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
288308 }
289309
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+
290325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
291326-- repeatedly
292327--
@@ -311,18 +346,23 @@ cacheEvent e =
311346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
312347 Just subscribedTicket -> return subscribedTicket
313348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
314352 subscribers <- liftIO FastWeakBag.empty
315353 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
316357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
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− }
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+ }
326366 when (isJust occ) $ do
327367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
328368 scheduleClear occRef
@@ -330,29 +370,45 @@ cacheEvent e =
330370 { _cacheSubscribed_subscribers = subscribers
331371 , _cacheSubscribed_parent = parentSub
332372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
333376 }
334377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
335378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
336379 return subscribedTicket
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)
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+
356412
357413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
358414subscribe e s = fst <$> subscribeAndRead e s
@@ -364,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
364420 let es = tag subd
365421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
366422
367−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
368424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
369425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
370429eventNever :: Event x a
371−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
372431
373432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
374433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -405,16 +464,6 @@ data Subscriber x a = Subscriber
405464 , subscriberRecalculateHeight :: !(Height -> IO ())
406465 }
407466
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−
418467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
419468newSubscriberHold h = return $ Subscriber
420469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -423,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
423472 }
424473
425474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
426−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
427476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
428477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
429− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
430479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
431480 scheduleClear $ fanSubscribedOccurrence subscribed
432481 let f _ (Pair v subsubs) = do
@@ -435,72 +484,55 @@ newSubscriberFan subscribed = return $ Subscriber
435484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
436485 return ()
437486 , subscriberInvalidateHeight = \old -> do
438− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
439487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
440− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
441− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
442489 , subscriberRecalculateHeight = \new -> do
443− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
444490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
445− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
446− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
447492 }
448493
449494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
450−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
451496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
452− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
453497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
454498 scheduleClear $ switchSubscribedOccurrence subscribed
455499 propagate a $ switchSubscribedSubscribers subscribed
456500 , subscriberInvalidateHeight = \_ -> do
457− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
458501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
459502 when (oldHeight /= invalidHeight) $ do
460503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
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− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
468507
469508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
470−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
471510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
472− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
473511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
474512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
475513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
476514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
477515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
478517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
479518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
480519 case occ of
481− Nothing -> do
520+ Nothing ->
482521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
483522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
484− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
485− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
486525 Just o -> do -- Since it's already firing, no need to adjust height
487526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
488527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
489528 propagate o $ coincidenceSubscribedSubscribers 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"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
498531 }
499532
500533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
501−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
502535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
503− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
504536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
505537 case occ of
506538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -508,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
508540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
509541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
510542 propagate a $ coincidenceSubscribedSubscribers 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"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
519545 }
520546
521547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -525,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
525551recalculateSubscriberHeight = flip subscriberRecalculateHeight
526552
527553-- | Propagate everything at the current height
528−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
529−propagate a subscribers = withIncreasedDepth $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
530556 -- 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
531557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
532− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
533559
534560-- | Propagate everything at the current height
535−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
536−propagateFast a subscribers = withIncreasedDepth $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
537563 -- 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
538564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
539− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
540566
541567--------------------------------------------------------------------------------
542568-- EventSubscribed
@@ -545,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
545571toAny :: a -> Any
546572toAny = unsafeCoerce
547573
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.
548579data EventSubscribed x = EventSubscribed
549580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
550581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
551582#ifdef DEBUG_CYCLES
552− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
553584 , eventSubscribedHasOwnHeightRef :: !Bool
554585 , eventSubscribedWhoCreated :: !(IO [String])
555586#endif
@@ -576,13 +607,23 @@ eventSubscribedNever = EventSubscribed
576607 , eventSubscribedWhoCreated = return ["never"]
577608#endif
578609 }
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+ }
579620
580621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
581622eventSubscribedFan !subscribed = EventSubscribed
582623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
583624 , eventSubscribedRetained = toAny subscribed
584625#ifdef DEBUG_CYCLES
585− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
586627 , eventSubscribedHasOwnHeightRef = False
587628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
588629#endif
@@ -595,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
595636#ifdef DEBUG_CYCLES
596637 , eventSubscribedGetParents = do
597638 s <- readIORef $ switchSubscribedCurrentParent subscribed
598− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
599640 , eventSubscribedHasOwnHeightRef = True
600641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
601642#endif
@@ -608,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
608649#ifdef DEBUG_CYCLES
609650 , eventSubscribedGetParents = do
610651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
611− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
612− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
613654 return $ outerParent : innerParents
614655 , eventSubscribedHasOwnHeightRef = True
615656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -623,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
623664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
624665whoCreatedEventSubscribed = eventSubscribedWhoCreated
625666
626−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
627668walkInvalidHeightParents s0 = do
628− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
629670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
630671 when (h == invalidHeight) $ do
631672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
632− modify (Some s :)
673+ modify (s :)
633674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
634− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
635676 return subscribers
636677#endif
637678
@@ -668,7 +709,7 @@ behaviorPull !p = Behavior $ do
668709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
669710 parentsRef <- liftIO $ newIORef []
670711 holdInits <- askBehaviorHoldInits
671− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
672713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
673714 parents <- liftIO $ readIORef parentsRef
674715 let subscribed = PullSubscribed
@@ -703,42 +744,46 @@ readBehaviorUntracked b = do
703744-- Dynamic
704745--------------------------------------------------------------------------------
705746
706−data Dynamic x p = Dynamic
707− { dynamicCurrent :: !(Behavior x (PatchTarget p))
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
708751 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
709752 }
710753
711−dynamicHold :: Hold x p -> Dynamic x p
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
712760dynamicHold !h = Dynamic
713761 { dynamicCurrent = behaviorHold h
714762 , dynamicUpdated = eventHold h
715763 }
716764
717−dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
718766dynamicHoldIdentity = dynamicHold
719767
720−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
721769dynamicConst !a = Dynamic
722770 { dynamicCurrent = behaviorConst a
723771 , dynamicUpdated = eventNever
724772 }
725773
726−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
727775dynamicDyn !d = Dynamic
728776 { dynamicCurrent = behaviorDyn d
729777 , dynamicUpdated = eventDyn d
730778 }
731779
732−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
733781dynamicDynIdentity = dynamicDyn
734782
735783--------------------------------------------------------------------------------
736784-- Combinators
737785--------------------------------------------------------------------------------
738786
739−--TODO: Figure out why certain things are not 'representational', then make them
740−--representational so we can use coerce
741−
742787--type role Hold representational
743788data Hold x p
744789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -759,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
759804
760805-- | Stores all global data relevant to a particular Spider timeline; only one
761806-- value should exist for each type @x@
762−data SpiderTimelineEnv x = SpiderTimelineEnv
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
763813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
764814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
765815#ifdef DEBUG
766816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
767817#endif
768818 }
769−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
770820
771821instance Eq (SpiderTimelineEnv x) where
772822 _ == _ = True -- Since only one exists of each type
773823
774824instance GEq SpiderTimelineEnv where
775− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
776826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
777827 else Nothing
778828
@@ -795,7 +845,7 @@ runEventM :: EventM x a -> IO a
795845runEventM = unEventM
796846
797847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
798−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
799849
800850class MonadIO m => Defer a m where
801851 getDeferralQueue :: m (IORef [a])
@@ -933,9 +983,9 @@ getHoldEventSubscription h = do
933983
934984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
935985
936−--type role BehaviorM representational
937986-- BehaviorM can sample behaviors
938−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
987+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988+ deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
939989
940990instance Monad (BehaviorM x) where
941991 {-# INLINE (>>=) #-}
@@ -944,8 +994,10 @@ instance Monad (BehaviorM x) where
944994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
945995 {-# INLINE return #-}
946996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
947998 {-# INLINE fail #-}
948999 fail s = BehaviorM $ fail s
1000+#endif
9491001
9501002data BehaviorSubscribed x a
9511003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1005,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10051057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10061058
10071059-- EventM can do everything BehaviorM can, plus create holds
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
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10091061
10101062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10111063
@@ -1030,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10301082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10311083
10321084heightBagAdd :: Height -> HeightBag -> HeightBag
1033−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10341087
10351088heightBagRemove :: Height -> HeightBag -> HeightBag
10361089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1039,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10391092 0 -> IntMap.delete h c
10401093 _ -> IntMap.insert h (pred old) c
10411094
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+
10421102heightBagMax :: HeightBag -> Height
10431103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10441104 Just ((h, _), _) -> Height h
@@ -1139,17 +1199,24 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11391199 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
11401200 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
11411201
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+
11421209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
11431210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
11441211 | HoldDyn !(Hold x p)
11451212
11461213newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11471214
1148−newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1215+newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
11491216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11501217
11511218--TODO: Avoid the duplication between this and R.zipDynWith
1152−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1219+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
11531220zipDynWith f da db =
11541221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11551222 ec = flip push eab $ \o -> do
@@ -1225,7 +1292,7 @@ run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> Res
12251292run roots after = do
12261293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12271294 let t = spiderTimeline :: SpiderTimelineEnv x
1228− result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
12291296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12301297 occBefore <- liftIO $ do
12311298 occBefore <- readIORef occRef
@@ -1279,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12791346 x' <- evaluate x
12801347 mkWeakPtr x' $
12811348 if debugFinalize
1282− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12831350 else Nothing
12841351
12851352type WeakList a = [Weak a]
12861353
1287−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12881359#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
1360+
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1363+
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
1366+ {
1367+ subscriberPropagate = \m -> do
1368+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369+ subscriberPropagate subscribed m
1370+ , subscriberInvalidateHeight = \old -> do
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372+ subscriberInvalidateHeight subscribed old
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374+ , subscriberRecalculateHeight = \new -> do
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376+ subscriberRecalculateHeight subscribed new
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378+ }
1379+
1380+
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383+withIncreasedDepth _ a = do
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
12931385 result <- a
1294− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12951387 return result
1296−#else
1297−withIncreasedDepth :: m a -> m a
1298−withIncreasedDepth = id
1299−#endif
1300−
1301−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13021388
13031389{-# INLINE tracePropagate #-}
13041390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1305−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13061392
13071393{-# INLINE traceInvalidate #-}
13081394traceInvalidate :: String -> IO ()
1309−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
13101396
1311−{-# INLINE traceWhen #-}
1312−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1313−traceWhen p b message = traceMWhen p b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13141400
1315−{-# INLINE traceMWhen #-}
1316−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1317−traceMWhen _ b getMessage = when b $ do
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
13181408 message <- getMessage
1319−#ifdef DEBUG
1320− spiderTimeline <- askSpiderTimelineEnv
1321− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13221412#else
1323− let d = 0
1413+
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1417+
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1421+
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1425+
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1433+
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1443+
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1447+
13241448#endif
1325− liftIO $ putStrLn $ replicate d ' ' <> message
13261449
13271450whoCreatedIORef :: IORef a -> IO [String]
13281451whoCreatedIORef (IORef a) = whoCreated $! a
13291452
1330−#ifdef DEBUG_CYCLES
13311453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13321454groupByHead = \case
13331455 [] -> []
@@ -1338,20 +1460,54 @@ groupByHead = \case
13381460 | otherwise -> (x, xs :| []) : l
13391461
13401462listsToForest :: Eq a => [[a]] -> Forest a
1341−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1463+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465+
1466+showStacks :: [[String]] -> String
1467+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468+
1469+filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1471+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472+#else
1473+filterStack prefix = id
1474+#endif
1475+
1476+#ifdef DEBUG_CYCLES
1477+
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1480+
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1485+
1486+#else
1487+
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1490+
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494+
13421495#endif
13431496
1497+
13441498{-# INLINE propagateSubscriberHold #-}
13451499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13461500propagateSubscriberHold h a = do
1347− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13481502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13491503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13501505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13511506 case {-# SCC "apply" #-} apply a v of
13521507 Nothing -> return ()
13531508 Just v' -> do
1354− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13551511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13561512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13571513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1359,25 +1515,25 @@ propagateSubscriberHold h a = do
13591515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13601516
13611517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1362−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13631519
13641520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13651521askInvalidator = do
1366− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13671523 case m of
13681524 Nothing -> return Nothing
13691525 Just (!wi, _) -> return $ Just wi
13701526
13711527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13721528askParentsRef = do
1373− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13741530 case m of
13751531 Nothing -> return Nothing
13761532 Just (_, !p) -> return $ Just p
13771533
13781534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13791535askBehaviorHoldInits = do
1380− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13811537 return his
13821538
13831539{-# INLINE getDynHold #-}
@@ -1405,7 +1561,7 @@ getDynHold d = do
14051561zeroRef :: IORef Height
14061562zeroRef = unsafePerformIO $ newIORef zeroHeight
14071563
1408−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14091565getRootSubscribed k r sub = do
14101566 mSubscribed <- readIORef $ rootSubscribed r
14111567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1419,7 +1575,9 @@ getRootSubscribed k r sub = do
14191575 let !cached = rootSubscribed r
14201576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14211577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1422− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14231581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14241582 writeIORef uninitRef $! uninit
14251583#ifdef DEBUG_NODEIDS
@@ -1469,6 +1627,9 @@ data FanInt x a = FanInt
14691627 { _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
14701628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14711629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14721633 }
14731634
14741635newFanInt :: IO (FanInt x a)
@@ -1476,10 +1637,16 @@ newFanInt = do
14761637 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
14771638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14781639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14791643 return $ FanInt
14801644 { _fanInt_subscribers = subscribers
14811645 , _fanInt_subscriptionRef = subscriptionRef
14821646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14831650 }
14841651
14851652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1488,20 +1655,21 @@ fanInt p = unsafePerformIO $ do
14881655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14891656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14901657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1491− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14921660 { subscriberPropagate = \m -> do
14931661 liftIO $ writeIORef (_fanInt_occRef self) m
14941662 scheduleIntClear $ _fanInt_occRef self
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
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 ->
14971665 subscriberPropagate s v
1498− , subscriberInvalidateHeight = \old -> do
1499− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1500− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15011669 subscriberInvalidateHeight s old
1502− , subscriberRecalculateHeight = \new -> do
1503− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1504− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15051673 subscriberRecalculateHeight s new
15061674 }
15071675 liftIO $ do
@@ -1515,10 +1683,25 @@ fanInt p = unsafePerformIO $ do
15151683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15161684 return b
15171685 Just b -> return b
1518− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15191687 currentOcc <- readIORef (_fanInt_occRef self)
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)
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+
15221705
15231706{-# INLINABLE getFanSubscribed #-}
15241707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1701,22 +1884,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
17011884{-# INLINE mergeG #-}
17021885mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
17031886 => (forall a. q a -> Event x (v a))
1704− -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
1887+ -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
17051888mergeG nt d = cacheEvent (mergeCheap nt d)
17061889
17071890{-# INLINE mergeWithMove #-}
17081891mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
17091892 => (forall a. q a -> Event x (v a))
1710− -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
1893+ -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
17111894mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
17121895
17131896{-# INLINE [1] mergeCheap #-}
17141897mergeCheap
17151898 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
17161899 => (forall a. q a -> Event x (v a))
1717− -> Dynamic x (PatchDMap k q)
1900+ -> DynamicS x (PatchDMap k q)
17181901 -> Event x (DMap k v)
1719−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17201903 where
17211904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17221905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1731,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17311914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17321915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17331916 forM_ mOldSubd $ \oldSubd -> do
1734− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17351920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17361921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17371922 foldM f ([], oldParents) $ DMap.toList p
@@ -1742,7 +1927,7 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17421927 let s = subscriber $ return k
17431928 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17441929 height <- liftIO $ getEventSubscribedHeight parentSubd
1745− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17461931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17471932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17481933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1754,9 +1939,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17541939{-# INLINE [1] mergeCheapWithMove #-}
17551940mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17561941 => (forall a. q a -> Event x (v a))
1757− -> Dynamic x (PatchDMapWithMove k q)
1942+ -> DynamicS x (PatchDMapWithMove k q)
17581943 -> Event x (DMap k v)
1759−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17601945 where
17611946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17621947 updateMe subscriber heightBagRef oldParents p = do
@@ -1775,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17751960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
17761961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17771962 Nothing -> do
1778− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17791966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17801967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17811968 Just toKey -> do
17821969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17831970 return Nothing
1784− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973+
17851974 return (toDelete, applyAlways p' oldParents)
17861975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17871976 getInitialSubscribers initialParents subscriber = do
@@ -1790,7 +1979,7 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17901979 let s = subscriber $ liftIO $ readIORef keyRef
17911980 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17921981 height <- liftIO $ getEventSubscribedHeight parentSubd
1793− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17941983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17951984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17961985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1806,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18061995 -> p
18071996 -> EventM x ([EventSubscription x], DMap k s)
18081997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18092000type MergeInitFunc k v q x s
18102001 = DMap k q
18112002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1829,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18292020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18302021invalidateMergeHeight' heightRef sub = do
18312022 oldHeight <- readIORef heightRef
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
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
18332025 writeIORef heightRef $! invalidHeight
18342026 subscriberInvalidateHeight sub oldHeight
18352027
18362028revalidateMergeHeight :: Merge x k v s -> IO ()
18372029revalidateMergeHeight m = do
18382030 currentHeight <- readIORef $ _merge_heightRef m
1839− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2031+
2032+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033+ when (currentHeight == invalidHeight) $ do
18402034 heights <- readIORef $ _merge_heightBagRef m
18412035 parents <- readIORef $ _merge_parentsRef m
18422036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1844,7 +2038,7 @@ revalidateMergeHeight m = do
18442038 LT -> return ()
18452039 EQ -> do
18462040 let height = succHeight $ heightBagMax heights
1847− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18482042 writeIORef (_merge_heightRef m) $! height
18492043 subscriberRecalculateHeight (_merge_sub m) height
18502044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1852,36 +2046,45 @@ revalidateMergeHeight m = do
18522046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18532047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18542048 vals <- liftIO $ readIORef $ _merge_accumRef m
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
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
18562052 --TODO: Assert that m is not empty
18572053 subscriberPropagate (_merge_sub m) vals
18582054
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
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
18612078 { subscriberPropagate = \a -> do
18622079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18632080 k <- getKey
1864− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18652082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18662083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18672084 when (DMap.null oldM) $ do -- Only schedule the firing once
18682085 height <- liftIO $ readIORef $ _merge_heightRef m
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
2086+ checkCycle subscribed
2087+
18852088 scheduleMergeSelf m height
18862089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18872090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1892,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18922095 }
18932096
18942097--TODO: Be able to run as much of this as possible promptly
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)
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)
18972100 where updateMe = do
18982101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1899− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
19002103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
19012104 return subscriptionsToKill
19022105
19032106{-# INLINE mergeGCheap' #-}
19042107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
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
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
19072110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19082111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19092112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19102113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19112114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1912− let m = Merge
2115+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116+
2117+ let subscribed = EventSubscribed
2118+ { eventSubscribedHeightRef = heightRef
2119+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120+#ifdef DEBUG_CYCLES
2121+ , eventSubscribedGetParents = do
2122+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2124+ , eventSubscribedHasOwnHeightRef = False
2125+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126+#endif
2127+ }
2128+
2129+ m = Merge
19132130 { _merge_parentsRef = parentsRef
19142131 , _merge_heightBagRef = heightBagRef
19152132 , _merge_heightRef = heightRef
19162133 , _merge_sub = sub
19172134 , _merge_accumRef = accumRef
19182135 }
1919− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19202137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19212138 myHeight = if invalidHeight `elem` heights
19222139 then invalidHeight
@@ -1925,50 +2142,57 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19252142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19262143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19272144 else (Nothing, dm)
1928− unless (DMap.null accum) $ do
1929− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19302146 liftIO $ writeIORef accumRef $! accum
19312147 liftIO $ writeIORef heightRef $! myHeight
19322148 liftIO $ writeIORef heightBagRef $! myHeightBag
1933− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19342149 liftIO $ writeIORef parentsRef $! initialParentState
19352150 defer $ SomeMergeInit $ do
1936− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19372152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1938− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1939− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19402155 , subscriberInvalidateHeight = \_ -> return ()
19412156 , subscriberRecalculateHeight = \_ -> return ()
19422157 }
1943− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1944− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
19452160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19462161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19472162 -- its subscription.
1948− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19492164 let unsubscribeAll = destroy =<< readIORef parentsRef
1950− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1951− , occ
1952− )
19532165
1954−mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
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)
19552170mergeInt = cacheEvent . mergeIntCheap
19562171
19572172{-# INLINABLE mergeIntCheap #-}
1958−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2173+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19592174mergeIntCheap d = Event $ \sub -> do
19602175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19612176 accum <- liftIO $ FastMutableIntMap.newEmpty
19622177 heightRef <- liftIO $ newIORef zeroHeight
19632178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19642179 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+ }
19652190 let scheduleSelf = do
19662191 height <- liftIO $ readIORef $ heightRef
19672192 scheduleMerge' height heightRef $ do
19682193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19692194 subscriberPropagate sub vals
1970− invalidateMyHeight = do
1971− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19722196 recalculateMyHeight = do
19732197 currentHeight <- readIORef heightRef
19742198 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?
@@ -1978,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19782202 LT -> return ()
19792203 EQ -> do
19802204 let height = succHeight $ heightBagMax heights
1981− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19822206 writeIORef heightRef $! height
19832207 subscriberRecalculateHeight sub height
19842208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19852209 mySubscriber k = Subscriber
19862210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19872213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19882214 liftIO $ FastMutableIntMap.insert accum k a
19892215 when wasEmpty scheduleSelf
@@ -2017,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20172243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20182244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20192245 return Nothing
2020− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20212246 defer $ SomeMergeInit $ do
20222247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20232248 where
@@ -2031,25 +2256,27 @@ mergeIntCheap d = Event $ \sub -> do
20312256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20322257 liftIO $ for_ oldParents $ \oldParent -> do
20332258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20342261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20352262 return $ IntMap.elems oldParents
2036− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20372264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20382265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20392266 defer $ updateMe a
20402267 , subscriberInvalidateHeight = \_ -> return ()
20412268 , subscriberRecalculateHeight = \_ -> return ()
20422269 }
2043− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20442271 forM_ change $ \c -> defer $ updateMe c
20452272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20462273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20472274 -- its subscription.
2048− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20492276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2050− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2051− , occ
2052− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20532280
20542281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
20552282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2115,7 +2342,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
21152342-- | Run an event action outside of a frame
21162343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
21172344runFrame a = SpiderHost $ do
2118− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
21192346 let go = do
21202347 result <- a
21212348 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
@@ -2132,19 +2359,19 @@ runFrame a = SpiderHost $ do
21322359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21332360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21342361 writeIORef vRef v
2135− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21362363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21372364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21382365 writeIORef (eventEnvMergeUpdates env) []
2139− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21402367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2141− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21422369 toReconnect <- readIORef toReconnectRef
21432370 clearEventEnv env
21442371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21452372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21462373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2147− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21482375 finalize wi
21492376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21502377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2158,7 +2385,7 @@ runFrame a = SpiderHost $ do
21582385 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
21592386 {-
21602387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2161− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21622389 EventRoot _ -> "EventRoot"
21632390 EventNever -> "EventNever"
21642391 _ -> "something else"
@@ -2173,7 +2400,7 @@ runFrame a = SpiderHost $ do
21732400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21742401 when (parentHeight /= myHeight) $ do
21752402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2176− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21772404 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
21782405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21792406 unsubscribe subscription
@@ -2214,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
22142441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
22152442 when (oldHeight /= invalidHeight) $ do
22162443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2217− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
22182445
22192446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
22202447updateSwitchHeight new subscribed = do
@@ -2222,7 +2449,7 @@ updateSwitchHeight new subscribed = do
22222449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22232450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22242451 writeIORef (switchSubscribedHeight subscribed) $! new
2225− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
22262453
22272454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22282455recalculateCoincidenceHeight subscribed = do
@@ -2231,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22312458 height <- calculateCoincidenceHeight subscribed
22322459 when (height /= invalidHeight) $ do
22332460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2234− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22352462
22362463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22372464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2293,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22932520 {-# INLINABLE headE #-}
22942521 headE = R.slowHeadE
22952522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22962525
22972526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22982527 {-# INLINABLE sample #-}
@@ -2314,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23142543 {-# INLINABLE headE #-}
23152544 headE = R.slowHeadE
23162545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23172549
23182550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23192551 {-# INLINE return #-}
@@ -2322,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23222554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23232555 {-# INLINE (>>) #-}
23242556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
23252558 {-# INLINE fail #-}
23262559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23272561
23282562{-# INLINABLE newJoinDyn #-}
2329−newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2563+newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
23302564newJoinDyn d =
23312565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
23322566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2375,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23752609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23762610 {-# INLINABLE headE #-}
23772611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23782615
23792616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23802617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2391,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23912628 {-# INLINABLE headE #-}
23922629 headE = R.slowHeadE
23932630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23942633
23952634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23962635 {-# INLINABLE sample #-}
@@ -2411,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24112650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24122651 {-# INLINABLE headE #-}
24132652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24142655
24152656--------------------------------------------------------------------------------
24162657-- Deprecated items
@@ -2448,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24482689 touch h
24492690 return result
24502691
2451−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24522693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24532694 newFanEventWithTrigger f = SpiderHost $ do
24542695 es <- newFanEventWithTriggerIO f
24552696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24562697
2457−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24582699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24592700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24602701 es <- newFanEventWithTriggerIO f
@@ -2476,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24762717#ifdef DEBUG
24772718 depthRef <- newIORef 0
24782719#endif
2479− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24802721 { _spiderTimeline_lock = lock
24812722 , _spiderTimeline_eventEnv = env
24822723#ifdef DEBUG
@@ -2492,13 +2733,13 @@ data LocalSpiderTimeline (x :: Type) s
24922733
24932734instance Reifies s (SpiderTimelineEnv x) =>
24942735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2495− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24962737
24972738localSpiderTimeline
2498− :: Proxy s
2739+ :: proxy s
24992740 -> SpiderTimelineEnv x
25002741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2501−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
25022743
25032744-- | Pass a new timeline to the given function.
25042745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2516,8 +2757,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25162757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
25172758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
25182759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
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 }
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 }
25212762 type PullM (SpiderTimeline x) = SpiderPullM x
25222763 type PushM (SpiderTimeline x) = SpiderPushM x
25232764 {-# INLINABLE never #-}
@@ -2534,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25342775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25352776 {-# INLINABLE mergeG #-}
25362777 mergeG
2537− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25382779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25392780 -> DMap k q
25402781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2546,7 +2787,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25462787 {-# INLINABLE current #-}
25472788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
25482789 {-# INLINABLE updated #-}
2549− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
25502791 {-# INLINABLE unsafeBuildDynamic #-}
25512792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
25522793 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2565,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25652806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25662807 eventCoercion Coercion = Coercion
25672808 behaviorCoercion 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
2809+ dynamicCoercion Coercion = Coercion
2810+ incrementalCoercion Coercion Coercion = Coercion
25692811 {-# INLINABLE mergeIntIncremental #-}
2570− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25712813 {-# INLINABLE fanInt #-}
25722814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25732815
@@ -2601,8 +2843,14 @@ instance Monad (SpiderHost x) where
26012843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
26022844 {-# INLINABLE return #-}
26032845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
26042847 {-# INLINABLE fail #-}
2605− fail s = SpiderHost $ fail s
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2853+ fail s = SpiderHost $ MonadFail.fail s
26062854
26072855-- | Run an action affecting the global Spider timeline; this will be guarded by
26082856-- a mutex for that timeline
@@ -2624,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
26242872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26252873 {-# INLINABLE return #-}
26262874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
26272876 {-# INLINABLE fail #-}
26282877 fail s = SpiderHostFrame $ fail s
2878+#endif
26292879
26302880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26312881 notReadyUntil _ = pure ()
26322882 notReady = pure ()
26332883
2634−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26352885newEventWithTriggerIO f = do
26362886 es <- newFanEventWithTriggerIO $ \Refl -> f
26372887 return $ select es Refl
26382888
2639−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26402890newFanEventWithTriggerIO f = do
26412891 occRef <- newIORef DMap.empty
26422892 subscribedRef <- newIORef DMap.empty
@@ -2670,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26702920instance PrimMonad (SpiderHostFrame x) where
26712921 type PrimState (SpiderHostFrame x) = PrimState IO
26722922 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 ()