@@ -9,49 +9,40 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MagicHash #-}
13+{-# LANGUAGE MultiParamTypeClasses #-}
14+{-# LANGUAGE MultiWayIf #-}
1215{-# LANGUAGE RankNTypes #-}
1316{-# LANGUAGE RoleAnnotations #-}
1417{-# LANGUAGE ScopedTypeVariables #-}
1518{-# LANGUAGE TypeFamilies #-}
1619{-# LANGUAGE TypeOperators #-}
1720{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2421#ifdef USE_REFLEX_OPTIMIZER
2522{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2623#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
24+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
25+{-# OPTIONS_GHC -fno-warn-orphans #-}
26+#endif
2827-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2928-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3029module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
3130
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
31+import Control.Applicative
3532import Control.Concurrent
3633import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
34+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3835import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
36+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4037import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
38+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4439import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4740import Data.Align
4841import Data.Coerce
49−import Data.Dependent.Map (DMap)
42+import Data.Dependent.Map (DMap, DSum (..))
5043import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52−import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53−import qualified Data.FastMutableIntMap as FastMutableIntMap
5444import Data.Foldable hiding (concat, elem, sequence_)
45+import Data.Function
5546import Data.Functor.Constant
5647import Data.Functor.Misc
5748import Data.Functor.Product
@@ -59,73 +50,60 @@ import Data.GADT.Compare
5950import Data.IntMap.Strict (IntMap)
6051import qualified Data.IntMap.Strict as IntMap
6152import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
53+import Data.List hiding (foldl')
54+import Data.Maybe
55+import Data.Monoid ((<>))
6556import Data.Proxy
6657import Data.These
6758import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
59+import Data.Word
60+import GHC.Exts
7161import GHC.IORef (IORef (..))
7262import GHC.Stack
7363import Reflex.FastWeak
64+import Reflex.FunctorMaybe
7465import System.IO.Unsafe
7566import System.Mem.Weak
7667import Unsafe.Coerce
7768
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−
8769#ifdef DEBUG_CYCLES
8870import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9171import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9272import qualified Data.List.NonEmpty as NonEmpty
73+import Data.Monoid (mempty)
9374import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
75+#endif
9576
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
77+import Data.FastWeakBag (FastWeakBag)
9778import qualified Data.FastWeakBag as FastWeakBag
98−
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10379import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10480import qualified Data.WeakBag as WeakBag
81+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
82+import Data.Reflection
83+import Data.Some (Some)
84+import qualified Data.Some as Some
85+import Data.Type.Coercion
10586import qualified Reflex.Class
10687import qualified Reflex.Class as R
10788import qualified Reflex.Host.Class
108−import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
89+#endif
90+import Reflex.Patch
91+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
92+
93+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
94+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11295
11396#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
11597import System.IO (stderr)
116−import Data.List (isPrefixOf)
98+import qualified Data.ByteString.Char8 as BS8
11799#endif
118100
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123101#ifdef DEBUG_TRACE_EVENTS
102+
124103withStackOneLine :: (BS8.ByteString -> a) -> a
125104withStackOneLine expr = unsafePerformIO $ do
126105 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
106+ return (expr (BS8.pack (unwords (reverse stack))))
129107
130108#endif
131109
@@ -136,42 +114,28 @@ debugInvalidateHeight :: Bool
136114debugInvalidate :: Bool
137115
138116#ifdef DEBUG
117+
139118#define DEBUG_NODEIDS
140119
141−#ifdef DEBUG_TRACE_PROPAGATION
142120debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146121
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150122debugInvalidateHeight = False
151−#endif
152123
153−#ifdef DEBUG_TRACE_INVALIDATION
154124debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158125
159126class HasNodeId a where
160127 getNodeId :: a -> Int
161128
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
129+instance HasNodeId (Hold x p a) where
169130 getNodeId = holdNodeId
170131
132+instance HasNodeId (PushSubscribed x a b) where
133+ getNodeId = pushSubscribedNodeId
134+
171135instance HasNodeId (SwitchSubscribed x a) where
172136 getNodeId = switchSubscribedNodeId
173137
174−instance HasNodeId (FanSubscribed x v a) where
138+instance HasNodeId (FanSubscribed x a) where
175139 getNodeId = fanSubscribedNodeId
176140
177141instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +149,41 @@ instance HasNodeId (Pull x a) where
185149
186150{-# INLINE showNodeId #-}
187151showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
152+showNodeId = ("#"<>) . show . getNodeId
153+
154+showSubscriberType :: Subscriber x a -> String
155+showSubscriberType = \case
156+ SubscriberPush _ _ -> "SubscriberPush"
157+ SubscriberMerge _ _ -> "SubscriberMerge"
158+ SubscriberFan _ -> "SubscriberFan"
159+ SubscriberMergeChange _ -> "SubscriberMergeChange"
160+ SubscriberHold _ -> "SubscriberHold"
161+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
162+ SubscriberSwitch _ -> "SubscriberSwitch"
163+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
164+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
165+ SubscriberHandle -> "SubscriberHandle"
166+
167+showEventType :: Event x a -> String
168+showEventType = \case
169+ EventRoot _ _ -> "EventRoot"
170+ EventNever -> "EventNever"
171+ EventPush _ -> "EventPush"
172+ EventMerge _ -> "EventMerge"
173+ EventFan _ _ -> "EventFan"
174+ EventSwitch _ -> "EventSwitch"
175+ EventCoincidence _ -> "EventCoincidence"
176+ EventHold _ -> "EventHold"
177+ EventDyn _ -> "EventDyn"
178+ EventHoldIdentity _ -> "EventHoldIdentity"
179+ EventDynIdentity _ -> "EventDynIdentity"
193180
194181#else
195182
196183debugPropagate = False
184+
197185debugInvalidateHeight = False
186+
198187debugInvalidate = False
199188
200189-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +191,6 @@ debugInvalidate = False
202191showNodeId :: a -> String
203192showNodeId _ = ""
204193
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209194#endif
210195
211196#ifdef DEBUG_NODEIDS
@@ -215,6 +200,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215200
216201newNodeId :: IO Int
217202newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
203+
204+{-# NOINLINE unsafeNodeId #-}
205+unsafeNodeId :: a -> Int
206+unsafeNodeId a = unsafePerformIO $ do
207+ touch a
208+ newNodeId
218209#endif
219210
220211--------------------------------------------------------------------------------
@@ -250,85 +241,30 @@ subscribeAndRead = unEvent
250241-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251242-- caching; if the computation function is very cheap, this is (much) more
252243-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
244+{-# NOINLINE pushCheap #-}
254245pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
246+pushCheap f e = Event $ \sub -> do
247+ (subscription, occ) <- subscribeAndRead e $ sub
257248 { subscriberPropagate = \a -> do
258− mb <- f a
249+ mb <- runComputeM $ f a
259250 mapM_ (subscriberPropagate sub) mb
260251 }
261− occ' <- join <$> mapM f occ
252+ occ' <- join <$> mapM (runComputeM . f) occ
262253 return (subscription, occ')
263254
264−-- | A subscriber that never triggers other 'Event's
265−{-# INLINE terminalSubscriber #-}
266−terminalSubscriber :: (a -> EventM x ()) -> Subscriber x a
267−terminalSubscriber p = Subscriber
268− { subscriberPropagate = p
269− , subscriberInvalidateHeight = \_ -> return ()
270− , subscriberRecalculateHeight = \_ -> return ()
271− }
272−
273−-- | Subscribe to an Event only for the duration of one occurrence
274−{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276−subscribeAndReadHead e sub = do
277− subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279− { subscriberPropagate = \a -> do
280− liftIO $ unsubscribe =<< readIORef subscriptionRef
281− subscriberPropagate sub a
282− }
283− liftIO $ case occ of
284− Nothing -> writeIORef subscriptionRef $! subscription
285− Just _ -> unsubscribe subscription
286− return (subscription, occ)
287−
288−--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
290−headE originalE = do
291− parent <- liftIO $ newIORef $ Just originalE
292− defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293− let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295− when (isJust occ) clearParent
296− return $ Event $ \sub ->
297− liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
299− Just e -> subscribeAndReadHead e sub
300−
301255data CacheSubscribed x a
302256 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303257 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304258 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308259 }
309260
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−
325261-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326262-- repeatedly
327263--
328264--TODO: Try a caching strategy where we subscribe directly to the parent when
329265--there's only one subscriber, and then build our own FastWeakBag only when a second
330266--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
267+{-# NOINLINE cacheEvent #-}
332268cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
333269cacheEvent e =
334270#ifdef DEBUG_TRACE_EVENTS
@@ -336,33 +272,27 @@ cacheEvent e =
336272#else
337273 Event $
338274#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
275+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
276+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
277+ in \sub -> {-# SCC "cacheEvent" #-} do
343278#ifdef DEBUG_TRACE_EVENTS
344279 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345280#endif
346281 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347282 Just subscribedTicket -> return subscribedTicket
348283 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352284 subscribers <- liftIO FastWeakBag.empty
353285 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
357286 (parentSub, occ) <- subscribeAndRead e $ Subscriber
358−#endif
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365− }
287+ { subscriberPropagate = \a -> do
288+ liftIO $ writeIORef occRef $ Just a
289+ scheduleClear occRef
290+ propagateFast a subscribers
291+ , subscriberInvalidateHeight = \old -> do
292+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
293+ , subscriberRecalculateHeight = \new -> do
294+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
295+ }
366296 when (isJust occ) $ do
367297 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368298 scheduleClear occRef
@@ -370,45 +300,29 @@ cacheEvent e =
370300 { _cacheSubscribed_subscribers = subscribers
371301 , _cacheSubscribed_parent = parentSub
372302 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376303 }
377304 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378305 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379306 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
411−
307+ liftIO $ do
308+ subscribed <- getFastWeakTicketValue subscribedTicket
309+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
310+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
311+ let es = EventSubscription
312+ { _eventSubscription_unsubscribe = do
313+ FastWeakBag.remove ticket
314+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
315+ when isEmpty $ do
316+ writeIORef mSubscribedRef emptyFastWeak
317+ unsubscribe $ _cacheSubscribed_parent subscribed
318+ touch ticket
319+ touch subscribedTicket
320+ , _eventSubscription_subscribed = EventSubscribed
321+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
322+ , eventSubscribedRetained = toAny subscribedTicket
323+ }
324+ }
325+ return (es, occ)
412326
413327subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414328subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +334,13 @@ wrap tag getSpecificSubscribed sub = do
420334 let es = tag subd
421335 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422336
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
337+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424338eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425339
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429340eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
341+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431342
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
343+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433344eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434345
435346eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +349,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438349eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439350eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440351
441−eventHold :: Hold x p -> Event x p
352+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442353eventHold !h = Event $ subscribeHoldEvent h
443354
444355eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
445356eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446357
447358{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
359+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449360subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450361 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451362 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,6 +375,16 @@ data Subscriber x a = Subscriber
464375 , subscriberRecalculateHeight :: !(Height -> IO ())
465376 }
466377
378+--TODO: Move this comment to WeakBag
379+-- These function are constructor functions that are marked NOINLINE so they are
380+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
381+-- so any weak references that are attached to the constructors will have their
382+-- finalizer run. Using the opaque constructor, does not see the
383+-- constructor application, so it behaves like an IORef and cannot be fused away.
384+--
385+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
386+-- the weak pointer to it in some cases.
387+
467388newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468389newSubscriberHold h = return $ Subscriber
469390 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +392,85 @@ newSubscriberHold h = return $ Subscriber
471392 , subscriberRecalculateHeight = \_ -> return ()
472393 }
473394
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
395+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
396+newSubscriberFan subscribed = return $ Subscriber
476397 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477398 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
399+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479400 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480401 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
402+ let f _ (Pair (Identity v) subsubs) = do
482403 propagate v $ _fanSubscribedChildren_list subsubs
483404 return $ Constant ()
484405 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485406 return ()
486407 , subscriberInvalidateHeight = \old -> do
408+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487409 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
410+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
411+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489412 , subscriberRecalculateHeight = \new -> do
413+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490414 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
415+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
416+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492417 }
493418
494419newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
420+newSubscriberSwitch subscribed = return $ Subscriber
496421 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
422+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497423 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498424 scheduleClear $ switchSubscribedOccurrence subscribed
499425 propagate a $ switchSubscribedSubscribers subscribed
500426 , subscriberInvalidateHeight = \_ -> do
427+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501428 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502429 when (oldHeight /= invalidHeight) $ do
503430 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
431+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
432+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
433+ , subscriberRecalculateHeight = \new -> do
434+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
435+ updateSwitchHeight new subscribed
436+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
437+ }
507438
508439newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
440+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510441 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
442+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511443 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512444 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513445 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514446 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515447 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517448 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518449 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519450 case occ of
520− Nothing ->
451+ Nothing -> do
521452 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522453 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
454+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
455+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525456 Just o -> do -- Since it's already firing, no need to adjust height
526457 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527458 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528459 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
460+ , subscriberInvalidateHeight = \_ -> do
461+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
462+ invalidateCoincidenceHeight subscribed
463+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
464+ , subscriberRecalculateHeight = \_ -> do
465+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
466+ recalculateCoincidenceHeight subscribed
467+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531468 }
532469
533470newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
471+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535472 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
473+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536474 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537475 case occ of
538476 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +478,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540478 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541479 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542480 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
481+ , subscriberInvalidateHeight = \_ -> do
482+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
483+ invalidateCoincidenceHeight subscribed
484+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
485+ , subscriberRecalculateHeight = \_ -> do
486+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
487+ recalculateCoincidenceHeight subscribed
488+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545489 }
546490
547491invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +495,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551495recalculateSubscriberHeight = flip subscriberRecalculateHeight
552496
553497-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
498+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
499+propagate a subscribers = withIncreasedDepth $ do
556500 -- 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
557501 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
502+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559503
560504-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
505+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
506+propagateFast a subscribers = withIncreasedDepth $ do
563507 -- 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
564508 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
509+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566510
567511--------------------------------------------------------------------------------
568512-- EventSubscribed
@@ -571,16 +515,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571515toAny :: a -> Any
572516toAny = unsafeCoerce
573517
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.
579518data EventSubscribed x = EventSubscribed
580519 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581520 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582521#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
522+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584523 , eventSubscribedHasOwnHeightRef :: !Bool
585524 , eventSubscribedWhoCreated :: !(IO [String])
586525#endif
@@ -607,23 +546,13 @@ eventSubscribedNever = EventSubscribed
607546 , eventSubscribedWhoCreated = return ["never"]
608547#endif
609548 }
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− }
620549
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
550+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622551eventSubscribedFan !subscribed = EventSubscribed
623552 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624553 , eventSubscribedRetained = toAny subscribed
625554#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
555+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627556 , eventSubscribedHasOwnHeightRef = False
628557 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629558#endif
@@ -636,7 +565,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636565#ifdef DEBUG_CYCLES
637566 , eventSubscribedGetParents = do
638567 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
568+ return [Some.This $ _eventSubscription_subscribed s]
640569 , eventSubscribedHasOwnHeightRef = True
641570 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642571#endif
@@ -649,8 +578,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649578#ifdef DEBUG_CYCLES
650579 , eventSubscribedGetParents = do
651580 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
581+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
582+ innerParents = maybeToList $ fmap Some.This innerSubscription
654583 return $ outerParent : innerParents
655584 , eventSubscribedHasOwnHeightRef = True
656585 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +593,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664593whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665594whoCreatedEventSubscribed = eventSubscribedWhoCreated
666595
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
596+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668597walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
598+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670599 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671600 when (h == invalidHeight) $ do
672601 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
602+ modify (Some.This s :)
674603 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
604+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676605 return subscribers
677606#endif
678607
679608{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
609+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681610subscribeHoldEvent = subscribeAndRead . holdEvent
682611
683612--------------------------------------------------------------------------------
@@ -700,7 +629,7 @@ behaviorPull !p = Behavior $ do
700629 val <- liftIO $ readIORef $ pullValue p
701630 case val of
702631 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
632+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704633 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705634 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706635 return $ pullSubscribedValue subscribed
@@ -709,7 +638,7 @@ behaviorPull !p = Behavior $ do
709638 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710639 parentsRef <- liftIO $ newIORef []
711640 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
641+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713642 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714643 parents <- liftIO $ readIORef parentsRef
715644 let subscribed = PullSubscribed
@@ -719,7 +648,7 @@ behaviorPull !p = Behavior $ do
719648 , pullSubscribedParents = parents
720649 }
721650 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
651+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723652 return a
724653
725654behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,8 +659,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730659readHoldTracked h = do
731660 result <- liftIO $ readIORef $ holdValue h
732661 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734− liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
662+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735663 return result
736664
737665{-# INLINABLE readBehaviorUntracked #-}
@@ -744,46 +672,42 @@ readBehaviorUntracked b = do
744672-- Dynamic
745673--------------------------------------------------------------------------------
746674
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
751− , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
675+data Dynamic x p = Dynamic
676+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
677+ , dynamicUpdated :: !(Event x p)
752678 }
753679
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
680+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760681dynamicHold !h = Dynamic
761682 { dynamicCurrent = behaviorHold h
762683 , dynamicUpdated = eventHold h
763684 }
764685
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
686+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766687dynamicHoldIdentity = dynamicHold
767688
768−dynamicConst :: PatchTarget p -> DynamicS x p
689+dynamicConst :: PatchTarget p -> Dynamic x p
769690dynamicConst !a = Dynamic
770691 { dynamicCurrent = behaviorConst a
771692 , dynamicUpdated = eventNever
772693 }
773694
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
695+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775696dynamicDyn !d = Dynamic
776697 { dynamicCurrent = behaviorDyn d
777698 , dynamicUpdated = eventDyn d
778699 }
779700
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
701+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781702dynamicDynIdentity = dynamicDyn
782703
783704--------------------------------------------------------------------------------
784705-- Combinators
785706--------------------------------------------------------------------------------
786707
708+--TODO: Figure out why certain things are not 'representational', then make them
709+--representational so we can use coerce
710+
787711--type role Hold representational
788712data Hold x p
789713 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,7 +719,9 @@ data Hold x p
795719#endif
796720 }
797721
798−-- | A statically allocated 'SpiderTimeline'
722+-- | A statically allocated 'SpiderTimeline'; this is the only instance of
723+-- 'SpiderTimeline' that can used when using
724+-- -fspecialize-to-spidertimeline-global.
799725data Global
800726
801727{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -804,27 +730,30 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804730
805731-- | Stores all global data relevant to a particular Spider timeline; only one
806732-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
811−
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
733+data SpiderTimelineEnv x = SpiderTimelineEnv
813734 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814735 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815736#ifdef DEBUG
816737 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817738#endif
818739 }
819−type role SpiderTimelineEnv' phantom
740+type role SpiderTimelineEnv nominal
820741
821742instance Eq (SpiderTimelineEnv x) where
822743 _ == _ = True -- Since only one exists of each type
823744
824745instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
746+#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
747+ geqToEq _ = id
748+ geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
749+ then case unsafeCoerce Refl :: a :~: b of
750+ Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
751+ else different
752+#else
753+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826754 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827755 else Nothing
756+#endif
828757
829758data EventEnv x
830759 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
@@ -832,9 +761,8 @@ data EventEnv x
832761 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833762 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834763 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
764+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
765+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838766 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839767 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840768 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +773,7 @@ runEventM :: EventM x a -> IO a
845773runEventM = unEventM
846774
847775asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
776+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849777
850778class MonadIO m => Defer a m where
851779 getDeferralQueue :: m (IORef [a])
@@ -894,7 +822,11 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
894822 delayedRef <- asksEventEnv eventEnvDelayedMerges
895823 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896824
825+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
826+class x ~ Global => HasSpiderTimeline x where
827+#else
897828class HasSpiderTimeline x where
829+#endif
898830 -- | Retrieve the current SpiderTimelineEnv
899831 spiderTimeline :: SpiderTimelineEnv x
900832
@@ -906,29 +838,21 @@ putCurrentHeight h = do
906838 heightRef <- asksEventEnv eventEnvCurrentHeight
907839 liftIO $ writeIORef heightRef $! h
908840
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
841+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910842 {-# INLINE getDeferralQueue #-}
911843 getDeferralQueue = asksEventEnv eventEnvClears
912844
913845{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
846+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
847+scheduleClear r = defer $ SomeClear r
916848
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918− {-# INLINE getDeferralQueue #-}
919− getDeferralQueue = asksEventEnv eventEnvIntClears
920−
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
924−
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
849+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926850 {-# INLINE getDeferralQueue #-}
927851 getDeferralQueue = asksEventEnv eventEnvRootClears
928852
929853{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
854+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
855+scheduleRootClear r = defer $ SomeRootClear r
932856
933857instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934858 {-# INLINE getDeferralQueue #-}
@@ -957,7 +881,7 @@ hold v0 e = do
957881 return h
958882
959883{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
884+getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961885getHoldEventSubscription h = do
962886 ep <- liftIO $ readIORef $ holdParent h
963887 case ep of
@@ -983,9 +907,9 @@ getHoldEventSubscription h = do
983907
984908type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985909
910+--type role BehaviorM representational
986911-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
912+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989913
990914instance Monad (BehaviorM x) where
991915 {-# INLINE (>>=) #-}
@@ -994,16 +918,14 @@ instance Monad (BehaviorM x) where
994918 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995919 {-# INLINE return #-}
996920 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998921 {-# INLINE fail #-}
999922 fail s = BehaviorM $ fail s
1000−#endif
1001923
1002924data BehaviorSubscribed x a
1003925 = forall p. BehaviorSubscribedHold (Hold x p)
1004926 | BehaviorSubscribedPull (PullSubscribed x a)
1005927
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
928+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007929
1008930--type role PullSubscribed representational
1009931data PullSubscribed x a
@@ -1038,7 +960,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038960#endif
1039961 }
1040962
1041−data Root x k
963+data Root x (k :: * -> *)
1042964 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043965 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044966 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +979,22 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057979newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058980
1059981-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
982+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
983+
984+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x], IORef [SomeDynInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
985+
986+instance Defer (SomeHoldInit x) (ComputeM x) where
987+ getDeferralQueue = ComputeM $ asks fst
988+
989+instance Defer (SomeDynInit x) (ComputeM x) where
990+ getDeferralQueue = ComputeM $ asks snd
991+
992+{-# INLINABLE runComputeM #-}
993+runComputeM :: (Defer (SomeHoldInit x) m, Defer (SomeDynInit x) m) => ComputeM x a -> m a
994+runComputeM (ComputeM a) = do
995+ holds <- getDeferralQueue
996+ dyns <- getDeferralQueue
997+ liftIO $ runReaderT a (holds, dyns)
1061998
1062999newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631000
@@ -1082,8 +1019,7 @@ heightBagFromList :: [Height] -> HeightBag
10821019heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831020
10841021heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1022+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871023
10881024heightBagRemove :: Height -> HeightBag -> HeightBag
10891025heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1028,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921028 0 -> IntMap.delete h c
10931029 _ -> IntMap.insert h (pred old) c
10941030
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−
11021031heightBagMax :: HeightBag -> Height
11031032heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041033 Just ((h, _), _) -> Height h
@@ -1116,25 +1045,25 @@ heightBagVerify b@(HeightBag s c) = if
11161045heightBagVerify = id
11171046#endif
11181047
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)))
1048+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1049+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1050+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1051+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231052 }
11241053
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
1054+data FanSubscribed (x :: *) k
1055+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1056+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1057+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291058 , fanSubscribedParent :: !(EventSubscription x)
11301059#ifdef DEBUG_NODEIDS
11311060 , fanSubscribedNodeId :: Int
11321061#endif
11331062 }
11341063
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1064+data Fan x k
1065+ = Fan { fanParent :: !(Event x (DMap k Identity))
1066+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381067 }
11391068
11401069data SwitchSubscribed x a
@@ -1188,35 +1117,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881117newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891118newInvalidatorPull p = return $! InvalidatorPull p
11901119
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1120+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1121+ fmapMaybe f = push $ return . f
11931122
11941123instance HasSpiderTimeline x => Align (Event x) where
11951124 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1198−#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201−
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1206− zip x y = mapMaybe justThese $ align x y
1207−#endif
1208−
1209−data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210− | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211− | HoldDyn !(Hold x p)
1125+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromList [LeftTag :=> ea, RightTag :=> eb]
12121126
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1127+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141128
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1129+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161130newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171131
12181132--TODO: Avoid the duplication between this and R.zipDynWith
1219−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1133+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201134zipDynWith f da db =
12211135 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221136 ec = flip push eab $ \o -> do
@@ -1231,20 +1145,24 @@ zipDynWith f da db =
12311145 return $ Just $ Identity $ f a b
12321146 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331147
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1148+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
12351149buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1150+ result <- liftIO $ newIORef $ Left (readV0, v')
12371151 let !d = Dyn result
12381152 defer $ SomeDynInit d
12391153 return d
12401154
12411155unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1156+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1157+ where x = (readV0, v')
12441158
12451159-- ResultM can read behaviors and events
12461160type ResultM = EventM
12471161
1162+{-# NOINLINE unsafeNewIORef #-}
1163+unsafeNewIORef :: a -> b -> IORef b
1164+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1165+
12481166instance HasSpiderTimeline x => Functor (Event x) where
12491167 fmap f = push $ return . Just . f
12501168
@@ -1257,42 +1175,33 @@ push f e = cacheEvent (pushCheap f e)
12571175
12581176{-# INLINABLE pull #-}
12591177pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1178+pull a = behaviorPull $ Pull
1179+ { pullCompute = a
1180+ , pullValue = unsafeNewIORef a Nothing
12681181#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1182+ , pullNodeId = unsafeNodeId a
12701183#endif
1271− }
1184+ }
12721185
12731186{-# INLINABLE switch #-}
12741187switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
1188+switch a = eventSwitch $ Switch
1189+ { switchParent = a
1190+ , switchSubscribed = unsafeNewIORef a Nothing
1191+ }
12811192
12821193coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
1194+coincidence a = eventCoincidence $ Coincidence
1195+ { coincidenceParent = a
1196+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1197+ }
12891198
12901199-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911200run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921201run roots after = do
12931202 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1203+ t <- SpiderHost ask
1204+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961205 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971206 occBefore <- liftIO $ do
12981207 occBefore <- readIORef occRef
@@ -1330,11 +1239,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301239 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311240 EQ -> a
13321241
1333−newtype Clear a = Clear (IORef (Maybe a))
1334−
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1242+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13361243
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1244+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381245
13391246data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401247
@@ -1346,110 +1253,55 @@ mkWeakPtrWithDebug x debugNote = do
13461253 x' <- evaluate x
13471254 mkWeakPtr x' $
13481255 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1256+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501257 else Nothing
13511258
13521259type WeakList a = [Weak a]
13531260
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
1360−
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1366− {
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378− }
1379−
1380−
13811261{-# 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
1262+#ifdef DEBUG
1263+withIncreasedDepth :: CanTrace x m => m a -> m a
1264+withIncreasedDepth a = do
1265+ spiderTimeline <- askSpiderTimelineEnv
1266+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851267 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1268+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871269 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121270#else
1271+withIncreasedDepth :: m a -> m a
1272+withIncreasedDepth = id
1273+#endif
14131274
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1275+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171276
14181277{-# INLINE tracePropagate #-}
14191278tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1279+tracePropagate p = traceWhen p debugPropagate
14211280
14221281{-# INLINE traceInvalidate #-}
14231282traceInvalidate :: 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
1283+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331284
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 ()
1285+{-# INLINE traceWhen #-}
1286+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1287+traceWhen p b message = traceMWhen p b $ return message
14471288
1289+{-# INLINE traceMWhen #-}
1290+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1291+traceMWhen _ b getMessage = when b $ do
1292+ message <- getMessage
1293+#ifdef DEBUG
1294+ spiderTimeline <- askSpiderTimelineEnv
1295+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1296+#else
1297+ let d = 0
14481298#endif
1299+ liftIO $ putStrLn $ replicate d ' ' <> message
14491300
14501301whoCreatedIORef :: IORef a -> IO [String]
14511302whoCreatedIORef (IORef a) = whoCreated $! a
14521303
1304+#ifdef DEBUG_CYCLES
14531305groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541306groupByHead = \case
14551307 [] -> []
@@ -1460,54 +1312,20 @@ groupByHead = \case
14601312 | otherwise -> (x, xs :| []) : l
14611313
14621314listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1315+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741316#endif
14751317
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−
14981318{-# INLINE propagateSubscriberHold #-}
14991319propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001320propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1321+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021322 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031323 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051324 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061325 case {-# SCC "apply" #-} apply a v of
15071326 Nothing -> return ()
15081327 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1328+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111329 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121330 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131331 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1333,25 @@ propagateSubscriberHold h a = do
15151333data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161334
15171335runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1336+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191337
15201338askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211339askInvalidator = do
1522− (!m, _) <- ask
1340+ (!m, _) <- BehaviorM ask
15231341 case m of
15241342 Nothing -> return Nothing
15251343 Just (!wi, _) -> return $ Just wi
15261344
15271345askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281346askParentsRef = do
1529− (!m, _) <- ask
1347+ (!m, _) <- BehaviorM ask
15301348 case m of
15311349 Nothing -> return Nothing
15321350 Just (_, !p) -> return $ Just p
15331351
15341352askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351353askBehaviorHoldInits = do
1536− (_, !his) <- ask
1354+ (_, !his) <- BehaviorM ask
15371355 return his
15381356
15391357{-# INLINE getDynHold #-}
@@ -1541,27 +1359,30 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411359getDynHold d = do
15421360 mh <- liftIO $ readIORef $ unDyn d
15431361 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1362+ Right h -> return h
1363+ Left (readV0, v') -> do
15461364 holdInits <- getDeferralQueue
15471365 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1548− hold' v0 v'
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1551− hold' v0 v'
1552− where
1553− hold' v0 v' = do
15541366 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1367+ liftIO $ writeIORef (unDyn d) $ Right h
15561368 return h
15571369
1558−
15591370-- Always refers to 0
15601371{-# NOINLINE zeroRef #-}
15611372zeroRef :: IORef Height
15621373zeroRef = unsafePerformIO $ newIORef zeroHeight
15631374
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)
1375+type CanSubscribe x m =
1376+ ( HasSpiderTimeline x
1377+ , HasCurrentHeight x m
1378+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1379+ , Defer SomeClear m -- Wiping out event firings
1380+ , Defer (SomeAssignment x) m -- Updating state
1381+ , Defer (SomeResetCoincidence x) m
1382+ , m ~ EventM x
1383+ )
1384+
1385+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651386getRootSubscribed k r sub = do
15661387 mSubscribed <- readIORef $ rootSubscribed r
15671388 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1396,9 @@ getRootSubscribed k r sub = do
15751396 let !cached = rootSubscribed r
15761397 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771398 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1399+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811400 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821401 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861402 let !subscribed = RootSubscribed
15871403 { rootSubscribedKey = k
15881404 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1407,7 @@ getRootSubscribed k r sub = do
15911407 , rootSubscribedUninit = uninit
15921408 , rootSubscribedWeakSelf = weakSelf
15931409#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1410+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951411#endif
15961412 }
15971413 -- If we die at the same moment that all our children die, they will
@@ -1621,90 +1437,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211437subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221438subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231439
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1625−
1626−data FanInt x a = FanInt
1627− { _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
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
1633− }
1634−
1635−newFanInt :: IO (FanInt x a)
1636−newFanInt = do
1637− 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
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
1643− return $ FanInt
1644− { _fanInt_subscribers = subscribers
1645− , _fanInt_subscriptionRef = subscriptionRef
1646− , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
1650− }
1651−
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660− { subscriberPropagate = \m -> do
1661− liftIO $ writeIORef (_fanInt_occRef self) m
1662− scheduleIntClear $ _fanInt_occRef self
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1665− subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1669− subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1673− subscriberRecalculateHeight s new
1674− }
1675− liftIO $ do
1676− writeIORef (_fanInt_subscriptionRef self) subscription
1677− writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678− scheduleIntClear $ _fanInt_occRef self
1679− liftIO $ do
1680− b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681− Nothing -> do
1682− b <- FastWeakBag.empty
1683− FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684− return b
1685− Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1687− currentOcc <- readIORef (_fanInt_occRef self)
1688−
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691−
1692−fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1694− subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1696− { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697− , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698−#ifdef DEBUG_CYCLES
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702−#endif
1703− }
1704−
1705−
17061440{-# INLINABLE getFanSubscribed #-}
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))
1441+getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
17081442getFanSubscribed k f sub = do
17091443 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101444 case mSubscribed of
@@ -1722,16 +1456,13 @@ getFanSubscribed k f sub = do
17221456 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231457 occRef <- liftIO $ newIORef parentOcc
17241458 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281459 let subscribed = FanSubscribed
17291460 { fanSubscribedCachedSubscribed = fanSubscribed f
17301461 , fanSubscribedOccurrence = occRef
17311462 , fanSubscribedParent = subscription
17321463 , fanSubscribedSubscribers = subscribersRef
17331464#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1465+ , fanSubscribedNodeId = unsafeNodeId f
17351466#endif
17361467 }
17371468 let !self = (k, subscribed)
@@ -1741,7 +1472,7 @@ getFanSubscribed k f sub = do
17411472 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421473 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431474
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1475+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451476cleanupFanSubscribed (k, subscribed) = do
17461477 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471478 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1484,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531484 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541485
17551486{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1487+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571488subscribeFanSubscribed k subscribed sub = do
17581489 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591490 case DMap.lookup k subscribers of
@@ -1766,7 +1497,7 @@ subscribeFanSubscribed k subscribed sub = do
17661497 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671498
17681499{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1500+getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
17701501getSwitchSubscribed s sub = do
17711502 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721503 case mSubscribed of
@@ -1791,9 +1522,6 @@ getSwitchSubscribed s sub = do
17911522 when (isJust parentOcc) $ scheduleClear occRef
17921523 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931524 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971525 let !subscribed = SwitchSubscribed
17981526 { switchSubscribedCachedSubscribed = switchSubscribed s
17991527 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1534,7 @@ getSwitchSubscribed s sub = do
18061534 , switchSubscribedCurrentParent = subscriptionRef
18071535 , switchSubscribedWeakSelf = weakSelf
18081536#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1537+ , switchSubscribedNodeId = unsafeNodeId s
18101538#endif
18111539 }
18121540 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1825,7 +1553,7 @@ subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBa
18251553subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261554
18271555{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1556+getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
18291557getCoincidenceSubscribed c sub = do
18301558 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311559 case mSubscribed of
@@ -1851,9 +1579,6 @@ getCoincidenceSubscribed c sub = do
18511579 scheduleClear innerSubdRef
18521580 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531581 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571582 let subscribed = CoincidenceSubscribed
18581583 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591584 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1589,7 @@ getCoincidenceSubscribed c sub = do
18641589 , coincidenceSubscribedInnerParent = innerSubdRef
18651590 , coincidenceSubscribedWeakSelf = weakSelf
18661591#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1592+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681593#endif
18691594 }
18701595 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1606,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811606subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821607subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831608
1884−{-# INLINE mergeG #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886− => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1609+{-# INLINE merge #-}
1610+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1611+merge d = cacheEvent (mergeCheap d)
18891612
18901613{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1614+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1615+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951616
18961617{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1618+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1619+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19031620 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1621+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051622 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061623 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071624 (mOldSubd, newPs) <- case me of
19081625 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091626 Just e -> do
19101627 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1628+ subscription@(EventSubscription _ subd) <- subscribe e s
19121629 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131630 let newParent = MergeSubscribedParent subscription
19141631 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151632 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161633 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1634+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201635 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211636 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221637 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1638+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251639 getInitialSubscribers initialParents subscriber = do
19261640 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271641 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1642+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291643 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1644+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311645 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321646 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331647 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341648 )
1935−
19361649 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371650 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381651
19391652{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1653+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1654+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19451655 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1656+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471657 updateMe subscriber heightBagRef oldParents p = do
19481658 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1659+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501660 subscribeParent k e = do
19511661 keyRef <- liftIO $ newIORef k
19521662 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,185 +1665,122 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551665 newParentHeight <- getEventSubscribedHeight subd
19561666 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571667 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1668+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591669 -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1670+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611671 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621672 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1673+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661674 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671675 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681676 Just toKey -> do
19691677 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701678 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1679+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741680 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1681+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761682 getInitialSubscribers initialParents subscriber = do
19771683 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781684 keyRef <- liftIO $ newIORef k
19791685 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1686+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811687 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1688+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831689 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841690 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851691 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861692 )
1987−
19881693 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891694 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901695
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1696+type MergeUpdateFunc k x p s
1697+ = (forall a. EventM x (k a) -> Subscriber x a)
19931698 -> IORef HeightBag
19941699 -> DMap k s
19951700 -> p
19961701 -> EventM x ([EventSubscription x], DMap k s)
19971702
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
2000−type MergeInitFunc k v q x s
2001− = DMap k q
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
1703+type MergeInitFunc k x s
1704+ = DMap k (Event x)
1705+ -> (forall a. EventM x (k a) -> Subscriber x a)
1706+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041707
20051708type MergeDestroyFunc k s
20061709 = DMap k s
20071710 -> IO ()
20081711
2009−data Merge x k v s = Merge
2010− { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011− , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012− , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
2015− }
2016−
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
2018−invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2019−
2020−invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021−invalidateMergeHeight' heightRef sub = do
2022− oldHeight <- readIORef heightRef
2023− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024− when (oldHeight /= invalidHeight) $ do
2025− writeIORef heightRef $! invalidHeight
2026− subscriberInvalidateHeight sub oldHeight
2027−
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
2029−revalidateMergeHeight m = do
2030− currentHeight <- readIORef $ _merge_heightRef m
2031−
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
2034− heights <- readIORef $ _merge_heightBagRef m
2035− parents <- readIORef $ _merge_parentsRef m
2036− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037− case heightBagSize heights `compare` DMap.size parents of
2038− LT -> return ()
2039− EQ -> do
2040− let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042− writeIORef (_merge_heightRef m) $! height
2043− subscriberRecalculateHeight (_merge_sub m) height
2044− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2045−
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047−scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048− vals <- liftIO $ readIORef $ _merge_accumRef m
2049− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052− --TODO: Assert that m is not empty
2053− subscriberPropagate (_merge_sub m) vals
2054−
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
2078− { subscriberPropagate = \a -> do
2079− oldM <- liftIO $ readIORef $ _merge_accumRef m
2080− k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082− tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083− liftIO $ writeIORef (_merge_accumRef m) $! newM
2084− when (DMap.null oldM) $ do -- Only schedule the firing once
2085− height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
2088− scheduleMergeSelf m height
2089− , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090− modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091− invalidateMergeHeight m
2092− , subscriberRecalculateHeight = \new -> do
2093− modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094− revalidateMergeHeight m
2095− }
2096−
2097−--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100− where updateMe = do
2101− oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103− liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104− return subscriptionsToKill
2105−
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1712+{-# INLINE mergeCheap' #-}
1713+mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> (DMap k s -> Int) -> Dynamic x p -> Event x (DMap k Identity)
1714+mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub -> do
21101715 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111716 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121717 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131718 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141719 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
1720+ let scheduleSelf height = scheduleMerge' height heightRef $ do
1721+ m <- liftIO $ readIORef accumRef
1722+ liftIO $ writeIORef accumRef $! DMap.empty
1723+ --TODO: Assert that m is not empty
1724+ subscriberPropagate sub m
1725+ invalidateMyHeight = do
1726+ oldHeight <- readIORef heightRef
1727+ 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
1728+ writeIORef heightRef $! invalidHeight
1729+ subscriberInvalidateHeight sub oldHeight
1730+ revalidateMyHeight = do
1731+ currentHeight <- readIORef heightRef
1732+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1733+ heights <- readIORef heightBagRef
1734+ parents <- readIORef parentsRef
1735+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1736+ case heightBagSize heights `compare` numParents parents of
1737+ LT -> return ()
1738+ EQ -> do
1739+ let height = succHeight $ heightBagMax heights
1740+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1741+ writeIORef heightRef $! height
1742+ subscriberRecalculateHeight sub height
1743+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (numParents parents) <> ") for Merge"
1744+ subscriber :: forall a. EventM x (k a) -> Subscriber x a
1745+ subscriber getKey = Subscriber
1746+ { subscriberPropagate = \a -> do
1747+ oldM <- liftIO $ readIORef accumRef
1748+ k <- getKey
1749+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1750+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1751+ liftIO $ writeIORef accumRef $! newM
1752+ when (DMap.null oldM) $ do -- Only schedule the firing once
1753+ height <- liftIO $ readIORef heightRef
1754+ --TODO: assertions about height
1755+ currentHeight <- getCurrentHeight
1756+ when (height <= currentHeight) $ do
1757+ if height /= invalidHeight
1758+ then do
1759+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1760+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1761+ else liftIO $ do
21201762#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
1763+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1764+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1765+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1766+#else
1767+ let cycleInfo = ""
21261768#endif
2127− }
2128−
2129− m = Merge
2130− { _merge_parentsRef = parentsRef
2131− , _merge_heightBagRef = heightBagRef
2132− , _merge_heightRef = heightRef
2133− , _merge_sub = sub
2134− , _merge_accumRef = accumRef
1769+ error $ "Causality loop found" <> cycleInfo
1770+ scheduleSelf height
1771+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1772+ modifyIORef' heightBagRef $ heightBagRemove old
1773+ invalidateMyHeight
1774+ , subscriberRecalculateHeight = \new -> do
1775+ modifyIORef' heightBagRef $ heightBagAdd new
1776+ revalidateMyHeight
21351777 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1778+ let updateMe x = do
1779+ oldParents <- liftIO $ readIORef parentsRef
1780+ (subscriptionsToKill, newParents) <- updateFunc subscriber heightBagRef oldParents x
1781+ liftIO $ writeIORef parentsRef $! newParents
1782+ return subscriptionsToKill
1783+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents subscriber
21371784 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381785 myHeight = if invalidHeight `elem` heights
21391786 then invalidHeight
@@ -2142,153 +1789,43 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421789 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431790 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441791 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1792+ unless (DMap.null accum) $ do
1793+ scheduleSelf myHeight
1794+ occRef <- liftIO $ newIORef occ
1795+ when (isJust occ) $ scheduleClear occRef
21461796 liftIO $ writeIORef accumRef $! accum
21471797 liftIO $ writeIORef heightRef $! myHeight
21481798 liftIO $ writeIORef heightBagRef $! myHeightBag
1799+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491800 liftIO $ writeIORef parentsRef $! initialParentState
21501801 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1802+ let s = Subscriber
21521803 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1804+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1805+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
21551806 , subscriberInvalidateHeight = \_ -> return ()
21561807 , subscriberRecalculateHeight = \_ -> return ()
21571808 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1809+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1810+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
21601811 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611812 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621813 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1814+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641815 let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
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)
2170−mergeInt = cacheEvent . mergeIntCheap
2171−
2172−{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174−mergeIntCheap d = Event $ \sub -> do
2175− initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176− accum <- liftIO $ FastMutableIntMap.newEmpty
2177− heightRef <- liftIO $ newIORef zeroHeight
2178− heightBagRef <- liftIO $ newIORef heightBagEmpty
2179− 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− }
2190− let scheduleSelf = do
2191− height <- liftIO $ readIORef $ heightRef
2192− scheduleMerge' height heightRef $ do
2193− vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194− subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196− recalculateMyHeight = do
2197− currentHeight <- readIORef heightRef
2198− 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?
2199− heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
2201− case heightBagSize heights `compare` numParents of
2202− LT -> return ()
2203− EQ -> do
2204− let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206− writeIORef heightRef $! height
2207− subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209− mySubscriber k = Subscriber
2210− { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
2213− wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214− liftIO $ FastMutableIntMap.insert accum k a
2215− when wasEmpty scheduleSelf
2216− , subscriberInvalidateHeight = \old -> do
2217− modifyIORef' heightBagRef $ heightBagRemove old
2218− invalidateMyHeight
2219− , subscriberRecalculateHeight = \new -> do
2220− modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
2222− }
2223− forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2225− liftIO $ do
2226− forM_ parentOcc $ FastMutableIntMap.insert accum k
2227− FastMutableIntMap.insert parents k subscription
2228− height <- getEventSubscribedHeight parentSubd
2229− if height == invalidHeight
2230− then writeIORef heightRef invalidHeight
2231− else do
2232− modifyIORef' heightBagRef $ heightBagAdd height
2233− modifyIORef' heightRef $ \oldHeight ->
2234− if oldHeight == invalidHeight
2235− then invalidHeight
2236− else max (succHeight height) oldHeight
2237− myHeight <- liftIO $ readIORef heightRef
2238− currentHeight <- getCurrentHeight
2239− isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240− occ <- if currentHeight >= myHeight -- If we should have fired by now
2241− then if isEmpty
2242− then return Nothing
2243− else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244− else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245− return Nothing
2246− defer $ SomeMergeInit $ do
2247− let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2248− where
2249− u = do
2250− let f k newParent = do
2251− subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252− newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254− return subscription
2255− newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256− oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257− liftIO $ for_ oldParents $ \oldParent -> do
2258− oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
2261− modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262− return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2264− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266− defer $ updateMe a
2267− , subscriberInvalidateHeight = \_ -> return ()
2268− , subscriberRecalculateHeight = \_ -> return ()
2269− }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271− forM_ change $ \c -> defer $ updateMe c
2272− -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273− -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274− -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276− let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
1816+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1817+ , occ
1818+ )
22801819
22811820newtype 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) }
22831821
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1822+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1823+fan e =
22871824 let f = Fan
22881825 { fanParent = e
2289− , fanSubscribed = ref
1826+ , fanSubscribed = unsafeNewIORef e Nothing
22901827 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1828+ in EventSelector $ \k -> eventFan k f
22921829
22931830runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22941831runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2319,14 +1856,13 @@ newEventEnv = do
23191856 mergeInitRef <- newIORef []
23201857 heightRef <- newIORef zeroHeight
23211858 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231859 toClearRootRef <- newIORef []
23241860 coincidenceInfosRef <- newIORef []
23251861 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1862+ return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23271863
23281864clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1865+clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
23301866 writeIORef toAssignRef []
23311867 writeIORef holdInitRef []
23321868 writeIORef dynInitRef []
@@ -2334,44 +1870,41 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23341870 writeIORef mergeInitRef []
23351871 writeIORef heightRef zeroHeight
23361872 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
23381873 writeIORef toClearRootRef []
23391874 writeIORef coincidenceInfosRef []
23401875 writeIORef delayedRef IntMap.empty
23411876
23421877-- | Run an event action outside of a frame
23431878runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344−runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1879+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1880+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23461881 let go = do
23471882 result <- a
23481883 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
23491884 return result
23501885 result <- runEventM go
23511886 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2353− toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
1887+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23551888 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1889+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23571890 toAssign <- readIORef $ eventEnvAssignments env
23581891 toReconnectRef <- newIORef []
23591892 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23601893 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611894 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1895+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631896 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23641897 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23651898 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1899+ when debugPropagate $ putStrLn "Updating merges"
23671900 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1901+ when debugPropagate $ putStrLn "Updating merges done"
23691902 toReconnect <- readIORef toReconnectRef
23701903 clearEventEnv env
23711904 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721905 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731906 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1907+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751908 finalize wi
23761909 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771910 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2382,10 +1915,10 @@ runFrame a = SpiderHost $ do
23821915 runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
23831916 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841917 sub <- newSubscriberSwitch subscribed
2385− 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
1918+ subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderTimeline --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
23861919 {-
23871920 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1921+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891922 EventRoot _ -> "EventRoot"
23901923 EventNever -> "EventNever"
23911924 _ -> "something else"
@@ -2400,7 +1933,7 @@ runFrame a = SpiderHost $ do
24001933 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011934 when (parentHeight /= myHeight) $ do
24021935 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1936+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24041937 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
24051938 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061939 unsubscribe subscription
@@ -2441,7 +1974,7 @@ invalidateCoincidenceHeight subscribed = do
24411974 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421975 when (oldHeight /= invalidHeight) $ do
24431976 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1977+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451978
24461979updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471980updateSwitchHeight new subscribed = do
@@ -2449,7 +1982,7 @@ updateSwitchHeight new subscribed = do
24491982 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501983 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511984 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1985+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531986
24541987recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551988recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1991,7 @@ recalculateCoincidenceHeight subscribed = do
24581991 height <- calculateCoincidenceHeight subscribed
24591992 when (height /= invalidHeight) $ do
24601993 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1994+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621995
24631996calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641997calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,218 +2030,13 @@ invalidate toReconnectRef wis = do
24972030-- Reflex integration
24982031--------------------------------------------------------------------------------
24992032
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
2504−-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
2506−
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2510−
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2525−
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2529−
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533−
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535− {-# INLINABLE hold #-}
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
2549−
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551− {-# INLINE return #-}
2552− return = pure
2553− {-# INLINE (>>=) #-}
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555− {-# INLINE (>>) #-}
2556− (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2560−#endif
2561−
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564−newJoinDyn d =
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571−
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575−
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2579−
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581− pure = SpiderDynamic . dynamicConst
2582−#if MIN_VERSION_base(4,10,0)
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2033+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2034+-- When we're specializing, we include this from Reflex.Class instead, because
2035+-- it needs access to these types; when we're not, we want them here, so our
2036+-- instance isn't an orphan instance.
2037+#include "SpiderTimeline.include.hs"
2038+#include "SpiderTimelineHost.include.hs"
25842039#endif
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588−
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2591−
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594−
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597−
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600−
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602− {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604− {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606− {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
2615−
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618−
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2633−
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635− {-# INLINABLE sample #-}
2636− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637−
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639− {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2641−
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643− {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645− {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647− {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655−
2656−--------------------------------------------------------------------------------
2657−-- Deprecated items
2658−--------------------------------------------------------------------------------
2659−
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662−type SpiderEnv = SpiderTimeline
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664− {-# INLINABLE subscribeEvent #-}
2665− subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667− val <- liftIO $ newIORef Nothing
2668− subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669− { subscriberPropagate = \a -> do
2670− liftIO $ writeIORef val $ Just a
2671− scheduleClear val
2672− , subscriberInvalidateHeight = \_ -> return ()
2673− , subscriberRecalculateHeight = \_ -> return ()
2674− }
2675− return $ SpiderEventHandle
2676− { spiderEventHandleSubscription = subscription
2677− , spiderEventHandleValue = val
2678− }
2679−
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684−
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2689− touch h
2690− return result
2691−
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697−
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703−
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2707−
2708−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709− type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710− fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711− runHostFrame = runFrame . runSpiderHostFrame
27122040
27132041unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
27142042unsafeNewSpiderTimelineEnv = do
@@ -2717,7 +2045,7 @@ unsafeNewSpiderTimelineEnv = do
27172045#ifdef DEBUG
27182046 depthRef <- newIORef 0
27192047#endif
2720− return $ STE $ SpiderTimelineEnv
2048+ return $ SpiderTimelineEnv
27212049 { _spiderTimeline_lock = lock
27222050 , _spiderTimeline_eventEnv = env
27232051#ifdef DEBUG
@@ -2725,40 +2053,41 @@ unsafeNewSpiderTimelineEnv = do
27252053#endif
27262054 }
27272055
2056+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27282057-- | Create a new SpiderTimelineEnv
27292058newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2059+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312060
2732−data LocalSpiderTimeline (x :: Type) s
2061+data LocalSpiderTimeline x s
27332062
27342063instance Reifies s (SpiderTimelineEnv x) =>
27352064 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2065+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372066
27382067localSpiderTimeline
2739− :: proxy s
2068+ :: Proxy s
27402069 -> SpiderTimelineEnv x
27412070 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2071+localSpiderTimeline _ = unsafeCoerce
27432072
27442073-- | Pass a new timeline to the given function.
27452074withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
27462075withSpiderTimeline k = do
27472076 env <- unsafeNewSpiderTimelineEnv
27482077 reify env $ \s -> k $ localSpiderTimeline s env
2078+#endif
27492079
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
2080+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27532081
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2082+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552083
2084+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27562085instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572086 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582087 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592088 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2089+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2090+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622091 type PullM (SpiderTimeline x) = SpiderPullM x
27632092 type PushM (SpiderTimeline x) = SpiderPushM x
27642093 {-# INLINABLE never #-}
@@ -2771,15 +2100,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712100 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722101 {-# INLINABLE pull #-}
27732102 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2777− mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780− -> DMap k q
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2103+ {-# INLINABLE merge #-}
2104+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2105+ {-# INLINABLE fan #-}
2106+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832107 {-# INLINABLE switch #-}
27842108 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852109 {-# INLINABLE coincidence #-}
@@ -2787,15 +2111,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872111 {-# INLINABLE current #-}
27882112 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892113 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2114+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912115 {-# INLINABLE unsafeBuildDynamic #-}
27922116 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932117 {-# INLINABLE unsafeBuildIncremental #-}
27942118 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2119+ {-# INLINABLE mergeIncremental #-}
2120+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2121+ {-# INLINABLE mergeIncrementalWithMove #-}
2122+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992123 {-# INLINABLE currentIncremental #-}
28002124 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012125 {-# INLINABLE updatedIncremental #-}
@@ -2806,12 +2130,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062130 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072131 eventCoercion Coercion = Coercion
28082132 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2811− {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813− {-# INLINABLE fanInt #-}
2814− fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2133+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2134+#endif
28152135
28162136data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28172137
@@ -2834,7 +2154,7 @@ instance MonadAtomicRef (EventM x) where
28342154 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352155
28362156-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2157+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382158
28392159instance Monad (SpiderHost x) where
28402160 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2163,22 @@ instance Monad (SpiderHost x) where
28432163 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442164 {-# INLINABLE return #-}
28452165 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472166 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2167+ fail s = SpiderHost $ fail s
28542168
28552169-- | Run an action affecting the global Spider timeline; this will be guarded by
28562170-- a mutex for that timeline
28572171runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2172+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592173
2174+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
28602175-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612176-- mutex for that timeline
28622177runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2178+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2179+#endif
28642180
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2181+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672182
28682183instance Monad (SpiderHostFrame x) where
28692184 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2187,15 @@ instance Monad (SpiderHostFrame x) where
28722187 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732188 {-# INLINABLE return #-}
28742189 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762190 {-# INLINABLE fail #-}
28772191 fail s = SpiderHostFrame $ fail s
2878−#endif
2879−
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
28832192
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2193+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852194newEventWithTriggerIO f = do
28862195 es <- newFanEventWithTriggerIO $ \Refl -> f
28872196 return $ select es Refl
28882197
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2198+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902199newFanEventWithTriggerIO f = do
28912200 occRef <- newIORef DMap.empty
28922201 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2229,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202229instance PrimMonad (SpiderHostFrame x) where
29212230 type PrimState (SpiderHostFrame x) = PrimState IO
29222231 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 ()