@@ -9,17 +9,22 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiParamTypeClasses #-}
13−{-# LANGUAGE MultiWayIf #-}
1412{-# LANGUAGE RankNTypes #-}
1513{-# LANGUAGE RoleAnnotations #-}
1614{-# LANGUAGE ScopedTypeVariables #-}
1715{-# LANGUAGE TypeFamilies #-}
1816{-# LANGUAGE TypeOperators #-}
1917{-# LANGUAGE UndecidableInstances #-}
18+{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
21+{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
23+
2024#ifdef USE_REFLEX_OPTIMIZER
2125{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2226#endif
27+{-# OPTIONS_GHC -Wunused-binds #-}
2328-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2429-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
2530module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -33,12 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3338import Control.Monad.Exception
3439import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3540import Control.Monad.Primitive
36−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
3744import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
3847import Data.Align
3948import Data.Coerce
40−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4150import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
4252import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
4353import qualified Data.FastMutableIntMap as FastMutableIntMap
4454import Data.Foldable hiding (concat, elem, sequence_)
@@ -49,13 +59,15 @@ import Data.GADT.Compare
4959import Data.IntMap.Strict (IntMap)
5060import qualified Data.IntMap.Strict as IntMap
5161import Data.IORef
62+import Data.Kind (Type)
5263import Data.Maybe hiding (mapMaybe)
53−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
5465import Data.Proxy
5566import Data.These
5667import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
5769import Data.Witherable (Filterable, mapMaybe)
58−import GHC.Exts
70+import GHC.Exts hiding (toList)
5971import GHC.IORef (IORef (..))
6072import GHC.Stack
6173import Reflex.FastWeak
@@ -63,40 +75,57 @@ import System.IO.Unsafe
6375import System.Mem.Weak
6476import Unsafe.Coerce
6577
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+
6687#ifdef DEBUG_CYCLES
6788import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
6891import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
6992import qualified Data.List.NonEmpty as NonEmpty
70−import Data.Monoid (mempty)
7193import Data.Tree (Forest, Tree (..), drawForest)
72−#endif
94+import Data.List (isPrefixOf)
7395
74−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
7597import qualified Data.FastWeakBag as FastWeakBag
98+
7699import Data.Reflection
77−import Data.Some (Some)
78−import qualified Data.Some as Some
100+import Data.Some (Some(Some))
79101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
80103import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
81104import qualified Data.WeakBag as WeakBag
82105import qualified Reflex.Class
83106import qualified Reflex.Class as R
84107import qualified Reflex.Host.Class
85108import Reflex.NotReady.Class
86−import Reflex.Patch
87−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)
88112
89113#ifdef DEBUG_TRACE_EVENTS
90114import qualified Data.ByteString.Char8 as BS8
91115import System.IO (stderr)
116+import Data.List (isPrefixOf)
92117#endif
93118
94−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
95122
123+#ifdef DEBUG_TRACE_EVENTS
96124withStackOneLine :: (BS8.ByteString -> a) -> a
97125withStackOneLine expr = unsafePerformIO $ do
98126 stack <- currentCallStack
99− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
100129
101130#endif
102131
@@ -107,28 +136,42 @@ debugInvalidateHeight :: Bool
107136debugInvalidate :: Bool
108137
109138#ifdef DEBUG
110−
111139#define DEBUG_NODEIDS
112140
141+#ifdef DEBUG_TRACE_PROPAGATION
113142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
114146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
115150debugInvalidateHeight = False
151+#endif
116152
153+#ifdef DEBUG_TRACE_INVALIDATION
117154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
118158
119159class HasNodeId a where
120160 getNodeId :: a -> Int
121161
122−instance HasNodeId (Hold x p a) where
123− 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
124167
125−instance HasNodeId (PushSubscribed x a b) where
126− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
127170
128171instance HasNodeId (SwitchSubscribed x a) where
129172 getNodeId = switchSubscribedNodeId
130173
131−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
132175 getNodeId = fanSubscribedNodeId
133176
134177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -142,41 +185,16 @@ instance HasNodeId (Pull x a) where
142185
143186{-# INLINE showNodeId #-}
144187showNodeId :: HasNodeId a => a -> String
145−showNodeId = ("#"<>) . show . getNodeId
146−
147−showSubscriberType :: Subscriber x a -> String
148−showSubscriberType = \case
149− SubscriberPush _ _ -> "SubscriberPush"
150− SubscriberMerge _ _ -> "SubscriberMerge"
151− SubscriberFan _ -> "SubscriberFan"
152− SubscriberMergeChange _ -> "SubscriberMergeChange"
153− SubscriberHold _ -> "SubscriberHold"
154− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
155− SubscriberSwitch _ -> "SubscriberSwitch"
156− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
157− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
158− SubscriberHandle -> "SubscriberHandle"
159−
160−showEventType :: Event x a -> String
161−showEventType = \case
162− EventRoot _ _ -> "EventRoot"
163− EventNever -> "EventNever"
164− EventPush _ -> "EventPush"
165− EventMerge _ -> "EventMerge"
166− EventFan _ _ -> "EventFan"
167− EventSwitch _ -> "EventSwitch"
168− EventCoincidence _ -> "EventCoincidence"
169− EventHold _ -> "EventHold"
170− EventDyn _ -> "EventDyn"
171− EventHoldIdentity _ -> "EventHoldIdentity"
172− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
173193
174194#else
175195
176196debugPropagate = False
177−
178197debugInvalidateHeight = False
179−
180198debugInvalidate = False
181199
182200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -184,6 +202,10 @@ debugInvalidate = False
184202showNodeId :: a -> String
185203showNodeId _ = ""
186204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
187209#endif
188210
189211#ifdef DEBUG_NODEIDS
@@ -193,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
193215
194216newNodeId :: IO Int
195217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
196−
197−{-# NOINLINE unsafeNodeId #-}
198−unsafeNodeId :: a -> Int
199−unsafeNodeId a = unsafePerformIO $ do
200− touch a
201− newNodeId
202218#endif
203219
204220--------------------------------------------------------------------------------
@@ -235,9 +251,9 @@ subscribeAndRead = unEvent
235251-- caching; if the computation function is very cheap, this is (much) more
236252-- efficient than 'push'
237253{-# INLINE [1] pushCheap #-}
238−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
239255pushCheap !f e = Event $ \sub -> do
240− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
241257 { subscriberPropagate = \a -> do
242258 mb <- f a
243259 mapM_ (subscriberPropagate sub) mb
@@ -256,10 +272,10 @@ terminalSubscriber p = Subscriber
256272
257273-- | Subscribe to an Event only for the duration of one occurrence
258274{-# INLINE subscribeAndReadHead #-}
259−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)
260276subscribeAndReadHead e sub = do
261277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
262− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
263279 { subscriberPropagate = \a -> do
264280 liftIO $ unsubscribe =<< readIORef subscriptionRef
265281 subscriberPropagate sub a
@@ -270,24 +286,42 @@ subscribeAndReadHead e sub = do
270286 return (subscription, occ)
271287
272288--TODO: Make this lazy in its input event
273−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)
274290headE originalE = do
275291 parent <- liftIO $ newIORef $ Just originalE
276292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
277293 let clearParent = liftIO $ writeIORef parent Nothing
278− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
279295 when (isJust occ) clearParent
280− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
281297 liftIO (readIORef parent) >>= \case
282− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
283299 Just e -> subscribeAndReadHead e sub
284300
285301data CacheSubscribed x a
286302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
287303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
288304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
289308 }
290309
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+
291325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
292326-- repeatedly
293327--
@@ -302,27 +336,33 @@ cacheEvent e =
302336#else
303337 Event $
304338#endif
305− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
306− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
307− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
308343#ifdef DEBUG_TRACE_EVENTS
309344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
310345#endif
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,13 +420,16 @@ 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
373−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
374433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
375434
376435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -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
@@ -422,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
422471 , subscriberRecalculateHeight = \_ -> return ()
423472 }
424473
425−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
426−newSubscriberFan subscribed = return $ Subscriber
474+newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
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
432− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
433482 propagate v $ _fanSubscribedChildren_list subsubs
434483 return $ Constant ()
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
580−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: 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.This $ _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.This $ _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.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
612− innerParents = maybeToList $ fmap Some.This 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.This s0) $ fix $ \loop (Some.This 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.This s :)
673+ modify (s :)
633674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
634− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
635676 return subscribers
636677#endif
637678
@@ -659,7 +700,7 @@ behaviorPull !p = Behavior $ do
659700 val <- liftIO $ readIORef $ pullValue p
660701 case val of
661702 Just subscribed -> do
662− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
663704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
664705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
665706 return $ pullSubscribedValue subscribed
@@ -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
@@ -678,7 +719,7 @@ behaviorPull !p = Behavior $ do
678719 , pullSubscribedParents = parents
679720 }
680721 liftIO $ writeIORef (pullValue p) $ Just subscribed
681− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
682723 return a
683724
684725behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -689,7 +730,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
689730readHoldTracked h = do
690731 result <- liftIO $ readIORef $ holdValue h
691732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
692− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
693734 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
694735 return result
695736
@@ -703,42 +744,46 @@ readBehaviorUntracked b = do
703744-- Dynamic
704745--------------------------------------------------------------------------------
705746
706−data Dynamic x p = Dynamic
707− { dynamicCurrent :: !(Behavior x (PatchTarget p))
708− , dynamicUpdated :: !(Event x p)
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
751+ , 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
@@ -782,9 +832,9 @@ data EventEnv x
782832 , eventEnvDynInits :: !(IORef [SomeDynInit x])
783833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
784834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
785− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
786− , eventEnvIntClears :: !(IORef [SomeIntClear])
787− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
788838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
789839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
790840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -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])
@@ -856,29 +906,29 @@ putCurrentHeight h = do
856906 heightRef <- asksEventEnv eventEnvCurrentHeight
857907 liftIO $ writeIORef heightRef $! h
858908
859−instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
860910 {-# INLINE getDeferralQueue #-}
861911 getDeferralQueue = asksEventEnv eventEnvClears
862912
863913{-# INLINE scheduleClear #-}
864−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
865−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
866916
867−instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
868918 {-# INLINE getDeferralQueue #-}
869919 getDeferralQueue = asksEventEnv eventEnvIntClears
870920
871921{-# INLINE scheduleIntClear #-}
872−scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
873−scheduleIntClear r = defer $ SomeIntClear r
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
874924
875−instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
876926 {-# INLINE getDeferralQueue #-}
877927 getDeferralQueue = asksEventEnv eventEnvRootClears
878928
879929{-# INLINE scheduleRootClear #-}
880−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
881−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
882932
883933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
884934 {-# INLINE getDeferralQueue #-}
@@ -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,14 +994,16 @@ 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)
9521004 | BehaviorSubscribedPull (PullSubscribed x a)
9531005
954−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
9551007
9561008--type role PullSubscribed representational
9571009data PullSubscribed x a
@@ -986,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9861038#endif
9871039 }
9881040
989−data Root x (k :: * -> *)
1041+data Root x k
9901042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9911043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9921044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -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
@@ -1056,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10561116heightBagVerify = id
10571117#endif
10581118
1059−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1060− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1061− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1062− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1119+data FanSubscribedChildren x k v a = FanSubscribedChildren
1120+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1121+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1122+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
10631123 }
10641124
1065−data FanSubscribed (x :: *) k
1066− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1067− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1068− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1125+data FanSubscribed x k v
1126+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1127+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1128+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
10691129 , fanSubscribedParent :: !(EventSubscription x)
10701130#ifdef DEBUG_NODEIDS
10711131 , fanSubscribedNodeId :: Int
10721132#endif
10731133 }
10741134
1075−data Fan x k
1076− = Fan { fanParent :: !(Event x (DMap k Identity))
1077− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1135+data Fan x k v
1136+ = Fan { fanParent :: !(Event x (DMap k v))
1137+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
10781138 }
10791139
10801140data SwitchSubscribed x a
@@ -1133,19 +1193,30 @@ instance HasSpiderTimeline x => Filterable (Event x) where
11331193
11341194instance HasSpiderTimeline x => Align (Event x) where
11351195 nil = eventNever
1136− align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1196+#if MIN_VERSION_these(0, 8, 0)
1197+instance HasSpiderTimeline x => Semialign (Event x) where
1198+#endif
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201+
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
11371208
11381209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
11391210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
11401211 | HoldDyn !(Hold x p)
11411212
1142−newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11431214
1144−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)
11451216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11461217
11471218--TODO: Avoid the duplication between this and R.zipDynWith
1148−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)
11491220zipDynWith f da db =
11501221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11511222 ec = flip push eab $ \o -> do
@@ -1168,18 +1239,12 @@ buildDynamic readV0 v' = do
11681239 return d
11691240
11701241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1171−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1172− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11731244
11741245-- ResultM can read behaviors and events
11751246type ResultM = EventM
11761247
1177−{-# NOINLINE unsafeNewIORef #-}
1178−unsafeNewIORef :: a -> b -> IORef b
1179−unsafeNewIORef a b = unsafePerformIO $ do
1180− touch a
1181− newIORef b
1182−
11831248instance HasSpiderTimeline x => Functor (Event x) where
11841249 fmap f = push $ return . Just . f
11851250
@@ -1192,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
11921257
11931258{-# INLINABLE pull #-}
11941259pull :: BehaviorM x a -> Behavior x a
1195−pull a = behaviorPull $ Pull
1196− { pullCompute = a
1197− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11981262#ifdef DEBUG_NODEIDS
1199− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
12001264#endif
1201− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
12021272
12031273{-# INLINABLE switch #-}
12041274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1205−switch a = eventSwitch $ Switch
1206− { switchParent = a
1207− , switchSubscribed = unsafeNewIORef a Nothing
1208− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
12091281
12101282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1211−coincidence a = eventCoincidence $ Coincidence
1212− { coincidenceParent = a
1213− , coincidenceSubscribed = unsafeNewIORef a Nothing
1214− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
12151289
12161290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12171291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12181292run roots after = do
12191293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12201294 let t = spiderTimeline :: SpiderTimelineEnv x
1221− result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
12221296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12231297 occBefore <- liftIO $ do
12241298 occBefore <- readIORef occRef
@@ -1256,11 +1330,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
12561330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
12571331 EQ -> a
12581332
1259−data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
1333+newtype Clear a = Clear (IORef (Maybe a))
12601334
1261−data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
1335+newtype IntClear a = IntClear (IORef (IntMap a))
12621336
1263−data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
12641338
12651339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12661340
@@ -1272,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12721346 x' <- evaluate x
12731347 mkWeakPtr x' $
12741348 if debugFinalize
1275− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12761350 else Nothing
12771351
12781352type WeakList a = [Weak a]
12791353
1280−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12811359#ifdef DEBUG
1282−withIncreasedDepth :: CanTrace x m => m a -> m a
1283−withIncreasedDepth a = do
1284− spiderTimeline <- askSpiderTimelineEnv
1285− 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
12861385 result <- a
1287− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12881387 return result
1289−#else
1290−withIncreasedDepth :: m a -> m a
1291−withIncreasedDepth = id
1292−#endif
1293−
1294−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12951388
12961389{-# INLINE tracePropagate #-}
12971390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1298−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
12991392
13001393{-# INLINE traceInvalidate #-}
13011394traceInvalidate :: String -> IO ()
1302−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13031400
1304−{-# INLINE traceWhen #-}
1305−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1306−traceWhen p b message = traceMWhen p b $ return message
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
13071404
1308−{-# INLINE traceMWhen #-}
1309−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1310−traceMWhen _ b getMessage = when b $ do
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13111408 message <- getMessage
1312−#ifdef DEBUG
1313− spiderTimeline <- askSpiderTimelineEnv
1314− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13151412#else
1316− 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+
13171448#endif
1318− liftIO $ putStrLn $ replicate d ' ' <> message
13191449
13201450whoCreatedIORef :: IORef a -> IO [String]
13211451whoCreatedIORef (IORef a) = whoCreated $! a
13221452
1323−#ifdef DEBUG_CYCLES
13241453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13251454groupByHead = \case
13261455 [] -> []
@@ -1331,20 +1460,54 @@ groupByHead = \case
13311460 | otherwise -> (x, xs :| []) : l
13321461
13331462listsToForest :: Eq a => [[a]] -> Forest a
1334−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+
13351495#endif
13361496
1497+
13371498{-# INLINE propagateSubscriberHold #-}
13381499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13391500propagateSubscriberHold h a = do
1340− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13411502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13421503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13431505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13441506 case {-# SCC "apply" #-} apply a v of
13451507 Nothing -> return ()
13461508 Just v' -> do
1347− {-# 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)
13481511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13491512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13501513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1352,25 +1515,25 @@ propagateSubscriberHold h a = do
13521515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13531516
13541517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1355−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13561519
13571520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13581521askInvalidator = do
1359− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13601523 case m of
13611524 Nothing -> return Nothing
13621525 Just (!wi, _) -> return $ Just wi
13631526
13641527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13651528askParentsRef = do
1366− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13671530 case m of
13681531 Nothing -> return Nothing
13691532 Just (_, !p) -> return $ Just p
13701533
13711534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13721535askBehaviorHoldInits = do
1373− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13741537 return his
13751538
13761539{-# INLINE getDynHold #-}
@@ -1398,7 +1561,7 @@ getDynHold d = do
13981561zeroRef :: IORef Height
13991562zeroRef = unsafePerformIO $ newIORef zeroHeight
14001563
1401−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)
14021565getRootSubscribed k r sub = do
14031566 mSubscribed <- readIORef $ rootSubscribed r
14041567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1412,9 +1575,14 @@ getRootSubscribed k r sub = do
14121575 let !cached = rootSubscribed r
14131576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14141577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1415− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14161581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14171582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14181586 let !subscribed = RootSubscribed
14191587 { rootSubscribedKey = k
14201588 , rootSubscribedCachedSubscribed = cached
@@ -1423,7 +1591,7 @@ getRootSubscribed k r sub = do
14231591 , rootSubscribedUninit = uninit
14241592 , rootSubscribedWeakSelf = weakSelf
14251593#ifdef DEBUG_NODEIDS
1426− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14271595#endif
14281596 }
14291597 -- If we die at the same moment that all our children die, they will
@@ -1459,6 +1627,9 @@ data FanInt x a = FanInt
14591627 { _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
14601628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14611629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14621633 }
14631634
14641635newFanInt :: IO (FanInt x a)
@@ -1466,38 +1637,39 @@ newFanInt = do
14661637 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
14671638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14681639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14691643 return $ FanInt
14701644 { _fanInt_subscribers = subscribers
14711645 , _fanInt_subscriptionRef = subscriptionRef
14721646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14731650 }
14741651
1475−{-# NOINLINE unsafeNewFanInt #-}
1476−unsafeNewFanInt :: b -> FanInt x a
1477−unsafeNewFanInt b = unsafePerformIO $ do
1478− touch b
1479− newFanInt
1480−
14811652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1482−fanInt p =
1483− let self = unsafeNewFanInt p
1484− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14851656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14861657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1487− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14881660 { subscriberPropagate = \m -> do
14891661 liftIO $ writeIORef (_fanInt_occRef self) m
14901662 scheduleIntClear $ _fanInt_occRef self
1491− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1492− 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 ->
14931665 subscriberPropagate s v
1494− , subscriberInvalidateHeight = \old -> do
1495− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1496− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
14971669 subscriberInvalidateHeight s old
1498− , subscriberRecalculateHeight = \new -> do
1499− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1500− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15011673 subscriberRecalculateHeight s new
15021674 }
15031675 liftIO $ do
@@ -1511,13 +1683,28 @@ fanInt p =
15111683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15121684 return b
15131685 Just b -> return b
1514− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15151687 currentOcc <- readIORef (_fanInt_occRef self)
1516− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1517− 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+
15181705
15191706{-# INLINABLE getFanSubscribed #-}
1520−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
1707+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
15211708getFanSubscribed k f sub = do
15221709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15231710 case mSubscribed of
@@ -1535,13 +1722,16 @@ getFanSubscribed k f sub = do
15351722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15361723 occRef <- liftIO $ newIORef parentOcc
15371724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15381728 let subscribed = FanSubscribed
15391729 { fanSubscribedCachedSubscribed = fanSubscribed f
15401730 , fanSubscribedOccurrence = occRef
15411731 , fanSubscribedParent = subscription
15421732 , fanSubscribedSubscribers = subscribersRef
15431733#ifdef DEBUG_NODEIDS
1544− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15451735#endif
15461736 }
15471737 let !self = (k, subscribed)
@@ -1551,7 +1741,7 @@ getFanSubscribed k f sub = do
15511741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15521742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15531743
1554−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15551745cleanupFanSubscribed (k, subscribed) = do
15561746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15571747 let reducedSubscribers = DMap.delete k subscribers
@@ -1563,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15631753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15641754
15651755{-# INLINE subscribeFanSubscribed #-}
1566−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1756+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
15671757subscribeFanSubscribed k subscribed sub = do
15681758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15691759 case DMap.lookup k subscribers of
@@ -1601,6 +1791,9 @@ getSwitchSubscribed s sub = do
16011791 when (isJust parentOcc) $ scheduleClear occRef
16021792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16031793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16041797 let !subscribed = SwitchSubscribed
16051798 { switchSubscribedCachedSubscribed = switchSubscribed s
16061799 , switchSubscribedOccurrence = occRef
@@ -1613,7 +1806,7 @@ getSwitchSubscribed s sub = do
16131806 , switchSubscribedCurrentParent = subscriptionRef
16141807 , switchSubscribedWeakSelf = weakSelf
16151808#ifdef DEBUG_NODEIDS
1616− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16171810#endif
16181811 }
16191812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1658,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16581851 scheduleClear innerSubdRef
16591852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16601853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16611857 let subscribed = CoincidenceSubscribed
16621858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16631859 , coincidenceSubscribedOccurrence = occRef
@@ -1668,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16681864 , coincidenceSubscribedInnerParent = innerSubdRef
16691865 , coincidenceSubscribedWeakSelf = weakSelf
16701866#ifdef DEBUG_NODEIDS
1671− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16721868#endif
16731869 }
16741870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1685,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16851881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16861882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16871883
1688−{-# INLINE merge #-}
1689−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1690−merge d = cacheEvent (mergeCheap d)
1884+{-# INLINE mergeG #-}
1885+mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886+ => (forall a. q a -> Event x (v a))
1887+ -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888+mergeG nt d = cacheEvent (mergeCheap nt d)
16911889
16921890{-# INLINE mergeWithMove #-}
1693−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1694−mergeWithMove d = cacheEvent (mergeCheapWithMove d)
1891+mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892+ => (forall a. q a -> Event x (v a))
1893+ -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894+mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
16951895
16961896{-# INLINE [1] mergeCheap #-}
1697−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1698−mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
1897+mergeCheap
1898+ :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899+ => (forall a. q a -> Event x (v a))
1900+ -> DynamicS x (PatchDMap k q)
1901+ -> Event x (DMap k v)
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
16991903 where
1700− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17011905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
17021906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
17031907 (mOldSubd, newPs) <- case me of
17041908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
17051909 Just e -> do
17061910 let s = subscriber $ return k
1707− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
17081912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
17091913 let newParent = MergeSubscribedParent subscription
17101914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17111915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17121916 forM_ mOldSubd $ \oldSubd -> do
1713− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17141920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17151921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17161922 foldM f ([], oldParents) $ DMap.toList p
1717− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
17181925 getInitialSubscribers initialParents subscriber = do
17191926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17201927 let s = subscriber $ return k
1721− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17221929 height <- liftIO $ getEventSubscribedHeight parentSubd
1723− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17241931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17251932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17261933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17271934 )
1935+
17281936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
17291937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
17301938
17311939{-# INLINE [1] mergeCheapWithMove #-}
1732−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1733−mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
1940+mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941+ => (forall a. q a -> Event x (v a))
1942+ -> DynamicS x (PatchDMapWithMove k q)
1943+ -> Event x (DMap k v)
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17341945 where
1735− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17361947 updateMe subscriber heightBagRef oldParents p = do
17371948 -- Prepare new parents for insertion
1738− let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
1949+ let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
17391950 subscribeParent k e = do
17401951 keyRef <- liftIO $ newIORef k
17411952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1744,73 +1955,82 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
17441955 newParentHeight <- getEventSubscribedHeight subd
17451956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17461957 return $ MergeSubscribedParentWithMove subscription keyRef
1747− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
17481959 -- Collect old parents for deletion and update the keys of moved parents
1749− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1960+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
17501961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17511962 Nothing -> do
1752− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17531966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17541967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17551968 Just toKey -> do
17561969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17571970 return Nothing
1758− 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+
17591974 return (toDelete, applyAlways p' oldParents)
1760− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17611976 getInitialSubscribers initialParents subscriber = do
17621977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17631978 keyRef <- liftIO $ newIORef k
17641979 let s = subscriber $ liftIO $ readIORef keyRef
1765− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17661981 height <- liftIO $ getEventSubscribedHeight parentSubd
1767− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17681983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17691984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17701985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17711986 )
1987+
17721988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
17731989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
17741990
1775−type MergeUpdateFunc k x p s
1776− = (forall a. EventM x (k a) -> Subscriber x a)
1991+type MergeUpdateFunc k v x p s
1992+ = (forall a. EventM x (k a) -> Subscriber x (v a))
17771993 -> IORef HeightBag
17781994 -> DMap k s
17791995 -> p
17801996 -> EventM x ([EventSubscription x], DMap k s)
17811997
1782−type MergeInitFunc k x s
1783− = DMap k (Event x)
1784− -> (forall a. EventM x (k a) -> Subscriber x a)
1785− -> EventM x (DMap k Identity, [Height], DMap k s)
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
2000+type MergeInitFunc k v q x s
2001+ = DMap k q
2002+ -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003+ -> EventM x (DMap k v, [Height], DMap k s)
17862004
17872005type MergeDestroyFunc k s
17882006 = DMap k s
17892007 -> IO ()
17902008
1791−data Merge x k s = Merge
2009+data Merge x k v s = Merge
17922010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
17932011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
17942012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1795− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1796− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
17972015 }
17982016
1799−invalidateMergeHeight :: Merge x k s -> IO ()
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
18002018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
18012019
18022020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18032021invalidateMergeHeight' heightRef sub = do
18042022 oldHeight <- readIORef heightRef
1805− 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
18062025 writeIORef heightRef $! invalidHeight
18072026 subscriberInvalidateHeight sub oldHeight
18082027
1809−
1810−revalidateMergeHeight :: Merge x k s -> IO ()
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
18112029revalidateMergeHeight m = do
18122030 currentHeight <- readIORef $ _merge_heightRef m
1813− 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
18142034 heights <- readIORef $ _merge_heightBagRef m
18152035 parents <- readIORef $ _merge_parentsRef m
18162036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1818,44 +2038,53 @@ revalidateMergeHeight m = do
18182038 LT -> return ()
18192039 EQ -> do
18202040 let height = succHeight $ heightBagMax heights
1821− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18222042 writeIORef (_merge_heightRef m) $! height
18232043 subscriberRecalculateHeight (_merge_sub m) height
18242044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
18252045
1826−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18272047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18282048 vals <- liftIO $ readIORef $ _merge_accumRef m
1829− 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
18302052 --TODO: Assert that m is not empty
18312053 subscriberPropagate (_merge_sub m) vals
18322054
1833−mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1834−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
18352078 { subscriberPropagate = \a -> do
18362079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18372080 k <- getKey
1838− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18392082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18402083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18412084 when (DMap.null oldM) $ do -- Only schedule the firing once
18422085 height <- liftIO $ readIORef $ _merge_heightRef m
1843− --TODO: assertions about height
1844− currentHeight <- getCurrentHeight
1845− when (height <= currentHeight) $ do
1846− if height /= invalidHeight
1847− then do
1848− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1849− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1850− else liftIO $ do
1851−#ifdef DEBUG_CYCLES
1852− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1853− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1854− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1855−#else
1856− let cycleInfo = ""
1857−#endif
1858− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18592088 scheduleMergeSelf m height
18602089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18612090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1866,30 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18662095 }
18672096
18682097--TODO: Be able to run as much of this as possible promptly
1869−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1870−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)
18712100 where updateMe = do
18722101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1873− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18742103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18752104 return subscriptionsToKill
18762105
1877−{-# INLINE mergeCheap' #-}
1878−mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k Identity)
1879−mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2106+{-# INLINE mergeGCheap' #-}
2107+mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108+ => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
18802110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
18812111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
18822112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
18832113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
18842114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1885− 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
18862130 { _merge_parentsRef = parentsRef
18872131 , _merge_heightBagRef = heightBagRef
18882132 , _merge_heightRef = heightRef
18892133 , _merge_sub = sub
18902134 , _merge_accumRef = accumRef
18912135 }
1892− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
18932137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
18942138 myHeight = if invalidHeight `elem` heights
18952139 then invalidHeight
@@ -1898,50 +2142,57 @@ mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
18982142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
18992143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19002144 else (Nothing, dm)
1901− unless (DMap.null accum) $ do
1902− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19032146 liftIO $ writeIORef accumRef $! accum
19042147 liftIO $ writeIORef heightRef $! myHeight
19052148 liftIO $ writeIORef heightBagRef $! myHeightBag
1906− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19072149 liftIO $ writeIORef parentsRef $! initialParentState
19082150 defer $ SomeMergeInit $ do
1909− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19102152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1911− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1912− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19132155 , subscriberInvalidateHeight = \_ -> return ()
19142156 , subscriberRecalculateHeight = \_ -> return ()
19152157 }
1916− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1917− 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
19182160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19192161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19202162 -- its subscription.
1921− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19222164 let unsubscribeAll = destroy =<< readIORef parentsRef
1923− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1924− , occ
1925− )
19262165
1927−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)
19282170mergeInt = cacheEvent . mergeIntCheap
19292171
19302172{-# INLINABLE mergeIntCheap #-}
1931−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)
19322174mergeIntCheap d = Event $ \sub -> do
19332175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19342176 accum <- liftIO $ FastMutableIntMap.newEmpty
19352177 heightRef <- liftIO $ newIORef zeroHeight
19362178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19372179 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+ }
19382190 let scheduleSelf = do
19392191 height <- liftIO $ readIORef $ heightRef
19402192 scheduleMerge' height heightRef $ do
19412193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19422194 subscriberPropagate sub vals
1943− invalidateMyHeight = do
1944− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19452196 recalculateMyHeight = do
19462197 currentHeight <- readIORef heightRef
19472198 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?
@@ -1951,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19512202 LT -> return ()
19522203 EQ -> do
19532204 let height = succHeight $ heightBagMax heights
1954− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19552206 writeIORef heightRef $! height
19562207 subscriberRecalculateHeight sub height
19572208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19582209 mySubscriber k = Subscriber
19592210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19602213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19612214 liftIO $ FastMutableIntMap.insert accum k a
19622215 when wasEmpty scheduleSelf
@@ -1990,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
19902243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
19912244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
19922245 return Nothing
1993− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19942246 defer $ SomeMergeInit $ do
19952247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
19962248 where
@@ -2004,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
20042256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20052257 liftIO $ for_ oldParents $ \oldParent -> do
20062258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20072261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20082262 return $ IntMap.elems oldParents
2009− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20102264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20112265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20122266 defer $ updateMe a
20132267 , subscriberInvalidateHeight = \_ -> return ()
20142268 , subscriberRecalculateHeight = \_ -> return ()
20152269 }
2016− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20172271 forM_ change $ \c -> defer $ updateMe c
20182272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20192273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20202274 -- its subscription.
2021− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20222276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2023− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2024− , occ
2025− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20262280
20272281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282+newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
20282283
2029−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2030−fan e =
2284+fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285+fanG e = unsafePerformIO $ do
2286+ ref <- newIORef Nothing
20312287 let f = Fan
20322288 { fanParent = e
2033− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20342290 }
2035− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20362292
20372293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20382294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2086,36 +2342,36 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
20862342-- | Run an event action outside of a frame
20872343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
20882344runFrame a = SpiderHost $ do
2089− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
20902346 let go = do
20912347 result <- a
20922348 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
20932349 return result
20942350 result <- runEventM go
20952351 toClear <- readIORef $ eventEnvClears env
2096− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
2352+ forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
20972353 toClearInt <- readIORef $ eventEnvIntClears env
2098− forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2354+ forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
20992355 toClearRoot <- readIORef $ eventEnvRootClears env
2100− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2356+ forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
21012357 toAssign <- readIORef $ eventEnvAssignments env
21022358 toReconnectRef <- newIORef []
21032359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21042360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21052361 writeIORef vRef v
2106− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21072363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21082364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21092365 writeIORef (eventEnvMergeUpdates env) []
2110− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21112367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2112− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21132369 toReconnect <- readIORef toReconnectRef
21142370 clearEventEnv env
21152371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21162372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21172373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2118− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21192375 finalize wi
21202376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21212377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2129,7 +2385,7 @@ runFrame a = SpiderHost $ do
21292385 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
21302386 {-
21312387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2132− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21332389 EventRoot _ -> "EventRoot"
21342390 EventNever -> "EventNever"
21352391 _ -> "something else"
@@ -2144,7 +2400,7 @@ runFrame a = SpiderHost $ do
21442400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21452401 when (parentHeight /= myHeight) $ do
21462402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2147− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21482404 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
21492405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21502406 unsubscribe subscription
@@ -2185,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
21852441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
21862442 when (oldHeight /= invalidHeight) $ do
21872443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2188− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
21892445
21902446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
21912447updateSwitchHeight new subscribed = do
@@ -2193,7 +2449,7 @@ updateSwitchHeight new subscribed = do
21932449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21942450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21952451 writeIORef (switchSubscribedHeight subscribed) $! new
2196− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
21972453
21982454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
21992455recalculateCoincidenceHeight subscribed = do
@@ -2202,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22022458 height <- calculateCoincidenceHeight subscribed
22032459 when (height /= invalidHeight) $ do
22042460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2205− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22062462
22072463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22082464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2264,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22642520 {-# INLINABLE headE #-}
22652521 headE = R.slowHeadE
22662522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22672525
22682526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22692527 {-# INLINABLE sample #-}
@@ -2285,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
22852543 {-# INLINABLE headE #-}
22862544 headE = R.slowHeadE
22872545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
22882549
22892550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
22902551 {-# INLINE return #-}
@@ -2293,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
22932554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
22942555 {-# INLINE (>>) #-}
22952556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
22962558 {-# INLINE fail #-}
22972559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
22982561
22992562{-# INLINABLE newJoinDyn #-}
2300−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)
23012564newJoinDyn d =
23022565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
23032566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2346,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23462609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23472610 {-# INLINABLE headE #-}
23482611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23492615
23502616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23512617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2362,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23622628 {-# INLINABLE headE #-}
23632629 headE = R.slowHeadE
23642630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23652633
23662634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23672635 {-# INLINABLE sample #-}
@@ -2382,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
23822650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
23832651 {-# INLINABLE headE #-}
23842652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
23852655
23862656--------------------------------------------------------------------------------
23872657-- Deprecated items
@@ -2419,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24192689 touch h
24202690 return result
24212691
2422−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24232693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24242694 newFanEventWithTrigger f = SpiderHost $ do
24252695 es <- newFanEventWithTriggerIO f
24262696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24272697
2428−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24292699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24302700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24312701 es <- newFanEventWithTriggerIO f
@@ -2447,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24472717#ifdef DEBUG
24482718 depthRef <- newIORef 0
24492719#endif
2450− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24512721 { _spiderTimeline_lock = lock
24522722 , _spiderTimeline_eventEnv = env
24532723#ifdef DEBUG
@@ -2457,19 +2727,19 @@ unsafeNewSpiderTimelineEnv = do
24572727
24582728-- | Create a new SpiderTimelineEnv
24592729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2460−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
24612731
2462−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
24632733
24642734instance Reifies s (SpiderTimelineEnv x) =>
24652735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2466− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24672737
24682738localSpiderTimeline
2469− :: Proxy s
2739+ :: proxy s
24702740 -> SpiderTimelineEnv x
24712741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2472−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
24732743
24742744-- | Pass a new timeline to the given function.
24752745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2477,18 +2747,18 @@ withSpiderTimeline k = do
24772747 env <- unsafeNewSpiderTimelineEnv
24782748 reify env $ \s -> k $ localSpiderTimeline s env
24792749
2480−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2750+newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
24812751
24822752type ComputeM = EventM
24832753
2484−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2754+newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
24852755
24862756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24872757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
24882758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
24892759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2490− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2491− 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 }
24922762 type PullM (SpiderTimeline x) = SpiderPullM x
24932763 type PushM (SpiderTimeline x) = SpiderPushM x
24942764 {-# INLINABLE never #-}
@@ -2501,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25012771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
25022772 {-# INLINABLE pull #-}
25032773 pull = SpiderBehavior . pull . coerce
2504− {-# INLINABLE merge #-}
2505− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2506− {-# INLINABLE fan #-}
2507− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2774+ {-# INLINABLE fanG #-}
2775+ fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776+ {-# INLINABLE mergeG #-}
2777+ mergeG
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779+ => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780+ -> DMap k q
2781+ -> R.Event (SpiderTimeline x) (DMap k v)
2782+ mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
25082783 {-# INLINABLE switch #-}
25092784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
25102785 {-# INLINABLE coincidence #-}
@@ -2512,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25122787 {-# INLINABLE current #-}
25132788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
25142789 {-# INLINABLE updated #-}
2515− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
25162791 {-# INLINABLE unsafeBuildDynamic #-}
25172792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
25182793 {-# INLINABLE unsafeBuildIncremental #-}
25192794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2520− {-# INLINABLE mergeIncremental #-}
2521− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2522− {-# INLINABLE mergeIncrementalWithMove #-}
2523− mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
2795+ {-# INLINABLE mergeIncrementalG #-}
2796+ mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797+ {-# INLINABLE mergeIncrementalWithMoveG #-}
2798+ mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
25242799 {-# INLINABLE currentIncremental #-}
25252800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
25262801 {-# INLINABLE updatedIncremental #-}
@@ -2531,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25312806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25322807 eventCoercion Coercion = Coercion
25332808 behaviorCoercion Coercion = Coercion
2534− 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
25352811 {-# INLINABLE mergeIntIncremental #-}
2536− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25372813 {-# INLINABLE fanInt #-}
25382814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25392815
@@ -2558,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
25582834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
25592835
25602836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2561−newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2837+newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25622838
25632839instance Monad (SpiderHost x) where
25642840 {-# INLINABLE (>>=) #-}
@@ -2567,8 +2843,14 @@ instance Monad (SpiderHost x) where
25672843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25682844 {-# INLINABLE return #-}
25692845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
25702847 {-# INLINABLE fail #-}
2571− 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
25722854
25732855-- | Run an action affecting the global Spider timeline; this will be guarded by
25742856-- a mutex for that timeline
@@ -2580,7 +2862,7 @@ runSpiderHost (SpiderHost a) = a
25802862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
25812863runSpiderHostForTimeline (SpiderHost a) _ = a
25822864
2583−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
25842866 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25852867
25862868instance Monad (SpiderHostFrame x) where
@@ -2590,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
25902872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
25912873 {-# INLINABLE return #-}
25922874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
25932876 {-# INLINABLE fail #-}
25942877 fail s = SpiderHostFrame $ fail s
2878+#endif
25952879
25962880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
25972881 notReadyUntil _ = pure ()
25982882 notReady = pure ()
25992883
2600−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)
26012885newEventWithTriggerIO f = do
26022886 es <- newFanEventWithTriggerIO $ \Refl -> f
26032887 return $ select es Refl
26042888
2605−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)
26062890newFanEventWithTriggerIO f = do
26072891 occRef <- newIORef DMap.empty
26082892 subscribedRef <- newIORef DMap.empty
@@ -2636,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26362920instance PrimMonad (SpiderHostFrame x) where
26372921 type PrimState (SpiderHostFrame x) = PrimState IO
26382922 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 ()