@@ -9,8 +9,6 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiParamTypeClasses #-}
13−{-# LANGUAGE MultiWayIf #-}
1412{-# LANGUAGE RankNTypes #-}
1513{-# LANGUAGE RoleAnnotations #-}
1614{-# LANGUAGE ScopedTypeVariables #-}
@@ -18,7 +16,11 @@
1816{-# LANGUAGE TypeOperators #-}
1917{-# LANGUAGE UndecidableInstances #-}
2018{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
2121{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
23+
2224#ifdef USE_REFLEX_OPTIMIZER
2325{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2426#endif
@@ -36,12 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3638import Control.Monad.Exception
3739import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3840import Control.Monad.Primitive
39−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
4044import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4147import Data.Align
4248import Data.Coerce
43−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4450import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
4552import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
4653import qualified Data.FastMutableIntMap as FastMutableIntMap
4754import Data.Foldable hiding (concat, elem, sequence_)
@@ -54,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
5461import Data.IORef
5562import Data.Kind (Type)
5663import Data.Maybe hiding (mapMaybe)
57−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
5865import Data.Proxy
5966import Data.These
6067import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
6169import Data.Witherable (Filterable, mapMaybe)
62−import GHC.Exts
70+import GHC.Exts hiding (toList)
6371import GHC.IORef (IORef (..))
6472import GHC.Stack
6573import Reflex.FastWeak
@@ -67,16 +75,27 @@ import System.IO.Unsafe
6775import System.Mem.Weak
6876import Unsafe.Coerce
6977
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+
7087#ifdef DEBUG_CYCLES
7188import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7291import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7392import qualified Data.List.NonEmpty as NonEmpty
74−import Data.Monoid (mempty)
7593import Data.Tree (Forest, Tree (..), drawForest)
76−#endif
94+import Data.List (isPrefixOf)
7795
78−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
7997import qualified Data.FastWeakBag as FastWeakBag
98+
8099import Data.Reflection
81100import Data.Some (Some(Some))
82101import Data.Type.Coercion
@@ -87,20 +106,26 @@ import qualified Reflex.Class
87106import qualified Reflex.Class as R
88107import qualified Reflex.Host.Class
89108import Reflex.NotReady.Class
90−import Reflex.Patch
91−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)
92112
93113#ifdef DEBUG_TRACE_EVENTS
94114import qualified Data.ByteString.Char8 as BS8
95115import System.IO (stderr)
116+import Data.List (isPrefixOf)
96117#endif
97118
98−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
99122
123+#ifdef DEBUG_TRACE_EVENTS
100124withStackOneLine :: (BS8.ByteString -> a) -> a
101125withStackOneLine expr = unsafePerformIO $ do
102126 stack <- currentCallStack
103− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
104129
105130#endif
106131
@@ -111,28 +136,42 @@ debugInvalidateHeight :: Bool
111136debugInvalidate :: Bool
112137
113138#ifdef DEBUG
114−
115139#define DEBUG_NODEIDS
116140
141+#ifdef DEBUG_TRACE_PROPAGATION
117142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
118146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
119150debugInvalidateHeight = False
151+#endif
120152
153+#ifdef DEBUG_TRACE_INVALIDATION
121154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
122158
123159class HasNodeId a where
124160 getNodeId :: a -> Int
125161
126−instance HasNodeId (Hold x p a) where
127− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
128167
129−instance HasNodeId (PushSubscribed x a b) where
130− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
131170
132171instance HasNodeId (SwitchSubscribed x a) where
133172 getNodeId = switchSubscribedNodeId
134173
135−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
136175 getNodeId = fanSubscribedNodeId
137176
138177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -146,41 +185,16 @@ instance HasNodeId (Pull x a) where
146185
147186{-# INLINE showNodeId #-}
148187showNodeId :: HasNodeId a => a -> String
149−showNodeId = ("#"<>) . show . getNodeId
150−
151−showSubscriberType :: Subscriber x a -> String
152−showSubscriberType = \case
153− SubscriberPush _ _ -> "SubscriberPush"
154− SubscriberMerge _ _ -> "SubscriberMerge"
155− SubscriberFan _ -> "SubscriberFan"
156− SubscriberMergeChange _ -> "SubscriberMergeChange"
157− SubscriberHold _ -> "SubscriberHold"
158− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
159− SubscriberSwitch _ -> "SubscriberSwitch"
160− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
161− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
162− SubscriberHandle -> "SubscriberHandle"
163−
164−showEventType :: Event x a -> String
165−showEventType = \case
166− EventRoot _ _ -> "EventRoot"
167− EventNever -> "EventNever"
168− EventPush _ -> "EventPush"
169− EventMerge _ -> "EventMerge"
170− EventFan _ _ -> "EventFan"
171− EventSwitch _ -> "EventSwitch"
172− EventCoincidence _ -> "EventCoincidence"
173− EventHold _ -> "EventHold"
174− EventDyn _ -> "EventDyn"
175− EventHoldIdentity _ -> "EventHoldIdentity"
176− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
177193
178194#else
179195
180196debugPropagate = False
181−
182197debugInvalidateHeight = False
183−
184198debugInvalidate = False
185199
186200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -188,6 +202,10 @@ debugInvalidate = False
188202showNodeId :: a -> String
189203showNodeId _ = ""
190204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
191209#endif
192210
193211#ifdef DEBUG_NODEIDS
@@ -197,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
197215
198216newNodeId :: IO Int
199217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
200−
201−{-# NOINLINE unsafeNodeId #-}
202−unsafeNodeId :: a -> Int
203−unsafeNodeId a = unsafePerformIO $ do
204− touch a
205− newNodeId
206218#endif
207219
208220--------------------------------------------------------------------------------
@@ -239,9 +251,9 @@ subscribeAndRead = unEvent
239251-- caching; if the computation function is very cheap, this is (much) more
240252-- efficient than 'push'
241253{-# INLINE [1] pushCheap #-}
242−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
243255pushCheap !f e = Event $ \sub -> do
244− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
245257 { subscriberPropagate = \a -> do
246258 mb <- f a
247259 mapM_ (subscriberPropagate sub) mb
@@ -260,10 +272,10 @@ terminalSubscriber p = Subscriber
260272
261273-- | Subscribe to an Event only for the duration of one occurrence
262274{-# INLINE subscribeAndReadHead #-}
263−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)
264276subscribeAndReadHead e sub = do
265277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
266− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
267279 { subscriberPropagate = \a -> do
268280 liftIO $ unsubscribe =<< readIORef subscriptionRef
269281 subscriberPropagate sub a
@@ -274,24 +286,42 @@ subscribeAndReadHead e sub = do
274286 return (subscription, occ)
275287
276288--TODO: Make this lazy in its input event
277−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)
278290headE originalE = do
279291 parent <- liftIO $ newIORef $ Just originalE
280292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
281293 let clearParent = liftIO $ writeIORef parent Nothing
282− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
283295 when (isJust occ) clearParent
284− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
285297 liftIO (readIORef parent) >>= \case
286− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
287299 Just e -> subscribeAndReadHead e sub
288300
289301data CacheSubscribed x a
290302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
291303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
292304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
293308 }
294309
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+
295325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
296326-- repeatedly
297327--
@@ -306,27 +336,33 @@ cacheEvent e =
306336#else
307337 Event $
308338#endif
309− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
310− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
311− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
312343#ifdef DEBUG_TRACE_EVENTS
313344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
314345#endif
315346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
316347 Just subscribedTicket -> return subscribedTicket
317348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
318352 subscribers <- liftIO FastWeakBag.empty
319353 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
320357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
321− { subscriberPropagate = \a -> do
322− liftIO $ writeIORef occRef $ Just a
323− scheduleClear occRef
324− propagateFast a subscribers
325− , subscriberInvalidateHeight = \old -> do
326− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
327− , subscriberRecalculateHeight = \new -> do
328− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
329− }
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+ }
330366 when (isJust occ) $ do
331367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
332368 scheduleClear occRef
@@ -334,29 +370,45 @@ cacheEvent e =
334370 { _cacheSubscribed_subscribers = subscribers
335371 , _cacheSubscribed_parent = parentSub
336372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
337376 }
338377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
339378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
340379 return subscribedTicket
341− liftIO $ do
342− subscribed <- getFastWeakTicketValue subscribedTicket
343− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
344− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
345− let es = EventSubscription
346− { _eventSubscription_unsubscribe = do
347− FastWeakBag.remove ticket
348− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
349− when isEmpty $ do
350− writeIORef mSubscribedRef emptyFastWeak
351− unsubscribe $ _cacheSubscribed_parent subscribed
352− touch ticket
353− touch subscribedTicket
354− , _eventSubscription_subscribed = EventSubscribed
355− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
356− , eventSubscribedRetained = toAny subscribedTicket
357− }
358− }
359− 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+
360412
361413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
362414subscribe e s = fst <$> subscribeAndRead e s
@@ -368,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
368420 let es = tag subd
369421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
370422
371−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
372424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
373425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
374429eventNever :: Event x a
375−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
376431
377−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)
378433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
379434
380435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -409,16 +464,6 @@ data Subscriber x a = Subscriber
409464 , subscriberRecalculateHeight :: !(Height -> IO ())
410465 }
411466
412−--TODO: Move this comment to WeakBag
413−-- These function are constructor functions that are marked NOINLINE so they are
414−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
415−-- so any weak references that are attached to the constructors will have their
416−-- finalizer run. Using the opaque constructor, does not see the
417−-- constructor application, so it behaves like an IORef and cannot be fused away.
418−--
419−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
420−-- the weak pointer to it in some cases.
421−
422467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
423468newSubscriberHold h = return $ Subscriber
424469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -426,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
426471 , subscriberRecalculateHeight = \_ -> return ()
427472 }
428473
429−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
430−newSubscriberFan subscribed = return $ Subscriber
474+newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
431476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
432477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
433− 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"
434479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
435480 scheduleClear $ fanSubscribedOccurrence subscribed
436− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
437482 propagate v $ _fanSubscribedChildren_list subsubs
438483 return $ Constant ()
439484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
440485 return ()
441486 , subscriberInvalidateHeight = \old -> do
442− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
443487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
444− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
445− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446489 , subscriberRecalculateHeight = \new -> do
447− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
448490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
449− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
450− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451492 }
452493
453494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
454−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
455496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
456− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
457497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
458498 scheduleClear $ switchSubscribedOccurrence subscribed
459499 propagate a $ switchSubscribedSubscribers subscribed
460500 , subscriberInvalidateHeight = \_ -> do
461− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
462501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
463502 when (oldHeight /= invalidHeight) $ do
464503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
465− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
466− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
467− , subscriberRecalculateHeight = \new -> do
468− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
469− updateSwitchHeight new subscribed
470− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
471− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
472507
473508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
474−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
475510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
476− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
477511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
478512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
479513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
480514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
481515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
482517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
483518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
484519 case occ of
485− Nothing -> do
520+ Nothing ->
486521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
487522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
488− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
489− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
490525 Just o -> do -- Since it's already firing, no need to adjust height
491526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
492527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
493528 propagate o $ coincidenceSubscribedSubscribers subscribed
494− , subscriberInvalidateHeight = \_ -> do
495− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
496− invalidateCoincidenceHeight subscribed
497− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
498− , subscriberRecalculateHeight = \_ -> do
499− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
500− recalculateCoincidenceHeight subscribed
501− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
502531 }
503532
504533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
505−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
506535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
507− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
508536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
509537 case occ of
510538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -512,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
512540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
513541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
514542 propagate a $ coincidenceSubscribedSubscribers subscribed
515− , subscriberInvalidateHeight = \_ -> do
516− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
517− invalidateCoincidenceHeight subscribed
518− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
519− , subscriberRecalculateHeight = \_ -> do
520− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
521− recalculateCoincidenceHeight subscribed
522− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
523545 }
524546
525547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -529,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
529551recalculateSubscriberHeight = flip subscriberRecalculateHeight
530552
531553-- | Propagate everything at the current height
532−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
533−propagate a subscribers = withIncreasedDepth $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
534556 -- 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
535557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
536− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
537559
538560-- | Propagate everything at the current height
539−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
540−propagateFast a subscribers = withIncreasedDepth $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
541563 -- 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
542564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
543− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
544566
545567--------------------------------------------------------------------------------
546568-- EventSubscribed
@@ -549,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
549571toAny :: a -> Any
550572toAny = unsafeCoerce
551573
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.
552579data EventSubscribed x = EventSubscribed
553580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
554581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
555582#ifdef DEBUG_CYCLES
556− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
557584 , eventSubscribedHasOwnHeightRef :: !Bool
558585 , eventSubscribedWhoCreated :: !(IO [String])
559586#endif
@@ -580,13 +607,23 @@ eventSubscribedNever = EventSubscribed
580607 , eventSubscribedWhoCreated = return ["never"]
581608#endif
582609 }
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+ }
583620
584−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
585622eventSubscribedFan !subscribed = EventSubscribed
586623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
587624 , eventSubscribedRetained = toAny subscribed
588625#ifdef DEBUG_CYCLES
589− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
590627 , eventSubscribedHasOwnHeightRef = False
591628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
592629#endif
@@ -599,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
599636#ifdef DEBUG_CYCLES
600637 , eventSubscribedGetParents = do
601638 s <- readIORef $ switchSubscribedCurrentParent subscribed
602− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
603640 , eventSubscribedHasOwnHeightRef = True
604641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
605642#endif
@@ -612,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
612649#ifdef DEBUG_CYCLES
613650 , eventSubscribedGetParents = do
614651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
615− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
616− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
617654 return $ outerParent : innerParents
618655 , eventSubscribedHasOwnHeightRef = True
619656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -627,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
627664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
628665whoCreatedEventSubscribed = eventSubscribedWhoCreated
629666
630−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
631668walkInvalidHeightParents s0 = do
632− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
633670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
634671 when (h == invalidHeight) $ do
635672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
636− modify (Some s :)
673+ modify (s :)
637674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
638− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
639676 return subscribers
640677#endif
641678
@@ -672,7 +709,7 @@ behaviorPull !p = Behavior $ do
672709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
673710 parentsRef <- liftIO $ newIORef []
674711 holdInits <- askBehaviorHoldInits
675− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
676713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
677714 parents <- liftIO $ readIORef parentsRef
678715 let subscribed = PullSubscribed
@@ -707,42 +744,46 @@ readBehaviorUntracked b = do
707744-- Dynamic
708745--------------------------------------------------------------------------------
709746
710−data Dynamic x p = Dynamic
711− { 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)
712751 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
713752 }
714753
715−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
716760dynamicHold !h = Dynamic
717761 { dynamicCurrent = behaviorHold h
718762 , dynamicUpdated = eventHold h
719763 }
720764
721−dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
722766dynamicHoldIdentity = dynamicHold
723767
724−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
725769dynamicConst !a = Dynamic
726770 { dynamicCurrent = behaviorConst a
727771 , dynamicUpdated = eventNever
728772 }
729773
730−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
731775dynamicDyn !d = Dynamic
732776 { dynamicCurrent = behaviorDyn d
733777 , dynamicUpdated = eventDyn d
734778 }
735779
736−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
737781dynamicDynIdentity = dynamicDyn
738782
739783--------------------------------------------------------------------------------
740784-- Combinators
741785--------------------------------------------------------------------------------
742786
743−--TODO: Figure out why certain things are not 'representational', then make them
744−--representational so we can use coerce
745−
746787--type role Hold representational
747788data Hold x p
748789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -763,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
763804
764805-- | Stores all global data relevant to a particular Spider timeline; only one
765806-- value should exist for each type @x@
766−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
767813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
768814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
769815#ifdef DEBUG
770816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
771817#endif
772818 }
773−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
774820
775821instance Eq (SpiderTimelineEnv x) where
776822 _ == _ = True -- Since only one exists of each type
777823
778824instance GEq SpiderTimelineEnv where
779− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
780826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
781827 else Nothing
782828
@@ -799,7 +845,7 @@ runEventM :: EventM x a -> IO a
799845runEventM = unEventM
800846
801847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
802−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
803849
804850class MonadIO m => Defer a m where
805851 getDeferralQueue :: m (IORef [a])
@@ -937,9 +983,9 @@ getHoldEventSubscription h = do
937983
938984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
939985
940−--type role BehaviorM representational
941986-- BehaviorM can sample behaviors
942−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))
943989
944990instance Monad (BehaviorM x) where
945991 {-# INLINE (>>=) #-}
@@ -948,8 +994,10 @@ instance Monad (BehaviorM x) where
948994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
949995 {-# INLINE return #-}
950996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
951998 {-# INLINE fail #-}
952999 fail s = BehaviorM $ fail s
1000+#endif
9531001
9541002data BehaviorSubscribed x a
9551003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -990,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9901038#endif
9911039 }
9921040
993−data Root x (k :: * -> *)
1041+data Root x k
9941042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9951043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9961044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1009,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10091057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10101058
10111059-- EventM can do everything BehaviorM can, plus create holds
1012−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10131061
10141062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10151063
@@ -1034,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10341082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10351083
10361084heightBagAdd :: Height -> HeightBag -> HeightBag
1037−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
10381087
10391088heightBagRemove :: Height -> HeightBag -> HeightBag
10401089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1043,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10431092 0 -> IntMap.delete h c
10441093 _ -> IntMap.insert h (pred old) c
10451094
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+
10461102heightBagMax :: HeightBag -> Height
10471103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10481104 Just ((h, _), _) -> Height h
@@ -1060,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10601116heightBagVerify = id
10611117#endif
10621118
1063−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1064− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1065− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1066− , _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)))
10671123 }
10681124
1069−data FanSubscribed (x :: *) k
1070− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1071− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1072− , 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
10731129 , fanSubscribedParent :: !(EventSubscription x)
10741130#ifdef DEBUG_NODEIDS
10751131 , fanSubscribedNodeId :: Int
10761132#endif
10771133 }
10781134
1079−data Fan x k
1080− = Fan { fanParent :: !(Event x (DMap k Identity))
1081− , 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)))
10821138 }
10831139
10841140data SwitchSubscribed x a
@@ -1143,17 +1199,24 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11431199 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
11441200 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
11451201
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
1208+
11461209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
11471210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
11481211 | HoldDyn !(Hold x p)
11491212
11501213newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11511214
1152−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)
11531216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11541217
11551218--TODO: Avoid the duplication between this and R.zipDynWith
1156−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)
11571220zipDynWith f da db =
11581221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11591222 ec = flip push eab $ \o -> do
@@ -1176,18 +1239,12 @@ buildDynamic readV0 v' = do
11761239 return d
11771240
11781241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1179−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1180− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11811244
11821245-- ResultM can read behaviors and events
11831246type ResultM = EventM
11841247
1185−{-# NOINLINE unsafeNewIORef #-}
1186−unsafeNewIORef :: a -> b -> IORef b
1187−unsafeNewIORef a b = unsafePerformIO $ do
1188− touch a
1189− newIORef b
1190−
11911248instance HasSpiderTimeline x => Functor (Event x) where
11921249 fmap f = push $ return . Just . f
11931250
@@ -1200,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
12001257
12011258{-# INLINABLE pull #-}
12021259pull :: BehaviorM x a -> Behavior x a
1203−pull a = behaviorPull $ Pull
1204− { pullCompute = a
1205− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
12061262#ifdef DEBUG_NODEIDS
1207− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
12081264#endif
1209− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
12101272
12111273{-# INLINABLE switch #-}
12121274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1213−switch a = eventSwitch $ Switch
1214− { switchParent = a
1215− , switchSubscribed = unsafeNewIORef a Nothing
1216− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
12171281
12181282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1219−coincidence a = eventCoincidence $ Coincidence
1220− { coincidenceParent = a
1221− , coincidenceSubscribed = unsafeNewIORef a Nothing
1222− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
12231289
12241290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12251291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12261292run roots after = do
12271293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12281294 let t = spiderTimeline :: SpiderTimelineEnv x
1229− result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
12301296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12311297 occBefore <- liftIO $ do
12321298 occBefore <- readIORef occRef
@@ -1280,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12801346 x' <- evaluate x
12811347 mkWeakPtr x' $
12821348 if debugFinalize
1283− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12841350 else Nothing
12851351
12861352type WeakList a = [Weak a]
12871353
1288−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12891359#ifdef DEBUG
1290−withIncreasedDepth :: CanTrace x m => m a -> m a
1291−withIncreasedDepth a = do
1292− spiderTimeline <- askSpiderTimelineEnv
1293− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1360+
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1363+
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
1366+ {
1367+ subscriberPropagate = \m -> do
1368+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369+ subscriberPropagate subscribed m
1370+ , subscriberInvalidateHeight = \old -> do
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372+ subscriberInvalidateHeight subscribed old
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374+ , subscriberRecalculateHeight = \new -> do
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376+ subscriberRecalculateHeight subscribed new
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378+ }
1379+
1380+
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383+withIncreasedDepth _ a = do
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
12941385 result <- a
1295− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12961387 return result
1297−#else
1298−withIncreasedDepth :: m a -> m a
1299−withIncreasedDepth = id
1300−#endif
1301−
1302−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13031388
13041389{-# INLINE tracePropagate #-}
13051390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1306−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13071392
13081393{-# INLINE traceInvalidate #-}
13091394traceInvalidate :: String -> IO ()
1310−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
13111396
1312−{-# INLINE traceWhen #-}
1313−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1314−traceWhen p b message = traceMWhen p b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13151400
1316−{-# INLINE traceMWhen #-}
1317−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1318−traceMWhen _ b getMessage = when b $ do
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
1404+
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13191408 message <- getMessage
1320−#ifdef DEBUG
1321− spiderTimeline <- askSpiderTimelineEnv
1322− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13231412#else
1324− let d = 0
1413+
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1417+
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1421+
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1425+
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1433+
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1443+
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1447+
13251448#endif
1326− liftIO $ putStrLn $ replicate d ' ' <> message
13271449
13281450whoCreatedIORef :: IORef a -> IO [String]
13291451whoCreatedIORef (IORef a) = whoCreated $! a
13301452
1331−#ifdef DEBUG_CYCLES
13321453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13331454groupByHead = \case
13341455 [] -> []
@@ -1339,20 +1460,54 @@ groupByHead = \case
13391460 | otherwise -> (x, xs :| []) : l
13401461
13411462listsToForest :: Eq a => [[a]] -> Forest a
1342−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
13431474#endif
13441475
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+
13451498{-# INLINE propagateSubscriberHold #-}
13461499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13471500propagateSubscriberHold h a = do
1348− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13491502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13501503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13511505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13521506 case {-# SCC "apply" #-} apply a v of
13531507 Nothing -> return ()
13541508 Just v' -> do
1355− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13561511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13571512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13581513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1360,25 +1515,25 @@ propagateSubscriberHold h a = do
13601515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13611516
13621517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1363−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13641519
13651520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13661521askInvalidator = do
1367− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13681523 case m of
13691524 Nothing -> return Nothing
13701525 Just (!wi, _) -> return $ Just wi
13711526
13721527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13731528askParentsRef = do
1374− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13751530 case m of
13761531 Nothing -> return Nothing
13771532 Just (_, !p) -> return $ Just p
13781533
13791534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13801535askBehaviorHoldInits = do
1381− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13821537 return his
13831538
13841539{-# INLINE getDynHold #-}
@@ -1406,7 +1561,7 @@ getDynHold d = do
14061561zeroRef :: IORef Height
14071562zeroRef = unsafePerformIO $ newIORef zeroHeight
14081563
1409−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14101565getRootSubscribed k r sub = do
14111566 mSubscribed <- readIORef $ rootSubscribed r
14121567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1420,9 +1575,14 @@ getRootSubscribed k r sub = do
14201575 let !cached = rootSubscribed r
14211576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14221577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1423− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14241581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14251582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14261586 let !subscribed = RootSubscribed
14271587 { rootSubscribedKey = k
14281588 , rootSubscribedCachedSubscribed = cached
@@ -1431,7 +1591,7 @@ getRootSubscribed k r sub = do
14311591 , rootSubscribedUninit = uninit
14321592 , rootSubscribedWeakSelf = weakSelf
14331593#ifdef DEBUG_NODEIDS
1434− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14351595#endif
14361596 }
14371597 -- If we die at the same moment that all our children die, they will
@@ -1467,6 +1627,9 @@ data FanInt x a = FanInt
14671627 { _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
14681628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14691629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14701633 }
14711634
14721635newFanInt :: IO (FanInt x a)
@@ -1474,38 +1637,39 @@ newFanInt = do
14741637 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
14751638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14761639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14771643 return $ FanInt
14781644 { _fanInt_subscribers = subscribers
14791645 , _fanInt_subscriptionRef = subscriptionRef
14801646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14811650 }
14821651
1483−{-# NOINLINE unsafeNewFanInt #-}
1484−unsafeNewFanInt :: b -> FanInt x a
1485−unsafeNewFanInt b = unsafePerformIO $ do
1486− touch b
1487− newFanInt
1488−
14891652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1490−fanInt p =
1491− let self = unsafeNewFanInt p
1492− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14931656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14941657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1495− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14961660 { subscriberPropagate = \m -> do
14971661 liftIO $ writeIORef (_fanInt_occRef self) m
14981662 scheduleIntClear $ _fanInt_occRef self
1499− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1500− 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 ->
15011665 subscriberPropagate s v
1502− , subscriberInvalidateHeight = \old -> do
1503− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1504− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15051669 subscriberInvalidateHeight s old
1506− , subscriberRecalculateHeight = \new -> do
1507− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1508− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15091673 subscriberRecalculateHeight s new
15101674 }
15111675 liftIO $ do
@@ -1519,13 +1683,28 @@ fanInt p =
15191683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15201684 return b
15211685 Just b -> return b
1522− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15231687 currentOcc <- readIORef (_fanInt_occRef self)
1524− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1525− 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+
15261705
15271706{-# INLINABLE getFanSubscribed #-}
1528−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))
15291708getFanSubscribed k f sub = do
15301709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15311710 case mSubscribed of
@@ -1543,13 +1722,16 @@ getFanSubscribed k f sub = do
15431722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15441723 occRef <- liftIO $ newIORef parentOcc
15451724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15461728 let subscribed = FanSubscribed
15471729 { fanSubscribedCachedSubscribed = fanSubscribed f
15481730 , fanSubscribedOccurrence = occRef
15491731 , fanSubscribedParent = subscription
15501732 , fanSubscribedSubscribers = subscribersRef
15511733#ifdef DEBUG_NODEIDS
1552− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15531735#endif
15541736 }
15551737 let !self = (k, subscribed)
@@ -1559,7 +1741,7 @@ getFanSubscribed k f sub = do
15591741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15601742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15611743
1562−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15631745cleanupFanSubscribed (k, subscribed) = do
15641746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15651747 let reducedSubscribers = DMap.delete k subscribers
@@ -1571,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15711753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15721754
15731755{-# INLINE subscribeFanSubscribed #-}
1574−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
15751757subscribeFanSubscribed k subscribed sub = do
15761758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15771759 case DMap.lookup k subscribers of
@@ -1609,6 +1791,9 @@ getSwitchSubscribed s sub = do
16091791 when (isJust parentOcc) $ scheduleClear occRef
16101792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16111793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16121797 let !subscribed = SwitchSubscribed
16131798 { switchSubscribedCachedSubscribed = switchSubscribed s
16141799 , switchSubscribedOccurrence = occRef
@@ -1621,7 +1806,7 @@ getSwitchSubscribed s sub = do
16211806 , switchSubscribedCurrentParent = subscriptionRef
16221807 , switchSubscribedWeakSelf = weakSelf
16231808#ifdef DEBUG_NODEIDS
1624− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16251810#endif
16261811 }
16271812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1666,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16661851 scheduleClear innerSubdRef
16671852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16681853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16691857 let subscribed = CoincidenceSubscribed
16701858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16711859 , coincidenceSubscribedOccurrence = occRef
@@ -1676,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16761864 , coincidenceSubscribedInnerParent = innerSubdRef
16771865 , coincidenceSubscribedWeakSelf = weakSelf
16781866#ifdef DEBUG_NODEIDS
1679− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16801868#endif
16811869 }
16821870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1696,22 +1884,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
16961884{-# INLINE mergeG #-}
16971885mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
16981886 => (forall a. q a -> Event x (v a))
1699− -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
1887+ -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
17001888mergeG nt d = cacheEvent (mergeCheap nt d)
17011889
17021890{-# INLINE mergeWithMove #-}
17031891mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
17041892 => (forall a. q a -> Event x (v a))
1705− -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
1893+ -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
17061894mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
17071895
17081896{-# INLINE [1] mergeCheap #-}
17091897mergeCheap
17101898 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
17111899 => (forall a. q a -> Event x (v a))
1712− -> Dynamic x (PatchDMap k q)
1900+ -> DynamicS x (PatchDMap k q)
17131901 -> Event x (DMap k v)
1714−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
17151903 where
17161904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17171905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1726,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17261914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17271915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17281916 forM_ mOldSubd $ \oldSubd -> do
1729− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17301920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17311921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17321922 foldM f ([], oldParents) $ DMap.toList p
@@ -1737,7 +1927,7 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17371927 let s = subscriber $ return k
17381928 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17391929 height <- liftIO $ getEventSubscribedHeight parentSubd
1740− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17411931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17421932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17431933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1749,9 +1939,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
17491939{-# INLINE [1] mergeCheapWithMove #-}
17501940mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
17511941 => (forall a. q a -> Event x (v a))
1752− -> Dynamic x (PatchDMapWithMove k q)
1942+ -> DynamicS x (PatchDMapWithMove k q)
17531943 -> Event x (DMap k v)
1754−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
17551945 where
17561946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17571947 updateMe subscriber heightBagRef oldParents p = do
@@ -1770,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17701960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
17711961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17721962 Nothing -> do
1773− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17741966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17751967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17761968 Just toKey -> do
17771969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17781970 return Nothing
1779− 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+
17801974 return (toDelete, applyAlways p' oldParents)
17811975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17821976 getInitialSubscribers initialParents subscriber = do
@@ -1785,7 +1979,7 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
17851979 let s = subscriber $ liftIO $ readIORef keyRef
17861980 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17871981 height <- liftIO $ getEventSubscribedHeight parentSubd
1788− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17891983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17901984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17911985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1801,6 +1995,8 @@ type MergeUpdateFunc k v x p s
18011995 -> p
18021996 -> EventM x ([EventSubscription x], DMap k s)
18031997
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
18042000type MergeInitFunc k v q x s
18052001 = DMap k q
18062002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1824,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
18242020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18252021invalidateMergeHeight' heightRef sub = do
18262022 oldHeight <- readIORef heightRef
1827− 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
18282025 writeIORef heightRef $! invalidHeight
18292026 subscriberInvalidateHeight sub oldHeight
18302027
18312028revalidateMergeHeight :: Merge x k v s -> IO ()
18322029revalidateMergeHeight m = do
18332030 currentHeight <- readIORef $ _merge_heightRef m
1834− 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
18352034 heights <- readIORef $ _merge_heightBagRef m
18362035 parents <- readIORef $ _merge_parentsRef m
18372036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1839,7 +2038,7 @@ revalidateMergeHeight m = do
18392038 LT -> return ()
18402039 EQ -> do
18412040 let height = succHeight $ heightBagMax heights
1842− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18432042 writeIORef (_merge_heightRef m) $! height
18442043 subscriberRecalculateHeight (_merge_sub m) height
18452044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1847,36 +2046,45 @@ revalidateMergeHeight m = do
18472046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18482047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18492048 vals <- liftIO $ readIORef $ _merge_accumRef m
1850− 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
18512052 --TODO: Assert that m is not empty
18522053 subscriberPropagate (_merge_sub m) vals
18532054
1854−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1855−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
18562078 { subscriberPropagate = \a -> do
18572079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18582080 k <- getKey
1859− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18602082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18612083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18622084 when (DMap.null oldM) $ do -- Only schedule the firing once
18632085 height <- liftIO $ readIORef $ _merge_heightRef m
1864− --TODO: assertions about height
1865− currentHeight <- getCurrentHeight
1866− when (height <= currentHeight) $ do
1867− if height /= invalidHeight
1868− then do
1869− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1870− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1871− else liftIO $ do
1872−#ifdef DEBUG_CYCLES
1873− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1874− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1875− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1876−#else
1877− let cycleInfo = ""
1878−#endif
1879− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18802088 scheduleMergeSelf m height
18812089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18822090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1887,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18872095 }
18882096
18892097--TODO: Be able to run as much of this as possible promptly
1890−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1891−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)
18922100 where updateMe = do
18932101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1894− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18952103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18962104 return subscriptionsToKill
18972105
18982106{-# INLINE mergeGCheap' #-}
18992107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1900− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
1901−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2108+ => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19022110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19032111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
19042112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
19052113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
19062114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1907− 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
19082130 { _merge_parentsRef = parentsRef
19092131 , _merge_heightBagRef = heightBagRef
19102132 , _merge_heightRef = heightRef
19112133 , _merge_sub = sub
19122134 , _merge_accumRef = accumRef
19132135 }
1914− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
19152137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
19162138 myHeight = if invalidHeight `elem` heights
19172139 then invalidHeight
@@ -1920,50 +2142,57 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19202142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19212143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19222144 else (Nothing, dm)
1923− unless (DMap.null accum) $ do
1924− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19252146 liftIO $ writeIORef accumRef $! accum
19262147 liftIO $ writeIORef heightRef $! myHeight
19272148 liftIO $ writeIORef heightBagRef $! myHeightBag
1928− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19292149 liftIO $ writeIORef parentsRef $! initialParentState
19302150 defer $ SomeMergeInit $ do
1931− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19322152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1933− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1934− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19352155 , subscriberInvalidateHeight = \_ -> return ()
19362156 , subscriberRecalculateHeight = \_ -> return ()
19372157 }
1938− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1939− 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
19402160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19412161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19422162 -- its subscription.
1943− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19442164 let unsubscribeAll = destroy =<< readIORef parentsRef
1945− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1946− , occ
1947− )
19482165
1949−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)
19502170mergeInt = cacheEvent . mergeIntCheap
19512171
19522172{-# INLINABLE mergeIntCheap #-}
1953−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)
19542174mergeIntCheap d = Event $ \sub -> do
19552175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19562176 accum <- liftIO $ FastMutableIntMap.newEmpty
19572177 heightRef <- liftIO $ newIORef zeroHeight
19582178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19592179 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+ }
19602190 let scheduleSelf = do
19612191 height <- liftIO $ readIORef $ heightRef
19622192 scheduleMerge' height heightRef $ do
19632193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19642194 subscriberPropagate sub vals
1965− invalidateMyHeight = do
1966− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19672196 recalculateMyHeight = do
19682197 currentHeight <- readIORef heightRef
19692198 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?
@@ -1973,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19732202 LT -> return ()
19742203 EQ -> do
19752204 let height = succHeight $ heightBagMax heights
1976− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19772206 writeIORef heightRef $! height
19782207 subscriberRecalculateHeight sub height
19792208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19802209 mySubscriber k = Subscriber
19812210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19822213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19832214 liftIO $ FastMutableIntMap.insert accum k a
19842215 when wasEmpty scheduleSelf
@@ -2012,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
20122243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
20132244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
20142245 return Nothing
2015− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
20162246 defer $ SomeMergeInit $ do
20172247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20182248 where
@@ -2026,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
20262256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20272257 liftIO $ for_ oldParents $ \oldParent -> do
20282258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20292261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20302262 return $ IntMap.elems oldParents
2031− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20322264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20332265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20342266 defer $ updateMe a
20352267 , subscriberInvalidateHeight = \_ -> return ()
20362268 , subscriberRecalculateHeight = \_ -> return ()
20372269 }
2038− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20392271 forM_ change $ \c -> defer $ updateMe c
20402272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20412273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20422274 -- its subscription.
2043− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20442276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2045− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2046− , occ
2047− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20482280
20492281newtype 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) }
20502283
2051−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2052−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
20532287 let f = Fan
20542288 { fanParent = e
2055− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20562290 }
2057− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20582292
20592293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20602294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2108,7 +2342,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
21082342-- | Run an event action outside of a frame
21092343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
21102344runFrame a = SpiderHost $ do
2111− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
21122346 let go = do
21132347 result <- a
21142348 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
@@ -2125,19 +2359,19 @@ runFrame a = SpiderHost $ do
21252359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21262360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21272361 writeIORef vRef v
2128− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21292363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21302364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21312365 writeIORef (eventEnvMergeUpdates env) []
2132− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21332367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2134− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21352369 toReconnect <- readIORef toReconnectRef
21362370 clearEventEnv env
21372371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21382372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21392373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2140− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21412375 finalize wi
21422376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21432377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2151,7 +2385,7 @@ runFrame a = SpiderHost $ do
21512385 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
21522386 {-
21532387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2154− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21552389 EventRoot _ -> "EventRoot"
21562390 EventNever -> "EventNever"
21572391 _ -> "something else"
@@ -2166,7 +2400,7 @@ runFrame a = SpiderHost $ do
21662400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21672401 when (parentHeight /= myHeight) $ do
21682402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2169− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21702404 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
21712405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21722406 unsubscribe subscription
@@ -2207,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
22072441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
22082442 when (oldHeight /= invalidHeight) $ do
22092443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2210− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
22112445
22122446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
22132447updateSwitchHeight new subscribed = do
@@ -2215,7 +2449,7 @@ updateSwitchHeight new subscribed = do
22152449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22162450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22172451 writeIORef (switchSubscribedHeight subscribed) $! new
2218− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
22192453
22202454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22212455recalculateCoincidenceHeight subscribed = do
@@ -2224,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22242458 height <- calculateCoincidenceHeight subscribed
22252459 when (height /= invalidHeight) $ do
22262460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2227− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22282462
22292463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22302464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2286,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22862520 {-# INLINABLE headE #-}
22872521 headE = R.slowHeadE
22882522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22892525
22902526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22912527 {-# INLINABLE sample #-}
@@ -2307,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23072543 {-# INLINABLE headE #-}
23082544 headE = R.slowHeadE
23092545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
23102549
23112550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
23122551 {-# INLINE return #-}
@@ -2315,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
23152554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
23162555 {-# INLINE (>>) #-}
23172556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
23182558 {-# INLINE fail #-}
23192559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23202561
23212562{-# INLINABLE newJoinDyn #-}
2322−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)
23232564newJoinDyn d =
23242565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
23252566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2368,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23682609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23692610 {-# INLINABLE headE #-}
23702611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23712615
23722616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23732617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2384,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23842628 {-# INLINABLE headE #-}
23852629 headE = R.slowHeadE
23862630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23872633
23882634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23892635 {-# INLINABLE sample #-}
@@ -2404,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
24042650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
24052651 {-# INLINABLE headE #-}
24062652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
24072655
24082656--------------------------------------------------------------------------------
24092657-- Deprecated items
@@ -2441,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24412689 touch h
24422690 return result
24432691
2444−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24452693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24462694 newFanEventWithTrigger f = SpiderHost $ do
24472695 es <- newFanEventWithTriggerIO f
24482696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24492697
2450−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24512699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24522700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24532701 es <- newFanEventWithTriggerIO f
@@ -2469,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24692717#ifdef DEBUG
24702718 depthRef <- newIORef 0
24712719#endif
2472− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24732721 { _spiderTimeline_lock = lock
24742722 , _spiderTimeline_eventEnv = env
24752723#ifdef DEBUG
@@ -2485,13 +2733,13 @@ data LocalSpiderTimeline (x :: Type) s
24852733
24862734instance Reifies s (SpiderTimelineEnv x) =>
24872735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2488− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24892737
24902738localSpiderTimeline
2491− :: Proxy s
2739+ :: proxy s
24922740 -> SpiderTimelineEnv x
24932741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2494−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
24952743
24962744-- | Pass a new timeline to the given function.
24972745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2509,8 +2757,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25092757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
25102758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
25112759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2512− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2513− 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 }
25142762 type PullM (SpiderTimeline x) = SpiderPullM x
25152763 type PushM (SpiderTimeline x) = SpiderPushM x
25162764 {-# INLINABLE never #-}
@@ -2523,15 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25232771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
25242772 {-# INLINABLE pull #-}
25252773 pull = SpiderBehavior . pull . coerce
2774+ {-# INLINABLE fanG #-}
2775+ fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
25262776 {-# INLINABLE mergeG #-}
25272777 mergeG
2528− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
25292779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
25302780 -> DMap k q
25312781 -> R.Event (SpiderTimeline x) (DMap k v)
25322782 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2533− {-# INLINABLE fan #-}
2534− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
25352783 {-# INLINABLE switch #-}
25362784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
25372785 {-# INLINABLE coincidence #-}
@@ -2539,7 +2787,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25392787 {-# INLINABLE current #-}
25402788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
25412789 {-# INLINABLE updated #-}
2542− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
25432791 {-# INLINABLE unsafeBuildDynamic #-}
25442792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
25452793 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2558,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25582806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25592807 eventCoercion Coercion = Coercion
25602808 behaviorCoercion Coercion = Coercion
2561− 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
25622811 {-# INLINABLE mergeIntIncremental #-}
2563− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25642813 {-# INLINABLE fanInt #-}
25652814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25662815
@@ -2594,8 +2843,14 @@ instance Monad (SpiderHost x) where
25942843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25952844 {-# INLINABLE return #-}
25962845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
25972847 {-# INLINABLE fail #-}
2598− 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
25992854
26002855-- | Run an action affecting the global Spider timeline; this will be guarded by
26012856-- a mutex for that timeline
@@ -2617,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
26172872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
26182873 {-# INLINABLE return #-}
26192874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
26202876 {-# INLINABLE fail #-}
26212877 fail s = SpiderHostFrame $ fail s
2878+#endif
26222879
26232880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
26242881 notReadyUntil _ = pure ()
26252882 notReady = pure ()
26262883
2627−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26282885newEventWithTriggerIO f = do
26292886 es <- newFanEventWithTriggerIO $ \Refl -> f
26302887 return $ select es Refl
26312888
2632−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26332890newFanEventWithTriggerIO f = do
26342891 occRef <- newIORef DMap.empty
26352892 subscribedRef <- newIORef DMap.empty
@@ -2663,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26632920instance PrimMonad (SpiderHostFrame x) where
26642921 type PrimState (SpiderHostFrame x) = PrimState IO
26652922 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 ()