@@ -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,58 +75,103 @@ 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
77100import Data.Some (Some(Some))
78101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
79103import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
80104import qualified Data.WeakBag as WeakBag
81105import qualified Reflex.Class
82106import qualified Reflex.Class as R
83107import qualified Reflex.Host.Class
84108import Reflex.NotReady.Class
85−import Reflex.Patch
86−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)
87112
88113#ifdef DEBUG_TRACE_EVENTS
89114import qualified Data.ByteString.Char8 as BS8
90115import System.IO (stderr)
116+import Data.List (isPrefixOf)
91117#endif
92118
93−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
94122
123+#ifdef DEBUG_TRACE_EVENTS
95124withStackOneLine :: (BS8.ByteString -> a) -> a
96125withStackOneLine expr = unsafePerformIO $ do
97126 stack <- currentCallStack
98− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
99129
100130#endif
101131
132+debugPropagate :: Bool
133+
134+debugInvalidateHeight :: Bool
135+
136+debugInvalidate :: Bool
137+
102138#ifdef DEBUG
103139#define DEBUG_NODEIDS
104140
141+#ifdef DEBUG_TRACE_PROPAGATION
142+debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
146+
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
150+debugInvalidateHeight = False
151+#endif
152+
153+#ifdef DEBUG_TRACE_INVALIDATION
154+debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
158+
105159class HasNodeId a where
106160 getNodeId :: a -> Int
107161
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
108168instance HasNodeId (Hold x p) where
109169 getNodeId = holdNodeId
110170
111−-- instance HasNodeId (PushSubscribed x a b) where
112−-- getNodeId = pushSubscribedNodeId
113−
114171instance HasNodeId (SwitchSubscribed x a) where
115172 getNodeId = switchSubscribedNodeId
116173
117−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
118175 getNodeId = fanSubscribedNodeId
119176
120177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -128,16 +185,27 @@ instance HasNodeId (Pull x a) where
128185
129186{-# INLINE showNodeId #-}
130187showNodeId :: HasNodeId a => a -> String
131−showNodeId = ("#"<>) . show . getNodeId
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
132192
133193
134194#else
135195
196+debugPropagate = False
197+debugInvalidateHeight = False
198+debugInvalidate = False
199+
136200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
137201{-# INLINE showNodeId #-}
138202showNodeId :: a -> String
139203showNodeId _ = ""
140204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
141209#endif
142210
143211#ifdef DEBUG_NODEIDS
@@ -147,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
147215
148216newNodeId :: IO Int
149217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
150−
151−{-# NOINLINE unsafeNodeId #-}
152−unsafeNodeId :: a -> Int
153−unsafeNodeId a = unsafePerformIO $ do
154− touch a
155− newNodeId
156218#endif
157219
158220--------------------------------------------------------------------------------
@@ -189,9 +251,9 @@ subscribeAndRead = unEvent
189251-- caching; if the computation function is very cheap, this is (much) more
190252-- efficient than 'push'
191253{-# INLINE [1] pushCheap #-}
192−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
193255pushCheap !f e = Event $ \sub -> do
194− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
195257 { subscriberPropagate = \a -> do
196258 mb <- f a
197259 mapM_ (subscriberPropagate sub) mb
@@ -210,10 +272,10 @@ terminalSubscriber p = Subscriber
210272
211273-- | Subscribe to an Event only for the duration of one occurrence
212274{-# INLINE subscribeAndReadHead #-}
213−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)
214276subscribeAndReadHead e sub = do
215277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
216− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
217279 { subscriberPropagate = \a -> do
218280 liftIO $ unsubscribe =<< readIORef subscriptionRef
219281 subscriberPropagate sub a
@@ -224,24 +286,42 @@ subscribeAndReadHead e sub = do
224286 return (subscription, occ)
225287
226288--TODO: Make this lazy in its input event
227−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)
228290headE originalE = do
229291 parent <- liftIO $ newIORef $ Just originalE
230292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
231293 let clearParent = liftIO $ writeIORef parent Nothing
232− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
233295 when (isJust occ) clearParent
234− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
235297 liftIO (readIORef parent) >>= \case
236− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
237299 Just e -> subscribeAndReadHead e sub
238300
239301data CacheSubscribed x a
240302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
241303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
242304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
243308 }
244309
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+
245325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
246326-- repeatedly
247327--
@@ -256,27 +336,33 @@ cacheEvent e =
256336#else
257337 Event $
258338#endif
259− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
260− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
261− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
262343#ifdef DEBUG_TRACE_EVENTS
263344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
264345#endif
265346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
266347 Just subscribedTicket -> return subscribedTicket
267348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
268352 subscribers <- liftIO FastWeakBag.empty
269353 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
270357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
271− { subscriberPropagate = \a -> do
272− liftIO $ writeIORef occRef $ Just a
273− scheduleClear occRef
274− propagateFast a subscribers
275− , subscriberInvalidateHeight = \old -> do
276− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
277− , subscriberRecalculateHeight = \new -> do
278− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
279− }
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+ }
280366 when (isJust occ) $ do
281367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
282368 scheduleClear occRef
@@ -284,29 +370,45 @@ cacheEvent e =
284370 { _cacheSubscribed_subscribers = subscribers
285371 , _cacheSubscribed_parent = parentSub
286372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
287376 }
288377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
289378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
290379 return subscribedTicket
291− liftIO $ do
292− subscribed <- getFastWeakTicketValue subscribedTicket
293− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
294− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
295− let es = EventSubscription
296− { _eventSubscription_unsubscribe = do
297− FastWeakBag.remove ticket
298− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
299− when isEmpty $ do
300− writeIORef mSubscribedRef emptyFastWeak
301− unsubscribe $ _cacheSubscribed_parent subscribed
302− touch ticket
303− touch subscribedTicket
304− , _eventSubscription_subscribed = EventSubscribed
305− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
306− , eventSubscribedRetained = toAny subscribedTicket
307− }
308− }
309− 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+
310412
311413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
312414subscribe e s = fst <$> subscribeAndRead e s
@@ -321,10 +423,13 @@ wrap tag getSpecificSubscribed sub = do
321423eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
322424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
323425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
324429eventNever :: Event x a
325−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
326431
327−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)
328433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
329434
330435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -359,16 +464,6 @@ data Subscriber x a = Subscriber
359464 , subscriberRecalculateHeight :: !(Height -> IO ())
360465 }
361466
362−--TODO: Move this comment to WeakBag
363−-- These function are constructor functions that are marked NOINLINE so they are
364−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
365−-- so any weak references that are attached to the constructors will have their
366−-- finalizer run. Using the opaque constructor, does not see the
367−-- constructor application, so it behaves like an IORef and cannot be fused away.
368−--
369−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
370−-- the weak pointer to it in some cases.
371−
372467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
373468newSubscriberHold h = return $ Subscriber
374469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -376,25 +471,24 @@ newSubscriberHold h = return $ Subscriber
376471 , subscriberRecalculateHeight = \_ -> return ()
377472 }
378473
379−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
474+newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
380475newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
381476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
382477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
383− -- 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"
384479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
385480 scheduleClear $ fanSubscribedOccurrence subscribed
386− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
387482 propagate v $ _fanSubscribedChildren_list subsubs
388483 return $ Constant ()
389484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
390485 return ()
391486 , subscriberInvalidateHeight = \old -> do
392487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
393− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
394−
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
395489 , subscriberRecalculateHeight = \new -> do
396490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
397− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
398492 }
399493
400494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
@@ -407,7 +501,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
407501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
408502 when (oldHeight /= invalidHeight) $ do
409503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
410− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
411505 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
412506 }
413507
@@ -423,17 +517,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
423517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
424518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
425519 case occ of
426− Nothing -> do
520+ Nothing ->
427521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
428522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
429− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
430− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
431525 Just o -> do -- Since it's already firing, no need to adjust height
432526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
433527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
434528 propagate o $ coincidenceSubscribedSubscribers subscribed
435529 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
436− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
437531 }
438532
439533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -457,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
457551recalculateSubscriberHeight = flip subscriberRecalculateHeight
458552
459553-- | Propagate everything at the current height
460−propagate :: forall a x. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
461−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
462556 -- 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
463557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
464− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
465559
466560-- | Propagate everything at the current height
467−propagateFast :: forall a x. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
468−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
469563 -- 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
470564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
471− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
472566
473567--------------------------------------------------------------------------------
474568-- EventSubscribed
@@ -477,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
477571toAny :: a -> Any
478572toAny = unsafeCoerce
479573
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.
480579data EventSubscribed x = EventSubscribed
481580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
482581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
483582#ifdef DEBUG_CYCLES
484− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
485584 , eventSubscribedHasOwnHeightRef :: !Bool
486585 , eventSubscribedWhoCreated :: !(IO [String])
487586#endif
@@ -508,13 +607,23 @@ eventSubscribedNever = EventSubscribed
508607 , eventSubscribedWhoCreated = return ["never"]
509608#endif
510609 }
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+ }
511620
512−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
513622eventSubscribedFan !subscribed = EventSubscribed
514623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
515624 , eventSubscribedRetained = toAny subscribed
516625#ifdef DEBUG_CYCLES
517− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
518627 , eventSubscribedHasOwnHeightRef = False
519628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
520629#endif
@@ -527,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
527636#ifdef DEBUG_CYCLES
528637 , eventSubscribedGetParents = do
529638 s <- readIORef $ switchSubscribedCurrentParent subscribed
530− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
531640 , eventSubscribedHasOwnHeightRef = True
532641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
533642#endif
@@ -540,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
540649#ifdef DEBUG_CYCLES
541650 , eventSubscribedGetParents = do
542651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
543− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
544− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
545654 return $ outerParent : innerParents
546655 , eventSubscribedHasOwnHeightRef = True
547656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -555,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
555664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
556665whoCreatedEventSubscribed = eventSubscribedWhoCreated
557666
558−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
559668walkInvalidHeightParents s0 = do
560− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
561670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
562671 when (h == invalidHeight) $ do
563672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
564− modify (Some s :)
673+ modify (s :)
565674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
566− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
567676 return subscribers
568677#endif
569678
@@ -600,7 +709,7 @@ behaviorPull !p = Behavior $ do
600709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
601710 parentsRef <- liftIO $ newIORef []
602711 holdInits <- askBehaviorHoldInits
603− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
604713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
605714 parents <- liftIO $ readIORef parentsRef
606715 let subscribed = PullSubscribed
@@ -635,42 +744,46 @@ readBehaviorUntracked b = do
635744-- Dynamic
636745--------------------------------------------------------------------------------
637746
638−data Dynamic x p = Dynamic
639− { dynamicCurrent :: !(Behavior x (PatchTarget p))
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
640751 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
641752 }
642753
643−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
644760dynamicHold !h = Dynamic
645761 { dynamicCurrent = behaviorHold h
646762 , dynamicUpdated = eventHold h
647763 }
648764
649−dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
650766dynamicHoldIdentity = dynamicHold
651767
652−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
653769dynamicConst !a = Dynamic
654770 { dynamicCurrent = behaviorConst a
655771 , dynamicUpdated = eventNever
656772 }
657773
658−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
659775dynamicDyn !d = Dynamic
660776 { dynamicCurrent = behaviorDyn d
661777 , dynamicUpdated = eventDyn d
662778 }
663779
664−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
665781dynamicDynIdentity = dynamicDyn
666782
667783--------------------------------------------------------------------------------
668784-- Combinators
669785--------------------------------------------------------------------------------
670786
671−--TODO: Figure out why certain things are not 'representational', then make them
672−--representational so we can use coerce
673−
674787--type role Hold representational
675788data Hold x p
676789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -691,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
691804
692805-- | Stores all global data relevant to a particular Spider timeline; only one
693806-- value should exist for each type @x@
694−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
695813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
696814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
697815#ifdef DEBUG
698816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
699817#endif
700818 }
701−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
702820
703821instance Eq (SpiderTimelineEnv x) where
704822 _ == _ = True -- Since only one exists of each type
705823
706824instance GEq SpiderTimelineEnv where
707− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
708826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
709827 else Nothing
710828
@@ -727,7 +845,7 @@ runEventM :: EventM x a -> IO a
727845runEventM = unEventM
728846
729847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
730−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
731849
732850class MonadIO m => Defer a m where
733851 getDeferralQueue :: m (IORef [a])
@@ -865,9 +983,9 @@ getHoldEventSubscription h = do
865983
866984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
867985
868−--type role BehaviorM representational
869986-- BehaviorM can sample behaviors
870−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))
871989
872990instance Monad (BehaviorM x) where
873991 {-# INLINE (>>=) #-}
@@ -876,8 +994,10 @@ instance Monad (BehaviorM x) where
876994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
877995 {-# INLINE return #-}
878996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
879998 {-# INLINE fail #-}
880999 fail s = BehaviorM $ fail s
1000+#endif
8811001
8821002data BehaviorSubscribed x a
8831003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -918,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9181038#endif
9191039 }
9201040
921−data Root x (k :: * -> *)
1041+data Root x k
9221042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9231043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9241044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -937,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
9371057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
9381058
9391059-- EventM can do everything BehaviorM can, plus create holds
940−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9411061
9421062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9431063
@@ -962,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
9621082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
9631083
9641084heightBagAdd :: Height -> HeightBag -> HeightBag
965−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
9661087
9671088heightBagRemove :: Height -> HeightBag -> HeightBag
9681089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -971,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
9711092 0 -> IntMap.delete h c
9721093 _ -> IntMap.insert h (pred old) c
9731094
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+
9741102heightBagMax :: HeightBag -> Height
9751103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
9761104 Just ((h, _), _) -> Height h
@@ -988,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
9881116heightBagVerify = id
9891117#endif
9901118
991−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
992− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
993− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
994− , _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)))
9951123 }
9961124
997−data FanSubscribed (x :: *) k
998− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
999− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1000− , 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
10011129 , fanSubscribedParent :: !(EventSubscription x)
10021130#ifdef DEBUG_NODEIDS
10031131 , fanSubscribedNodeId :: Int
10041132#endif
10051133 }
10061134
1007−data Fan x k
1008− = Fan { fanParent :: !(Event x (DMap k Identity))
1009− , 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)))
10101138 }
10111139
10121140data SwitchSubscribed x a
@@ -1068,19 +1196,27 @@ instance HasSpiderTimeline x => Align (Event x) where
10681196#if MIN_VERSION_these(0, 8, 0)
10691197instance HasSpiderTimeline x => Semialign (Event x) where
10701198#endif
1071− align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
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
10721208
10731209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
10741210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
10751211 | HoldDyn !(Hold x p)
10761212
1077−newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
10781214
1079−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)
10801216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
10811217
10821218--TODO: Avoid the duplication between this and R.zipDynWith
1083−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)
10841220zipDynWith f da db =
10851221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
10861222 ec = flip push eab $ \o -> do
@@ -1103,18 +1239,12 @@ buildDynamic readV0 v' = do
11031239 return d
11041240
11051241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1106−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1107− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11081244
11091245-- ResultM can read behaviors and events
11101246type ResultM = EventM
11111247
1112−{-# NOINLINE unsafeNewIORef #-}
1113−unsafeNewIORef :: a -> b -> IORef b
1114−unsafeNewIORef a b = unsafePerformIO $ do
1115− touch a
1116− newIORef b
1117−
11181248instance HasSpiderTimeline x => Functor (Event x) where
11191249 fmap f = push $ return . Just . f
11201250
@@ -1127,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
11271257
11281258{-# INLINABLE pull #-}
11291259pull :: BehaviorM x a -> Behavior x a
1130−pull a = behaviorPull $ Pull
1131− { pullCompute = a
1132− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11331262#ifdef DEBUG_NODEIDS
1134− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
11351264#endif
1136− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
11371272
11381273{-# INLINABLE switch #-}
11391274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1140−switch a = eventSwitch $ Switch
1141− { switchParent = a
1142− , switchSubscribed = unsafeNewIORef a Nothing
1143− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
11441281
11451282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1146−coincidence a = eventCoincidence $ Coincidence
1147− { coincidenceParent = a
1148− , coincidenceSubscribed = unsafeNewIORef a Nothing
1149− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
11501289
11511290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
11521291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
11531292run roots after = do
11541293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
11551294 let t = spiderTimeline :: SpiderTimelineEnv x
1156− result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
11571296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
11581297 occBefore <- liftIO $ do
11591298 occBefore <- readIORef occRef
@@ -1207,7 +1346,7 @@ mkWeakPtrWithDebug x debugNote = do
12071346 x' <- evaluate x
12081347 mkWeakPtr x' $
12091348 if debugFinalize
1210− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12111350 else Nothing
12121351
12131352type WeakList a = [Weak a]
@@ -1220,37 +1359,44 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12201359#ifdef DEBUG
12211360
12221361debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1223−debugSubscriber description subscribed = return $ Subscriber
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
12241366 {
12251367 subscriberPropagate = \m -> do
12261368 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
12271369 subscriberPropagate subscribed m
12281370 , subscriberInvalidateHeight = \old -> do
1229− putStrLn $ "invalidateSubscriberHeight: " <> description
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
12301372 subscriberInvalidateHeight subscribed old
1231− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
12321374 , subscriberRecalculateHeight = \new -> do
1233− putStrLn $ "subscriberRecalculateHeight: " <> description
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
12341376 subscriberRecalculateHeight subscribed new
1235− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
12361378 }
12371379
12381380
12391381{-# INLINE withIncreasedDepth #-}
12401382withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
12411383withIncreasedDepth _ a = do
1242− liftIO $ modifyIORef' (_spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)) succ
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
12431385 result <- a
1244− liftIO $ modifyIORef' (_spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12451387 return result
12461388
12471389{-# INLINE tracePropagate #-}
12481390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1249−tracePropagate p = trace p
1391+tracePropagate p = when debugPropagate . trace p
12501392
12511393{-# INLINE traceInvalidate #-}
12521394traceInvalidate :: String -> IO ()
1253−traceInvalidate = liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
12541400
12551401{-# INLINE trace #-}
12561402trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1260,13 +1406,13 @@ trace p message = traceM p $ return message
12601406traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
12611407traceM _ getMessage = do
12621408 message <- getMessage
1263− d <- liftIO $ readIORef $ _spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)
1264− liftIO $ putStrLn $ replicate d ' ' <> message
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
12651411
12661412#else
12671413
12681414{-# INLINE withIncreasedDepth #-}
1269−withIncreasedDepth :: forall x m proxy a. HasSpiderTimeline x => proxy x -> m a -> m a
1415+withIncreasedDepth :: proxy x -> m a -> m a
12701416withIncreasedDepth _ = id
12711417
12721418{-# INLINE tracePropagate #-}
@@ -1277,10 +1423,20 @@ tracePropagate _ _ = return ()
12771423traceInvalidate :: String -> IO ()
12781424traceInvalidate _ = return ()
12791425
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
12801430{-# INLINE debugSubscriber #-}
1281−debugSubscriber :: HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
12821432debugSubscriber _ = return
12831433
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
12841440{-# INLINE trace #-}
12851441trace :: (CanTrace x m) => proxy x -> String -> m ()
12861442trace _ _ = return ()
@@ -1291,13 +1447,9 @@ traceM _ _ = return ()
12911447
12921448#endif
12931449
1294−
1295−
1296−
12971450whoCreatedIORef :: IORef a -> IO [String]
12981451whoCreatedIORef (IORef a) = whoCreated $! a
12991452
1300−#ifdef DEBUG_CYCLES
13011453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13021454groupByHead = \case
13031455 [] -> []
@@ -1308,13 +1460,45 @@ groupByHead = \case
13081460 | otherwise -> (x, xs :| []) : l
13091461
13101462listsToForest :: Eq a => [[a]] -> Forest a
1311−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
13121474#endif
13131475
1476+#ifdef DEBUG_CYCLES
1477+
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1480+
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1485+
1486+#else
1487+
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1490+
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494+
1495+#endif
1496+
1497+
13141498{-# INLINE propagateSubscriberHold #-}
13151499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13161500propagateSubscriberHold h a = do
1317− traceM (Proxy :: Proxy x) $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13181502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13191503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
13201504
@@ -1322,7 +1506,7 @@ propagateSubscriberHold h a = do
13221506 case {-# SCC "apply" #-} apply a v of
13231507 Nothing -> return ()
13241508 Just v' -> do
1325− withIncreasedDepth (Proxy :: Proxy x) $
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
13261510 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13271511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13281512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1331,25 +1515,25 @@ propagateSubscriberHold h a = do
13311515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13321516
13331517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1334−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13351519
13361520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13371521askInvalidator = do
1338− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13391523 case m of
13401524 Nothing -> return Nothing
13411525 Just (!wi, _) -> return $ Just wi
13421526
13431527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13441528askParentsRef = do
1345− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13461530 case m of
13471531 Nothing -> return Nothing
13481532 Just (_, !p) -> return $ Just p
13491533
13501534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13511535askBehaviorHoldInits = do
1352− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13531537 return his
13541538
13551539{-# INLINE getDynHold #-}
@@ -1396,6 +1580,9 @@ getRootSubscribed k r sub = do
13961580
13971581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13981582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
13991586 let !subscribed = RootSubscribed
14001587 { rootSubscribedKey = k
14011588 , rootSubscribedCachedSubscribed = cached
@@ -1404,7 +1591,7 @@ getRootSubscribed k r sub = do
14041591 , rootSubscribedUninit = uninit
14051592 , rootSubscribedWeakSelf = weakSelf
14061593#ifdef DEBUG_NODEIDS
1407− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14081595#endif
14091596 }
14101597 -- If we die at the same moment that all our children die, they will
@@ -1440,6 +1627,9 @@ data FanInt x a = FanInt
14401627 { _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
14411628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14421629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14431633 }
14441634
14451635newFanInt :: IO (FanInt x a)
@@ -1447,38 +1637,39 @@ newFanInt = do
14471637 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
14481638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14491639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14501643 return $ FanInt
14511644 { _fanInt_subscribers = subscribers
14521645 , _fanInt_subscriptionRef = subscriptionRef
14531646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14541650 }
14551651
1456−{-# NOINLINE unsafeNewFanInt #-}
1457−unsafeNewFanInt :: b -> FanInt x a
1458−unsafeNewFanInt b = unsafePerformIO $ do
1459− touch b
1460− newFanInt
1461−
14621652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1463−fanInt p =
1464− let self = unsafeNewFanInt p
1465− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14661656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14671657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1468− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14691660 { subscriberPropagate = \m -> do
14701661 liftIO $ writeIORef (_fanInt_occRef self) m
14711662 scheduleIntClear $ _fanInt_occRef self
1472− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1473− 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 ->
14741665 subscriberPropagate s v
1475− , subscriberInvalidateHeight = \old -> do
1476− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1477− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
14781669 subscriberInvalidateHeight s old
1479− , subscriberRecalculateHeight = \new -> do
1480− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1481− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
14821673 subscriberRecalculateHeight s new
14831674 }
14841675 liftIO $ do
@@ -1492,13 +1683,28 @@ fanInt p =
14921683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
14931684 return b
14941685 Just b -> return b
1495− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
14961687 currentOcc <- readIORef (_fanInt_occRef self)
1497− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1498− 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+
14991705
15001706{-# INLINABLE getFanSubscribed #-}
1501−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))
15021708getFanSubscribed k f sub = do
15031709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15041710 case mSubscribed of
@@ -1516,13 +1722,16 @@ getFanSubscribed k f sub = do
15161722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15171723 occRef <- liftIO $ newIORef parentOcc
15181724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15191728 let subscribed = FanSubscribed
15201729 { fanSubscribedCachedSubscribed = fanSubscribed f
15211730 , fanSubscribedOccurrence = occRef
15221731 , fanSubscribedParent = subscription
15231732 , fanSubscribedSubscribers = subscribersRef
15241733#ifdef DEBUG_NODEIDS
1525− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15261735#endif
15271736 }
15281737 let !self = (k, subscribed)
@@ -1532,7 +1741,7 @@ getFanSubscribed k f sub = do
15321741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15331742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15341743
1535−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15361745cleanupFanSubscribed (k, subscribed) = do
15371746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15381747 let reducedSubscribers = DMap.delete k subscribers
@@ -1544,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15441753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15451754
15461755{-# INLINE subscribeFanSubscribed #-}
1547−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
15481757subscribeFanSubscribed k subscribed sub = do
15491758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15501759 case DMap.lookup k subscribers of
@@ -1582,6 +1791,9 @@ getSwitchSubscribed s sub = do
15821791 when (isJust parentOcc) $ scheduleClear occRef
15831792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
15841793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
15851797 let !subscribed = SwitchSubscribed
15861798 { switchSubscribedCachedSubscribed = switchSubscribed s
15871799 , switchSubscribedOccurrence = occRef
@@ -1594,7 +1806,7 @@ getSwitchSubscribed s sub = do
15941806 , switchSubscribedCurrentParent = subscriptionRef
15951807 , switchSubscribedWeakSelf = weakSelf
15961808#ifdef DEBUG_NODEIDS
1597− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
15981810#endif
15991811 }
16001812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1639,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16391851 scheduleClear innerSubdRef
16401852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16411853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16421857 let subscribed = CoincidenceSubscribed
16431858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16441859 , coincidenceSubscribedOccurrence = occRef
@@ -1649,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16491864 , coincidenceSubscribedInnerParent = innerSubdRef
16501865 , coincidenceSubscribedWeakSelf = weakSelf
16511866#ifdef DEBUG_NODEIDS
1652− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16531868#endif
16541869 }
16551870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1666,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16661881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16671882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16681883
1669−{-# INLINE merge #-}
1670−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1671−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)
16721889
16731890{-# INLINE mergeWithMove #-}
1674−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1675−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)
16761895
16771896{-# INLINE [1] mergeCheap #-}
1678−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1679−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
16801903 where
1681− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
16821905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
16831906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
16841907 (mOldSubd, newPs) <- case me of
16851908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
16861909 Just e -> do
16871910 let s = subscriber $ return k
1688− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
16891912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
16901913 let newParent = MergeSubscribedParent subscription
16911914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
16921915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
16931916 forM_ mOldSubd $ \oldSubd -> do
1694− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
16951920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
16961921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
16971922 foldM f ([], oldParents) $ DMap.toList p
1698− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
16991925 getInitialSubscribers initialParents subscriber = do
17001926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17011927 let s = subscriber $ return k
1702− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17031929 height <- liftIO $ getEventSubscribedHeight parentSubd
1704− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17051931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17061932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17071933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17081934 )
1935+
17091936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
17101937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
17111938
17121939{-# INLINE [1] mergeCheapWithMove #-}
1713−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1714−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
17151945 where
1716− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17171947 updateMe subscriber heightBagRef oldParents p = do
17181948 -- Prepare new parents for insertion
1719− 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)
17201950 subscribeParent k e = do
17211951 keyRef <- liftIO $ newIORef k
17221952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1725,73 +1955,82 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
17251955 newParentHeight <- getEventSubscribedHeight subd
17261956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17271957 return $ MergeSubscribedParentWithMove subscription keyRef
1728− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
17291959 -- Collect old parents for deletion and update the keys of moved parents
1730− 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
17311961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17321962 Nothing -> do
1733− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17341966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17351967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17361968 Just toKey -> do
17371969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17381970 return Nothing
1739− 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+
17401974 return (toDelete, applyAlways p' oldParents)
1741− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17421976 getInitialSubscribers initialParents subscriber = do
17431977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17441978 keyRef <- liftIO $ newIORef k
17451979 let s = subscriber $ liftIO $ readIORef keyRef
1746− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17471981 height <- liftIO $ getEventSubscribedHeight parentSubd
1748− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17491983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17501984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17511985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17521986 )
1987+
17531988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
17541989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
17551990
1756−type MergeUpdateFunc k x p s
1757− = (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))
17581993 -> IORef HeightBag
17591994 -> DMap k s
17601995 -> p
17611996 -> EventM x ([EventSubscription x], DMap k s)
17621997
1763−type MergeInitFunc k x s
1764− = DMap k (Event x)
1765− -> (forall a. EventM x (k a) -> Subscriber x a)
1766− -> 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)
17672004
17682005type MergeDestroyFunc k s
17692006 = DMap k s
17702007 -> IO ()
17712008
1772−data Merge x k s = Merge
2009+data Merge x k v s = Merge
17732010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
17742011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
17752012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1776− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1777− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
17782015 }
17792016
1780−invalidateMergeHeight :: Merge x k s -> IO ()
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
17812018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
17822019
17832020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
17842021invalidateMergeHeight' heightRef sub = do
17852022 oldHeight <- readIORef heightRef
1786− 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
17872025 writeIORef heightRef $! invalidHeight
17882026 subscriberInvalidateHeight sub oldHeight
17892027
1790−
1791−revalidateMergeHeight :: Merge x k s -> IO ()
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
17922029revalidateMergeHeight m = do
17932030 currentHeight <- readIORef $ _merge_heightRef m
1794− 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
17952034 heights <- readIORef $ _merge_heightBagRef m
17962035 parents <- readIORef $ _merge_parentsRef m
17972036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1799,44 +2038,53 @@ revalidateMergeHeight m = do
17992038 LT -> return ()
18002039 EQ -> do
18012040 let height = succHeight $ heightBagMax heights
1802− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18032042 writeIORef (_merge_heightRef m) $! height
18042043 subscriberRecalculateHeight (_merge_sub m) height
18052044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
18062045
1807−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18082047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18092048 vals <- liftIO $ readIORef $ _merge_accumRef m
1810− 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
18112052 --TODO: Assert that m is not empty
18122053 subscriberPropagate (_merge_sub m) vals
18132054
1814−mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1815−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
18162078 { subscriberPropagate = \a -> do
18172079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18182080 k <- getKey
1819− 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
18202082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18212083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18222084 when (DMap.null oldM) $ do -- Only schedule the firing once
18232085 height <- liftIO $ readIORef $ _merge_heightRef m
1824− --TODO: assertions about height
1825− currentHeight <- getCurrentHeight
1826− when (height <= currentHeight) $ do
1827− if height /= invalidHeight
1828− then do
1829− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1830− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1831− else liftIO $ do
1832−#ifdef DEBUG_CYCLES
1833− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1834− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1835− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1836−#else
1837− let cycleInfo = ""
1838−#endif
1839− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18402088 scheduleMergeSelf m height
18412089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18422090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1847,30 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18472095 }
18482096
18492097--TODO: Be able to run as much of this as possible promptly
1850−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1851−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)
18522100 where updateMe = do
18532101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1854− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18552103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18562104 return subscriptionsToKill
18572105
1858−{-# INLINE mergeCheap' #-}
1859−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)
1860−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
18612110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
18622111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
18632112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
18642113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
18652114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1866− 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
18672130 { _merge_parentsRef = parentsRef
18682131 , _merge_heightBagRef = heightBagRef
18692132 , _merge_heightRef = heightRef
18702133 , _merge_sub = sub
18712134 , _merge_accumRef = accumRef
18722135 }
1873− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
18742137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
18752138 myHeight = if invalidHeight `elem` heights
18762139 then invalidHeight
@@ -1879,50 +2142,57 @@ mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
18792142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
18802143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
18812144 else (Nothing, dm)
1882− unless (DMap.null accum) $ do
1883− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
18842146 liftIO $ writeIORef accumRef $! accum
18852147 liftIO $ writeIORef heightRef $! myHeight
18862148 liftIO $ writeIORef heightBagRef $! myHeightBag
1887− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
18882149 liftIO $ writeIORef parentsRef $! initialParentState
18892150 defer $ SomeMergeInit $ do
1890− let s = Subscriber
2151+ let changeSubscriber = Subscriber
18912152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1892− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1893− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
18942155 , subscriberInvalidateHeight = \_ -> return ()
18952156 , subscriberRecalculateHeight = \_ -> return ()
18962157 }
1897− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1898− 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
18992160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19002161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19012162 -- its subscription.
1902− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19032164 let unsubscribeAll = destroy =<< readIORef parentsRef
1904− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1905− , occ
1906− )
19072165
1908−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)
19092170mergeInt = cacheEvent . mergeIntCheap
19102171
19112172{-# INLINABLE mergeIntCheap #-}
1912−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)
19132174mergeIntCheap d = Event $ \sub -> do
19142175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19152176 accum <- liftIO $ FastMutableIntMap.newEmpty
19162177 heightRef <- liftIO $ newIORef zeroHeight
19172178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19182179 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+ }
19192190 let scheduleSelf = do
19202191 height <- liftIO $ readIORef $ heightRef
19212192 scheduleMerge' height heightRef $ do
19222193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19232194 subscriberPropagate sub vals
1924− invalidateMyHeight = do
1925− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19262196 recalculateMyHeight = do
19272197 currentHeight <- readIORef heightRef
19282198 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?
@@ -1932,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19322202 LT -> return ()
19332203 EQ -> do
19342204 let height = succHeight $ heightBagMax heights
1935− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19362206 writeIORef heightRef $! height
19372207 subscriberRecalculateHeight sub height
19382208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19392209 mySubscriber k = Subscriber
19402210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19412213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19422214 liftIO $ FastMutableIntMap.insert accum k a
19432215 when wasEmpty scheduleSelf
@@ -1971,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
19712243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
19722244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
19732245 return Nothing
1974− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19752246 defer $ SomeMergeInit $ do
19762247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
19772248 where
@@ -1985,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
19852256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
19862257 liftIO $ for_ oldParents $ \oldParent -> do
19872258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
19882261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
19892262 return $ IntMap.elems oldParents
1990− let s = Subscriber
2263+ let changeSubscriber = Subscriber
19912264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
19922265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
19932266 defer $ updateMe a
19942267 , subscriberInvalidateHeight = \_ -> return ()
19952268 , subscriberRecalculateHeight = \_ -> return ()
19962269 }
1997− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
19982271 forM_ change $ \c -> defer $ updateMe c
19992272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20002273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20012274 -- its subscription.
2002− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20032276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2004− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2005− , occ
2006− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20072280
20082281newtype 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) }
20092283
2010−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2011−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
20122287 let f = Fan
20132288 { fanParent = e
2014− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20152290 }
2016− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20172292
20182293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20192294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2067,7 +2342,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
20672342-- | Run an event action outside of a frame
20682343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
20692344runFrame a = SpiderHost $ do
2070− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
20712346 let go = do
20722347 result <- a
20732348 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
@@ -2110,7 +2385,7 @@ runFrame a = SpiderHost $ do
21102385 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
21112386 {-
21122387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2113− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21142389 EventRoot _ -> "EventRoot"
21152390 EventNever -> "EventNever"
21162391 _ -> "something else"
@@ -2125,7 +2400,7 @@ runFrame a = SpiderHost $ do
21252400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21262401 when (parentHeight /= myHeight) $ do
21272402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2128− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21292404 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
21302405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21312406 unsubscribe subscription
@@ -2166,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
21662441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
21672442 when (oldHeight /= invalidHeight) $ do
21682443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2169− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
21702445
21712446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
21722447updateSwitchHeight new subscribed = do
@@ -2174,7 +2449,7 @@ updateSwitchHeight new subscribed = do
21742449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21752450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21762451 writeIORef (switchSubscribedHeight subscribed) $! new
2177− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
21782453
21792454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
21802455recalculateCoincidenceHeight subscribed = do
@@ -2183,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
21832458 height <- calculateCoincidenceHeight subscribed
21842459 when (height /= invalidHeight) $ do
21852460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2186− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
21872462
21882463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
21892464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2245,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22452520 {-# INLINABLE headE #-}
22462521 headE = R.slowHeadE
22472522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22482525
22492526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22502527 {-# INLINABLE sample #-}
@@ -2266,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
22662543 {-# INLINABLE headE #-}
22672544 headE = R.slowHeadE
22682545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
22692549
22702550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
22712551 {-# INLINE return #-}
@@ -2274,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
22742554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
22752555 {-# INLINE (>>) #-}
22762556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
22772558 {-# INLINE fail #-}
22782559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
22792561
22802562{-# INLINABLE newJoinDyn #-}
2281−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)
22822564newJoinDyn d =
22832565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
22842566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2327,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23272609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23282610 {-# INLINABLE headE #-}
23292611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23302615
23312616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23322617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2343,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23432628 {-# INLINABLE headE #-}
23442629 headE = R.slowHeadE
23452630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23462633
23472634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23482635 {-# INLINABLE sample #-}
@@ -2363,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
23632650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
23642651 {-# INLINABLE headE #-}
23652652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
23662655
23672656--------------------------------------------------------------------------------
23682657-- Deprecated items
@@ -2428,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24282717#ifdef DEBUG
24292718 depthRef <- newIORef 0
24302719#endif
2431− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24322721 { _spiderTimeline_lock = lock
24332722 , _spiderTimeline_eventEnv = env
24342723#ifdef DEBUG
@@ -2440,17 +2729,17 @@ unsafeNewSpiderTimelineEnv = do
24402729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
24412730newSpiderTimeline = withSpiderTimeline (pure . Some)
24422731
2443−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
24442733
24452734instance Reifies s (SpiderTimelineEnv x) =>
24462735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2447− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24482737
24492738localSpiderTimeline
2450− :: Proxy s
2739+ :: proxy s
24512740 -> SpiderTimelineEnv x
24522741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2453−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
24542743
24552744-- | Pass a new timeline to the given function.
24562745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2458,18 +2747,18 @@ withSpiderTimeline k = do
24582747 env <- unsafeNewSpiderTimelineEnv
24592748 reify env $ \s -> k $ localSpiderTimeline s env
24602749
2461−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)
24622751
24632752type ComputeM = EventM
24642753
2465−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)
24662755
24672756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24682757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
24692758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
24702759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2471− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2472− 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 }
24732762 type PullM (SpiderTimeline x) = SpiderPullM x
24742763 type PushM (SpiderTimeline x) = SpiderPushM x
24752764 {-# INLINABLE never #-}
@@ -2482,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24822771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
24832772 {-# INLINABLE pull #-}
24842773 pull = SpiderBehavior . pull . coerce
2485− {-# INLINABLE merge #-}
2486− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2487− {-# INLINABLE fan #-}
2488− 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
24892783 {-# INLINABLE switch #-}
24902784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
24912785 {-# INLINABLE coincidence #-}
@@ -2493,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24932787 {-# INLINABLE current #-}
24942788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
24952789 {-# INLINABLE updated #-}
2496− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
24972791 {-# INLINABLE unsafeBuildDynamic #-}
24982792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
24992793 {-# INLINABLE unsafeBuildIncremental #-}
25002794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2501− {-# INLINABLE mergeIncremental #-}
2502− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2503− {-# INLINABLE mergeIncrementalWithMove #-}
2504− 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
25052799 {-# INLINABLE currentIncremental #-}
25062800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
25072801 {-# INLINABLE updatedIncremental #-}
@@ -2512,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25122806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25132807 eventCoercion Coercion = Coercion
25142808 behaviorCoercion Coercion = Coercion
2515− 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
25162811 {-# INLINABLE mergeIntIncremental #-}
2517− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25182813 {-# INLINABLE fanInt #-}
25192814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25202815
@@ -2539,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
25392834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
25402835
25412836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2542−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)
25432838
25442839instance Monad (SpiderHost x) where
25452840 {-# INLINABLE (>>=) #-}
@@ -2548,8 +2843,14 @@ instance Monad (SpiderHost x) where
25482843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25492844 {-# INLINABLE return #-}
25502845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
25512847 {-# INLINABLE fail #-}
2552− 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
25532854
25542855-- | Run an action affecting the global Spider timeline; this will be guarded by
25552856-- a mutex for that timeline
@@ -2561,7 +2862,7 @@ runSpiderHost (SpiderHost a) = a
25612862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
25622863runSpiderHostForTimeline (SpiderHost a) _ = a
25632864
2564−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
25652866 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25662867
25672868instance Monad (SpiderHostFrame x) where
@@ -2571,8 +2872,10 @@ instance Monad (SpiderHostFrame x) where
25712872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
25722873 {-# INLINABLE return #-}
25732874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
25742876 {-# INLINABLE fail #-}
25752877 fail s = SpiderHostFrame $ fail s
2878+#endif
25762879
25772880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
25782881 notReadyUntil _ = pure ()
@@ -2617,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26172920instance PrimMonad (SpiderHostFrame x) where
26182921 type PrimState (SpiderHostFrame x) = PrimState IO
26192922 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 ()