@@ -9,40 +9,49 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MagicHash #-}
13−{-# LANGUAGE MultiParamTypeClasses #-}
14−{-# LANGUAGE MultiWayIf #-}
15{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RankNTypes #-}
16{-# LANGUAGE RoleAnnotations #-}
13{-# LANGUAGE RoleAnnotations #-}
17{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE ScopedTypeVariables #-}
18{-# LANGUAGE TypeFamilies #-}
15{-# LANGUAGE TypeFamilies #-}
19{-# LANGUAGE TypeOperators #-}
16{-# LANGUAGE TypeOperators #-}
20{-# LANGUAGE UndecidableInstances #-}
17{-# LANGUAGE UndecidableInstances #-}
18+{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
21+{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
21#ifdef USE_REFLEX_OPTIMIZER
24#ifdef USE_REFLEX_OPTIMIZER
22{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
24−#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
25−{-# OPTIONS_GHC -fno-warn-orphans #-}
27+{-# OPTIONS_GHC -Wunused-binds #-}
27-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
28-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
28-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
29-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
29module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
30module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
32+#if MIN_VERSION_base(4,10,0)
31−import Control.Applicative
33+import Control.Applicative (liftA2)
32import Control.Concurrent
35import Control.Concurrent
33import Control.Exception
36import Control.Exception
34−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
35import Control.Monad.Exception
38import Control.Monad.Exception
36−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
37import Control.Monad.Primitive
40import Control.Monad.Primitive
38−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
41+import Control.Monad.Reader.Class
42+import Control.Monad.IO.Class
43+import Control.Monad.ReaderIO
39import Control.Monad.Ref
44import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
40import Data.Align
47import Data.Align
41import Data.Coerce
48import Data.Coerce
42−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
43import qualified Data.Dependent.Map as DMap
50import 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
44import Data.Foldable hiding (concat, elem, sequence_)
54import Data.Foldable hiding (concat, elem, sequence_)
46import Data.Functor.Constant
55import Data.Functor.Constant
47import Data.Functor.Misc
56import Data.Functor.Misc
48import Data.Functor.Product
57import Data.Functor.Product
@@ -50,57 +59,73 @@ import Data.GADT.Compare
50import Data.IntMap.Strict (IntMap)
59import Data.IntMap.Strict (IntMap)
51import qualified Data.IntMap.Strict as IntMap
60import qualified Data.IntMap.Strict as IntMap
52import Data.IORef
61import Data.IORef
53−import Data.List hiding (foldl')
62+import Data.Kind (Type)
54−import Data.Maybe
63+import Data.Maybe hiding (mapMaybe)
55−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
56import Data.Proxy
65import Data.Proxy
57import Data.These
66import Data.These
58import Data.Traversable
67import Data.Traversable
59−import Data.Word
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
60−import GHC.Exts
70+import GHC.Exts hiding (toList)
61import GHC.IORef (IORef (..))
71import GHC.IORef (IORef (..))
62import GHC.Stack
72import GHC.Stack
63−import Reflex.FunctorMaybe
73+import Reflex.FastWeak
64import System.IO.Unsafe
74import System.IO.Unsafe
65import System.Mem.Weak
75import System.Mem.Weak
66import Unsafe.Coerce
76import Unsafe.Coerce
78+#ifdef MIN_VERSION_semialign
79+#if MIN_VERSION_these(0,8,0)
80+import Data.These.Combinators (justThese)
82+#if MIN_VERSION_semialign(1,1,0)
83+import Data.Zip (Zip (..))
68#ifdef DEBUG_CYCLES
87#ifdef DEBUG_CYCLES
69import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
70import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
71import qualified Data.List.NonEmpty as NonEmpty
92import qualified Data.List.NonEmpty as NonEmpty
72−import Data.Monoid (mempty)
73import Data.Tree (Forest, Tree (..), drawForest)
93import Data.Tree (Forest, Tree (..), drawForest)
74−#endif
94+import Data.List (isPrefixOf)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97+import qualified Data.FastWeakBag as FastWeakBag
76−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
77−import qualified Data.WeakBag as WeakBag
78−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
79import Data.Reflection
99import Data.Reflection
80−import Data.Some (Some)
100+import Data.Some (Some(Some))
81−import qualified Data.Some as Some
82import Data.Type.Coercion
101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
103+import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
104+import qualified Data.WeakBag as WeakBag
83import qualified Reflex.Class
105import qualified Reflex.Class
84import qualified Reflex.Class as R
106import qualified Reflex.Class as R
85import qualified Reflex.Host.Class
107import qualified Reflex.Host.Class
87−import Reflex.Patch
108+import Reflex.NotReady.Class
88−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
89−
111+import Reflex.PerformEvent.Base (PerformEventT)
90−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
91−import Prelude hiding (any, concat, mapM, mapM_, sequence)
93#ifdef DEBUG_TRACE_EVENTS
113#ifdef DEBUG_TRACE_EVENTS
94−import System.IO (stderr)
95import qualified Data.ByteString.Char8 as BS8
114import qualified Data.ByteString.Char8 as BS8
115+import System.IO (stderr)
116+import Data.List (isPrefixOf)
98−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
123+#ifdef DEBUG_TRACE_EVENTS
100withStackOneLine :: (BS8.ByteString -> a) -> a
124withStackOneLine :: (BS8.ByteString -> a) -> a
101withStackOneLine expr = unsafePerformIO $ do
125withStackOneLine expr = unsafePerformIO $ do
102 stack <- currentCallStack
126 stack <- currentCallStack
103− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
@@ -111,28 +136,42 @@ debugInvalidateHeight :: Bool
111debugInvalidate :: Bool
136debugInvalidate :: Bool
113#ifdef DEBUG
138#ifdef DEBUG
115#define DEBUG_NODEIDS
139#define DEBUG_NODEIDS
141+#ifdef DEBUG_TRACE_PROPAGATION
117debugPropagate = True
142debugPropagate = True
144+debugPropagate = False
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
119debugInvalidateHeight = False
150debugInvalidateHeight = False
153+#ifdef DEBUG_TRACE_INVALIDATION
121debugInvalidate = True
154debugInvalidate = True
156+debugInvalidate = False
123class HasNodeId a where
159class HasNodeId a where
124 getNodeId :: a -> Int
160 getNodeId :: a -> Int
126−instance HasNodeId (Hold x p a) where
162+instance HasNodeId (CacheSubscribed x a) where
127− getNodeId = holdNodeId
163+ getNodeId = _cacheSubscribed_nodeId
129−instance HasNodeId (PushSubscribed x a b) where
165+instance HasNodeId (FanInt x a) where
130− getNodeId = pushSubscribedNodeId
166+ getNodeId = _fanInt_nodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
132instance HasNodeId (SwitchSubscribed x a) where
171instance HasNodeId (SwitchSubscribed x a) where
133 getNodeId = switchSubscribedNodeId
172 getNodeId = switchSubscribedNodeId
135−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
136 getNodeId = fanSubscribedNodeId
175 getNodeId = fanSubscribedNodeId
138instance HasNodeId (CoincidenceSubscribed x a) where
177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -146,41 +185,16 @@ instance HasNodeId (Pull x a) where
147{-# INLINE showNodeId #-}
186{-# INLINE showNodeId #-}
148showNodeId :: HasNodeId a => a -> String
187showNodeId :: HasNodeId a => a -> String
149−showNodeId = ("#"<>) . show . getNodeId
188+showNodeId = showNodeId' . getNodeId
151−showSubscriberType :: Subscriber x a -> String
190+showNodeId' :: Int -> String
152−showSubscriberType = \case
191+showNodeId' = ("#"<>) . show
153− SubscriberPush _ _ -> "SubscriberPush"
192+
154− SubscriberMerge _ _ -> "SubscriberMerge"
155− SubscriberFan _ -> "SubscriberFan"
156− SubscriberMergeChange _ -> "SubscriberMergeChange"
157− SubscriberHold _ -> "SubscriberHold"
158− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
159− SubscriberSwitch _ -> "SubscriberSwitch"
160− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
161− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
162− SubscriberHandle -> "SubscriberHandle"
164−showEventType :: Event x a -> String
165−showEventType = \case
166− EventRoot _ _ -> "EventRoot"
167− EventNever -> "EventNever"
168− EventPush _ -> "EventPush"
169− EventMerge _ -> "EventMerge"
170− EventFan _ _ -> "EventFan"
171− EventSwitch _ -> "EventSwitch"
172− EventCoincidence _ -> "EventCoincidence"
173− EventHold _ -> "EventHold"
174− EventDyn _ -> "EventDyn"
175− EventHoldIdentity _ -> "EventHoldIdentity"
176− EventDynIdentity _ -> "EventDynIdentity"
180debugPropagate = False
196debugPropagate = False
182debugInvalidateHeight = False
197debugInvalidateHeight = False
184debugInvalidate = False
198debugInvalidate = False
186-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -188,6 +202,10 @@ debugInvalidate = False
188showNodeId :: a -> String
202showNodeId :: a -> String
189showNodeId _ = ""
203showNodeId _ = ""
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
193#ifdef DEBUG_NODEIDS
211#ifdef DEBUG_NODEIDS
@@ -197,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
198newNodeId :: IO Int
216newNodeId :: IO Int
199newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
201−{-# NOINLINE unsafeNodeId #-}
202−unsafeNodeId :: a -> Int
203−unsafeNodeId a = unsafePerformIO $ do
208--------------------------------------------------------------------------------
220--------------------------------------------------------------------------------
@@ -238,85 +250,165 @@ subscribeAndRead = unEvent
238-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
250-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
239-- caching; if the computation function is very cheap, this is (much) more
251-- caching; if the computation function is very cheap, this is (much) more
240-- efficient than 'push'
252-- efficient than 'push'
241−{-# NOINLINE pushCheap #-}
253+{-# INLINE [1] pushCheap #-}
242pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
243−pushCheap f e = Event $ \sub -> do
255+pushCheap !f e = Event $ \sub -> do
244− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
245 { subscriberPropagate = \a -> do
257 { subscriberPropagate = \a -> do
246− mb <- runComputeM $ f a
258+ mb <- f a
247 mapM_ (subscriberPropagate sub) mb
259 mapM_ (subscriberPropagate sub) mb
249− occ' <- join <$> mapM (runComputeM . f) occ
261+ occ' <- join <$> mapM f occ
250 return (subscription, occ')
262 return (subscription, occ')
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 ()
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
283+ liftIO $ case occ of
284+ Nothing -> writeIORef subscriptionRef $! subscription
285+ Just _ -> unsubscribe subscription
286+ return (subscription, occ)
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)
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
252data CacheSubscribed x a
301data CacheSubscribed x a
253− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
302+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
254− , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
255 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
256− , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
257 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
310+nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
314+now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
317+ nowOrNot <- liftIO $ newIORef $ Just ()
318+ scheduleClear nowOrNot
319+ return . Event $ \_ -> do
320+ occ <- liftIO . readIORef $ nowOrNot
321+ return ( EventSubscription (return ()) eventSubscribedNow
260-- | Construct an 'Event' whose value is guaranteed not to be recomputed
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
261-- repeatedly
326-- repeatedly
263--TODO: Try a caching strategy where we subscribe directly to the parent when
328--TODO: Try a caching strategy where we subscribe directly to the parent when
264−--there's only one subscriber, and then build our own WeakBag only when a second
329+--there's only one subscriber, and then build our own FastWeakBag only when a second
265--subscriber joins
330--subscriber joins
266−{-# NOINLINE cacheEvent #-}
331+{-# NOINLINE [0] cacheEvent #-}
267−cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
332+cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
268cacheEvent e =
333cacheEvent e =
269#ifdef DEBUG_TRACE_EVENTS
334#ifdef DEBUG_TRACE_EVENTS
270 withStackOneLine $ \callSite -> Event $
335 withStackOneLine $ \callSite -> Event $
274− let !mSubscribedRef = unsafeNewIORef e Nothing
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
275− in \sub -> {-# SCC "cacheEvent" #-} do
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
276#ifdef DEBUG_TRACE_EVENTS
343#ifdef DEBUG_TRACE_EVENTS
277 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
279− mSubscribed <- liftIO $ readIORef mSubscribedRef
346+ subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
280− case mSubscribed of
347+ Just subscribedTicket -> return subscribedTicket
281− Just subscribed -> liftIO $ do
282− ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
283− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
284− let es = EventSubscribed
285− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
286− , eventSubscribedRetained = toAny subscribed
288− return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
289 Nothing -> do
348 Nothing -> do
290− weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
349+#ifdef DEBUG_NODEIDS
291− (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
350+ nodeId <- liftIO newNodeId
352+ subscribers <- liftIO FastWeakBag.empty
292− occRef <- liftIO $ newIORef undefined
353+ occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
355+ (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
293 (parentSub, occ) <- subscribeAndRead e $ Subscriber
357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
294− { subscriberPropagate = \a -> do
359+ { subscriberPropagate = \a -> do
295− liftIO $ writeIORef occRef $ Just a
360+ liftIO $ writeIORef occRef (Just a)
296− scheduleClear occRef
361+ scheduleClear occRef
297− propagate a subscribers
362+ propagateFast a subscribers
298− , subscriberInvalidateHeight = \old -> do
299− WeakBag.traverse subscribers $ invalidateSubscriberHeight old
363+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
300− , subscriberRecalculateHeight = \new -> do
301− WeakBag.traverse subscribers $ recalculateSubscriberHeight new
364+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
303− liftIO $ writeIORef occRef occ
366+ when (isJust occ) $ do
367+ liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
304− when (isJust occ) $ scheduleClear occRef
368+ scheduleClear occRef
305 let !subscribed = CacheSubscribed
369 let !subscribed = CacheSubscribed
306 { _cacheSubscribed_subscribers = subscribers
370 { _cacheSubscribed_subscribers = subscribers
307− , _cacheSubscribed_weakSelf = weakSelf
308 , _cacheSubscribed_parent = parentSub
371 , _cacheSubscribed_parent = parentSub
309− , _cacheSubscribed_cached = mSubscribedRef
310 , _cacheSubscribed_occurrence = occRef
372 , _cacheSubscribed_occurrence = occRef
374+ , _cacheSubscribed_nodeId = nodeId
377+ subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
312− liftIO $ writeIORef mSubscribedRef $ Just subscribed
378+ liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
313− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
379+ return subscribedTicket
380+ liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
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
389+ let parentSub = _cacheSubscribed_parent subscribed
390+ es = EventSubscription
391+ { _eventSubscription_unsubscribe = do
392+ FastWeakBag.remove ticket
394+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
396+ writeIORef mSubscribedRef emptyFastWeak
397+ unsubscribe parentSub
399+ touch subscribedTicket
400+ , _eventSubscription_subscribed = EventSubscribed
314− return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
401+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402+ , eventSubscribedRetained = toAny subscribedTicket
404+ , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405+ , eventSubscribedHasOwnHeightRef = False
406+ , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
316−cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
317−cleanupCacheSubscribed self = do
318− unsubscribe $ _cacheSubscribed_parent self
319− writeIORef (_cacheSubscribed_cached self) Nothing
321subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
322subscribe e s = fst <$> subscribeAndRead e s
414subscribe e s = fst <$> subscribeAndRead e s
@@ -328,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
328 let es = tag subd
420 let es = tag subd
329 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
331−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
332eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
334eventNever :: Event x a
429eventNever :: Event x a
335−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
337−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
338eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
340eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -343,14 +438,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
343eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
438eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
344eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
346−eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
441+eventHold :: Hold x p -> Event x p
347eventHold !h = Event $ subscribeHoldEvent h
442eventHold !h = Event $ subscribeHoldEvent h
349eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
444eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
350eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
352{-# INLINE subscribeCoincidenceInner #-}
447{-# INLINE subscribeCoincidenceInner #-}
353−subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
448+subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
354subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
355 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
356 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -369,16 +464,6 @@ data Subscriber x a = Subscriber
369 , subscriberRecalculateHeight :: !(Height -> IO ())
464 , subscriberRecalculateHeight :: !(Height -> IO ())
372−--TODO: Move this comment to WeakBag
373−-- These function are constructor functions that are marked NOINLINE so they are
374−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
375−-- so any weak references that are attached to the constructors will have their
376−-- finalizer run. Using the opaque constructor, does not see the
377−-- constructor application, so it behaves like an IORef and cannot be fused away.
379−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
380−-- the weak pointer to it in some cases.
382newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
383newSubscriberHold h = return $ Subscriber
468newSubscriberHold h = return $ Subscriber
384 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -386,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
386 , subscriberRecalculateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
389−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
474+newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
390−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
391 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
392 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
393− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
394 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
395 scheduleClear $ fanSubscribedOccurrence subscribed
480 scheduleClear $ fanSubscribedOccurrence subscribed
396− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
397 propagate v $ _fanSubscribedChildren_list subsubs
482 propagate v $ _fanSubscribedChildren_list subsubs
398 return $ Constant ()
483 return $ Constant ()
399 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
400 return ()
485 return ()
401 , subscriberInvalidateHeight = \old -> do
486 , subscriberInvalidateHeight = \old -> do
402− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
403 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
404− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
405− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
406 , subscriberRecalculateHeight = \new -> do
489 , subscriberRecalculateHeight = \new -> do
407− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
408 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
409− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
410− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
413newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
414−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
415 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
416− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
417 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
418 scheduleClear $ switchSubscribedOccurrence subscribed
498 scheduleClear $ switchSubscribedOccurrence subscribed
419 propagate a $ switchSubscribedSubscribers subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
420 , subscriberInvalidateHeight = \_ -> do
500 , subscriberInvalidateHeight = \_ -> do
421− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
422 oldHeight <- readIORef $ switchSubscribedHeight subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
423 when (oldHeight /= invalidHeight) $ do
502 when (oldHeight /= invalidHeight) $ do
424 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
425− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
426− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
427− , subscriberRecalculateHeight = \new -> do
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
428− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
429− updateSwitchHeight new subscribed
430− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
433newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
434−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
435 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
436− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
437 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
438 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
439 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
440 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
441 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
442 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
443 scheduleClear $ coincidenceSubscribedInnerParent subscribed
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
444 case occ of
519 case occ of
445− Nothing -> do
520+ Nothing ->
446 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
447 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
448− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
449− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
450 Just o -> do -- Since it's already firing, no need to adjust height
525 Just o -> do -- Since it's already firing, no need to adjust height
451 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
452 scheduleClear $ coincidenceSubscribedOccurrence subscribed
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
453 propagate o $ coincidenceSubscribedSubscribers subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
454− , subscriberInvalidateHeight = \_ -> do
455− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
456− invalidateCoincidenceHeight subscribed
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
457− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
458− , subscriberRecalculateHeight = \_ -> do
459− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
460− recalculateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
461− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
464newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
465−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
466 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
467− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
468 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
469 case occ of
537 case occ of
470 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -472,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
472 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
473 scheduleClear $ coincidenceSubscribedOccurrence subscribed
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
474 propagate a $ coincidenceSubscribedSubscribers subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
475− , subscriberInvalidateHeight = \_ -> do
476− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
477− invalidateCoincidenceHeight subscribed
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
478− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
479− , subscriberRecalculateHeight = \_ -> do
480− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
481− recalculateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
482− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
485invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -489,11 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
489recalculateSubscriberHeight = flip subscriberRecalculateHeight
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
491-- | Propagate everything at the current height
553-- | Propagate everything at the current height
492−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
493−propagate a subscribers = withIncreasedDepth $ do
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
494 -- 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
556 -- 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
495 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
557 --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
560+-- | 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) $
563+ -- 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
564+ --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
496− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
498--------------------------------------------------------------------------------
567--------------------------------------------------------------------------------
499-- EventSubscribed
568-- EventSubscribed
@@ -502,11 +571,16 @@ propagate a subscribers = withIncreasedDepth $ do
502toAny :: a -> Any
571toAny :: a -> Any
503toAny = unsafeCoerce
572toAny = unsafeCoerce
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
505data EventSubscribed x = EventSubscribed
579data EventSubscribed x = EventSubscribed
506 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
507 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
508#ifdef DEBUG_CYCLES
582#ifdef DEBUG_CYCLES
509− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
510 , eventSubscribedHasOwnHeightRef :: !Bool
584 , eventSubscribedHasOwnHeightRef :: !Bool
511 , eventSubscribedWhoCreated :: !(IO [String])
585 , eventSubscribedWhoCreated :: !(IO [String])
@@ -533,13 +607,23 @@ eventSubscribedNever = EventSubscribed
533 , eventSubscribedWhoCreated = return ["never"]
607 , eventSubscribedWhoCreated = return ["never"]
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
537−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
538eventSubscribedFan !subscribed = EventSubscribed
622eventSubscribedFan !subscribed = EventSubscribed
539 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
540 , eventSubscribedRetained = toAny subscribed
624 , eventSubscribedRetained = toAny subscribed
541#ifdef DEBUG_CYCLES
625#ifdef DEBUG_CYCLES
542− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
543 , eventSubscribedHasOwnHeightRef = False
627 , eventSubscribedHasOwnHeightRef = False
544 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -552,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
552#ifdef DEBUG_CYCLES
636#ifdef DEBUG_CYCLES
553 , eventSubscribedGetParents = do
637 , eventSubscribedGetParents = do
554 s <- readIORef $ switchSubscribedCurrentParent subscribed
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
555− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
556 , eventSubscribedHasOwnHeightRef = True
640 , eventSubscribedHasOwnHeightRef = True
557 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -565,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
565#ifdef DEBUG_CYCLES
649#ifdef DEBUG_CYCLES
566 , eventSubscribedGetParents = do
650 , eventSubscribedGetParents = do
567 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
568− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
569− innerParents = maybeToList $ fmap Some.This innerSubscription
653+ innerParents = maybeToList $ innerSubscription
570 return $ outerParent : innerParents
654 return $ outerParent : innerParents
571 , eventSubscribedHasOwnHeightRef = True
655 , eventSubscribedHasOwnHeightRef = True
572 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -580,20 +664,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
580whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
581whoCreatedEventSubscribed = eventSubscribedWhoCreated
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
583−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
584walkInvalidHeightParents s0 = do
668walkInvalidHeightParents s0 = do
585− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
586 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
587 when (h == invalidHeight) $ do
671 when (h == invalidHeight) $ do
588 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
589− modify (Some.This s :)
673+ modify (s :)
590 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
591− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
592 return subscribers
676 return subscribers
595{-# INLINE subscribeHoldEvent #-}
679{-# INLINE subscribeHoldEvent #-}
596−subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
597subscribeHoldEvent = subscribeAndRead . holdEvent
681subscribeHoldEvent = subscribeAndRead . holdEvent
599--------------------------------------------------------------------------------
683--------------------------------------------------------------------------------
@@ -616,7 +700,7 @@ behaviorPull !p = Behavior $ do
616 val <- liftIO $ readIORef $ pullValue p
700 val <- liftIO $ readIORef $ pullValue p
617 case val of
701 case val of
618 Just subscribed -> do
702 Just subscribed -> do
619− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
620 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
621 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
622 return $ pullSubscribedValue subscribed
706 return $ pullSubscribedValue subscribed
@@ -625,7 +709,7 @@ behaviorPull !p = Behavior $ do
625 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
626 parentsRef <- liftIO $ newIORef []
710 parentsRef <- liftIO $ newIORef []
627 holdInits <- askBehaviorHoldInits
711 holdInits <- askBehaviorHoldInits
628− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
629 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
630 parents <- liftIO $ readIORef parentsRef
714 parents <- liftIO $ readIORef parentsRef
631 let subscribed = PullSubscribed
715 let subscribed = PullSubscribed
@@ -635,7 +719,7 @@ behaviorPull !p = Behavior $ do
635 , pullSubscribedParents = parents
719 , pullSubscribedParents = parents
637 liftIO $ writeIORef (pullValue p) $ Just subscribed
721 liftIO $ writeIORef (pullValue p) $ Just subscribed
638− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
641behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
725behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -646,7 +730,8 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
646readHoldTracked h = do
730readHoldTracked h = do
647 result <- liftIO $ readIORef $ holdValue h
731 result <- liftIO $ readIORef $ holdValue h
648 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
649− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
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
650 return result
735 return result
652{-# INLINABLE readBehaviorUntracked #-}
737{-# INLINABLE readBehaviorUntracked #-}
@@ -659,42 +744,46 @@ readBehaviorUntracked b = do
659-- Dynamic
744-- Dynamic
660--------------------------------------------------------------------------------
745--------------------------------------------------------------------------------
747+type DynamicS x p = Dynamic x (PatchTarget p) p
662−data Dynamic x p = Dynamic
749+data Dynamic x target p = Dynamic
663− { dynamicCurrent :: !(Behavior x (PatchTarget p))
750+ { dynamicCurrent :: !(Behavior x target)
664− , dynamicUpdated :: !(Event x p)
751+ , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
667−dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
759+dynamicHold :: Hold x p -> DynamicS x p
668dynamicHold !h = Dynamic
760dynamicHold !h = Dynamic
669 { dynamicCurrent = behaviorHold h
761 { dynamicCurrent = behaviorHold h
670 , dynamicUpdated = eventHold h
762 , dynamicUpdated = eventHold h
673−dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
674dynamicHoldIdentity = dynamicHold
766dynamicHoldIdentity = dynamicHold
676−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
677dynamicConst !a = Dynamic
769dynamicConst !a = Dynamic
678 { dynamicCurrent = behaviorConst a
770 { dynamicCurrent = behaviorConst a
679 , dynamicUpdated = eventNever
771 , dynamicUpdated = eventNever
682−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
683dynamicDyn !d = Dynamic
775dynamicDyn !d = Dynamic
684 { dynamicCurrent = behaviorDyn d
776 { dynamicCurrent = behaviorDyn d
685 , dynamicUpdated = eventDyn d
777 , dynamicUpdated = eventDyn d
688−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
689dynamicDynIdentity = dynamicDyn
781dynamicDynIdentity = dynamicDyn
691--------------------------------------------------------------------------------
783--------------------------------------------------------------------------------
692-- Combinators
784-- Combinators
693--------------------------------------------------------------------------------
785--------------------------------------------------------------------------------
695−--TODO: Figure out why certain things are not 'representational', then make them
696−--representational so we can use coerce
698--type role Hold representational
787--type role Hold representational
699data Hold x p
788data Hold x p
700 = Hold { holdValue :: !(IORef (PatchTarget p))
789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -706,9 +795,7 @@ data Hold x p
709−-- | A statically allocated 'SpiderTimeline'; this is the only instance of
798+-- | A statically allocated 'SpiderTimeline'
710−-- 'SpiderTimeline' that can used when using
711−-- -fspecialize-to-spidertimeline-global.
712data Global
799data Global
714{-# NOINLINE globalSpiderTimelineEnv #-}
801{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -717,38 +804,37 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
718-- | Stores all global data relevant to a particular Spider timeline; only one
805-- | Stores all global data relevant to a particular Spider timeline; only one
719-- value should exist for each type @x@
806-- 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
720−data SpiderTimelineEnv x = SpiderTimelineEnv
812+data SpiderTimelineEnv' x = SpiderTimelineEnv
721 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
722 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
723#ifdef DEBUG
815#ifdef DEBUG
724 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
727−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
729instance Eq (SpiderTimelineEnv x) where
821instance Eq (SpiderTimelineEnv x) where
730 _ == _ = True -- Since only one exists of each type
822 _ == _ = True -- Since only one exists of each type
732instance GEq SpiderTimelineEnv where
824instance GEq SpiderTimelineEnv where
733−#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
735− geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
736− then case unsafeCoerce Refl :: a :~: b of
737− Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
740− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
741 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
742 else Nothing
827 else Nothing
745data EventEnv x
829data EventEnv x
746 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
830 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
747 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832+ , eventEnvDynInits :: !(IORef [SomeDynInit x])
748 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
749 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
750− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
751− , eventEnvRootClears :: !(IORef [SomeRootClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
752 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
753 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
754 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -759,7 +845,7 @@ runEventM :: EventM x a -> IO a
759runEventM = unEventM
845runEventM = unEventM
761asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
762−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
764class MonadIO m => Defer a m where
850class MonadIO m => Defer a m where
765 getDeferralQueue :: m (IORef [a])
851 getDeferralQueue :: m (IORef [a])
@@ -778,6 +864,10 @@ instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
778 {-# INLINE getDeferralQueue #-}
864 {-# INLINE getDeferralQueue #-}
779 getDeferralQueue = asksEventEnv eventEnvHoldInits
865 getDeferralQueue = asksEventEnv eventEnvHoldInits
867+instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868+ {-# INLINE getDeferralQueue #-}
869+ getDeferralQueue = asksEventEnv eventEnvDynInits
781instance Defer (SomeHoldInit x) (BehaviorM x) where
871instance Defer (SomeHoldInit x) (BehaviorM x) where
782 {-# INLINE getDeferralQueue #-}
872 {-# INLINE getDeferralQueue #-}
783 getDeferralQueue = BehaviorM $ asks snd
873 getDeferralQueue = BehaviorM $ asks snd
@@ -804,11 +894,7 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
804 delayedRef <- asksEventEnv eventEnvDelayedMerges
894 delayedRef <- asksEventEnv eventEnvDelayedMerges
805 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
895 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
807−#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
808−class x ~ Global => HasSpiderTimeline x where
810class HasSpiderTimeline x where
897class HasSpiderTimeline x where
812 -- | Retrieve the current SpiderTimelineEnv
898 -- | Retrieve the current SpiderTimelineEnv
813 spiderTimeline :: SpiderTimelineEnv x
899 spiderTimeline :: SpiderTimelineEnv x
@@ -820,21 +906,29 @@ putCurrentHeight h = do
820 heightRef <- asksEventEnv eventEnvCurrentHeight
906 heightRef <- asksEventEnv eventEnvCurrentHeight
821 liftIO $ writeIORef heightRef $! h
907 liftIO $ writeIORef heightRef $! h
823−instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
824 {-# INLINE getDeferralQueue #-}
910 {-# INLINE getDeferralQueue #-}
825 getDeferralQueue = asksEventEnv eventEnvClears
911 getDeferralQueue = asksEventEnv eventEnvClears
827{-# INLINE scheduleClear #-}
913{-# INLINE scheduleClear #-}
828−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
829−scheduleClear r = defer $ SomeClear r
915+scheduleClear r = defer $ Some $ Clear r
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918+ {-# INLINE getDeferralQueue #-}
919+ getDeferralQueue = asksEventEnv eventEnvIntClears
921+{-# INLINE scheduleIntClear #-}
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
831−instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
832 {-# INLINE getDeferralQueue #-}
926 {-# INLINE getDeferralQueue #-}
833 getDeferralQueue = asksEventEnv eventEnvRootClears
927 getDeferralQueue = asksEventEnv eventEnvRootClears
835{-# INLINE scheduleRootClear #-}
929{-# INLINE scheduleRootClear #-}
836−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
837−scheduleRootClear r = defer $ SomeRootClear r
931+scheduleRootClear r = defer $ Some $ RootClear r
839instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
840 {-# INLINE getDeferralQueue #-}
934 {-# INLINE getDeferralQueue #-}
@@ -863,7 +957,7 @@ hold v0 e = do
865{-# INLINE getHoldEventSubscription #-}
959{-# INLINE getHoldEventSubscription #-}
866−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)
960+getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
867getHoldEventSubscription h = do
961getHoldEventSubscription h = do
868 ep <- liftIO $ readIORef $ holdParent h
962 ep <- liftIO $ readIORef $ holdParent h
869 case ep of
963 case ep of
@@ -889,9 +983,9 @@ getHoldEventSubscription h = do
890type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
892−--type role BehaviorM representational
893-- BehaviorM can sample behaviors
986-- BehaviorM can sample behaviors
894−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
987+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988+ deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
896instance Monad (BehaviorM x) where
990instance Monad (BehaviorM x) where
897 {-# INLINE (>>=) #-}
991 {-# INLINE (>>=) #-}
@@ -900,14 +994,16 @@ instance Monad (BehaviorM x) where
900 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
901 {-# INLINE return #-}
995 {-# INLINE return #-}
902 return x = BehaviorM $ return x
996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
903 {-# INLINE fail #-}
998 {-# INLINE fail #-}
904 fail s = BehaviorM $ fail s
999 fail s = BehaviorM $ fail s
906data BehaviorSubscribed x a
1002data BehaviorSubscribed x a
907 = forall p. BehaviorSubscribedHold (Hold x p)
1003 = forall p. BehaviorSubscribedHold (Hold x p)
908 | BehaviorSubscribedPull (PullSubscribed x a)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
910−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
912--type role PullSubscribed representational
1008--type role PullSubscribed representational
913data PullSubscribed x a
1009data PullSubscribed x a
@@ -942,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
945−data Root x (k :: * -> *)
1041+data Root x k
946 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
947 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
948 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -950,6 +1046,8 @@ data Root x (k :: * -> *)
951data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1047data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1049+data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
953data SomeMergeUpdate x = SomeMergeUpdate
1051data SomeMergeUpdate x = SomeMergeUpdate
954 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1052 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
955 , _someMergeUpdate_invalidateHeight :: !(IO ())
1053 , _someMergeUpdate_invalidateHeight :: !(IO ())
@@ -959,16 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
959newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
961-- EventM can do everything BehaviorM can, plus create holds
1059-- EventM can do everything BehaviorM can, plus create holds
962−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
964−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
966−instance Defer (SomeHoldInit x) (ComputeM x) where
967− getDeferralQueue = ComputeM ask
969−{-# INLINABLE runComputeM #-}
970−runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
971−runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
973newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -993,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
993heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
995heightBagAdd :: Height -> HeightBag -> HeightBag
1084heightBagAdd :: Height -> HeightBag -> HeightBag
996−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
998heightBagRemove :: Height -> HeightBag -> HeightBag
1088heightBagRemove :: Height -> HeightBag -> HeightBag
999heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1002,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1002 0 -> IntMap.delete h c
1092 0 -> IntMap.delete h c
1003 _ -> IntMap.insert h (pred old) c
1093 _ -> IntMap.insert h (pred old) c
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
1005heightBagMax :: HeightBag -> Height
1102heightBagMax :: HeightBag -> Height
1006heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1007 Just ((h, _), _) -> Height h
1104 Just ((h, _), _) -> Height h
@@ -1019,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
1019heightBagVerify = id
1116heightBagVerify = id
1022−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1119+data FanSubscribedChildren x k v a = FanSubscribedChildren
1023− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1120+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1024− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1121+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1025− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1122+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1028−data FanSubscribed (x :: *) k
1125+data FanSubscribed x k v
1029− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1126+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1030− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1127+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1031− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1128+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1032 , fanSubscribedParent :: !(EventSubscription x)
1129 , fanSubscribedParent :: !(EventSubscription x)
1033#ifdef DEBUG_NODEIDS
1130#ifdef DEBUG_NODEIDS
1034 , fanSubscribedNodeId :: Int
1131 , fanSubscribedNodeId :: Int
1038−data Fan x k
1135+data Fan x k v
1039− = Fan { fanParent :: !(Event x (DMap k Identity))
1136+ = Fan { fanParent :: !(Event x (DMap k v))
1040− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1137+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1043data SwitchSubscribed x a
1140data SwitchSubscribed x a
@@ -1091,20 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1091newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1092newInvalidatorPull p = return $! InvalidatorPull p
1189newInvalidatorPull p = return $! InvalidatorPull p
1094−instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1095− fmapMaybe f = push $ return . f
1192+ mapMaybe f = push $ return . f
1097instance HasSpiderTimeline x => Align (Event x) where
1194instance HasSpiderTimeline x => Align (Event x) where
1098 nil = eventNever
1195 nil = eventNever
1196+#if MIN_VERSION_these(0, 8, 0)
1197+instance HasSpiderTimeline x => Semialign (Event x) where
1099− align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromList [LeftTag :=> ea, RightTag :=> eb]
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1101−newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1206+ zip x y = mapMaybe justThese $ align x y
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)
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1103−newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1215+newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1104−newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1216+newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1106--TODO: Avoid the duplication between this and R.zipDynWith
1218--TODO: Avoid the duplication between this and R.zipDynWith
1107−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1219+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1108zipDynWith f da db =
1220zipDynWith f da db =
1109 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1110 ec = flip push eab $ \o -> do
1222 ec = flip push eab $ \o -> do
@@ -1117,19 +1229,22 @@ zipDynWith f da db =
1117 return (a, b)
1229 return (a, b)
1118 These (Identity a) (Identity b) -> return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1119 return $ Just $ Identity $ f a b
1231 return $ Just $ Identity $ f a b
1120− in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1232+ in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1234+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1235+buildDynamic readV0 v' = do
1236+ result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1237+ let !d = Dyn result
1238+ defer $ SomeDynInit d
1122−unsafeDyn :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1241+unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1123−unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1242+unsafeBuildDynamic readV0 v' =
1124− where x = (readV0, v')
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1126-- ResultM can read behaviors and events
1245-- ResultM can read behaviors and events
1127type ResultM = EventM
1246type ResultM = EventM
1129−{-# NOINLINE unsafeNewIORef #-}
1130−unsafeNewIORef :: a -> b -> IORef b
1131−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1133instance HasSpiderTimeline x => Functor (Event x) where
1248instance HasSpiderTimeline x => Functor (Event x) where
1134 fmap f = push $ return . Just . f
1249 fmap f = push $ return . Just . f
@@ -1142,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
1143{-# INLINABLE pull #-}
1258{-# INLINABLE pull #-}
1144pull :: BehaviorM x a -> Behavior x a
1259pull :: BehaviorM x a -> Behavior x a
1145−pull a = behaviorPull $ Pull
1260+pull a = unsafePerformIO $ do
1146− { pullCompute = a
1261+ ref <- newIORef Nothing
1147− , pullValue = unsafeNewIORef a Nothing
1148#ifdef DEBUG_NODEIDS
1262#ifdef DEBUG_NODEIDS
1149− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
1265+ pure $ behaviorPull $ Pull
1268+#ifdef DEBUG_NODEIDS
1153{-# INLINABLE switch #-}
1273{-# INLINABLE switch #-}
1154switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1155−switch a = eventSwitch $ Switch
1277+ pure $ eventSwitch $ Switch
1156− { switchParent = a
1278+ { switchParent = a
1157− , switchSubscribed = unsafeNewIORef a Nothing
1279+ , switchSubscribed = ref
1160coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1161−coincidence a = eventCoincidence $ Coincidence
1285+ pure $ eventCoincidence $ Coincidence
1162− { coincidenceParent = a
1286+ { coincidenceParent = a
1163− , coincidenceSubscribed = unsafeNewIORef a Nothing
1287+ , coincidenceSubscribed = ref
1166-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1167run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1168run roots after = do
1292run roots after = do
1169 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1170− t <- SpiderHost ask
1294+ let t = spiderTimeline :: SpiderTimelineEnv x
1171− result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1172 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1173 occBefore <- liftIO $ do
1297 occBefore <- liftIO $ do
1174 occBefore <- readIORef occRef
1298 occBefore <- readIORef occRef
@@ -1206,9 +1330,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1206 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1209−data SomeClear = forall a. SomeClear (IORef (Maybe a))
1333+newtype Clear a = Clear (IORef (Maybe a))
1335+newtype IntClear a = IntClear (IORef (IntMap a))
1211−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
1213data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
@@ -1220,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
1220 x' <- evaluate x
1346 x' <- evaluate x
1221 mkWeakPtr x' $
1347 mkWeakPtr x' $
1222 if debugFinalize
1348 if debugFinalize
1223− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
1224 else Nothing
1350 else Nothing
1226type WeakList a = [Weak a]
1352type WeakList a = [Weak a]
1228−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1229#ifdef DEBUG
1359#ifdef DEBUG
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
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"
1230−withIncreasedDepth :: CanTrace x m => m a -> m a
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1231−withIncreasedDepth a = do
1383+withIncreasedDepth _ a = do
1232− spiderTimeline <- askSpiderTimelineEnv
1233− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1234 result <- a
1385 result <- a
1235− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1236 return result
1387 return result
1238−withIncreasedDepth :: m a -> m a
1239−withIncreasedDepth = id
1242−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1244{-# INLINE tracePropagate #-}
1389{-# INLINE tracePropagate #-}
1245tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1246−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
1248{-# INLINE traceInvalidate #-}
1393{-# INLINE traceInvalidate #-}
1249traceInvalidate :: String -> IO ()
1394traceInvalidate :: String -> IO ()
1250−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1252−{-# INLINE traceWhen #-}
1397+{-# INLINE traceInvalidateHeight #-}
1253−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1398+traceInvalidateHeight :: String -> IO ()
1254−traceWhen p b message = traceMWhen p b $ return message
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1256−{-# INLINE traceMWhen #-}
1401+{-# INLINE trace #-}
1257−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1258−traceMWhen _ b getMessage = when b $ do
1407+traceM _ getMessage = do
1259 message <- getMessage
1408 message <- getMessage
1261− spiderTimeline <- askSpiderTimelineEnv
1262− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1266− liftIO $ putStrLn $ replicate d ' ' <> message
1268whoCreatedIORef :: IORef a -> IO [String]
1450whoCreatedIORef :: IORef a -> IO [String]
1269whoCreatedIORef (IORef a) = whoCreated $! a
1451whoCreatedIORef (IORef a) = whoCreated $! a
1272groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1273groupByHead = \case
1454groupByHead = \case
1274 [] -> []
1455 [] -> []
@@ -1279,20 +1460,54 @@ groupByHead = \case
1279 | otherwise -> (x, xs :| []) : l
1460 | otherwise -> (x, xs :| []) : l
1281listsToForest :: Eq a => [[a]] -> Forest a
1462listsToForest :: Eq a => [[a]] -> Forest a
1282−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1463+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1466+showStacks :: [[String]] -> String
1467+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1469+filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1471+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473+filterStack prefix = id
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
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
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
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"
1285{-# INLINE propagateSubscriberHold #-}
1498{-# INLINE propagateSubscriberHold #-}
1286propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1287propagateSubscriberHold h a = do
1500propagateSubscriberHold h a = do
1288− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1289 invalidators <- liftIO $ readIORef $ holdInvalidators h
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1290 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1291 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1292 case {-# SCC "apply" #-} apply a v of
1506 case {-# SCC "apply" #-} apply a v of
1293 Nothing -> return ()
1507 Nothing -> return ()
1294 Just v' -> do
1508 Just v' -> do
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1295− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1296 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1297 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1298 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1300,25 +1515,25 @@ propagateSubscriberHold h a = do
1300data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1302runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1303−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1305askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1306askInvalidator = do
1521askInvalidator = do
1307− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
1308 case m of
1523 case m of
1309 Nothing -> return Nothing
1524 Nothing -> return Nothing
1310 Just (!wi, _) -> return $ Just wi
1525 Just (!wi, _) -> return $ Just wi
1312askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1313askParentsRef = do
1528askParentsRef = do
1314− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
1315 case m of
1530 case m of
1316 Nothing -> return Nothing
1531 Nothing -> return Nothing
1317 Just (_, !p) -> return $ Just p
1532 Just (_, !p) -> return $ Just p
1319askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1320askBehaviorHoldInits = do
1535askBehaviorHoldInits = do
1321− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
1322 return his
1537 return his
1324{-# INLINE getDynHold #-}
1539{-# INLINE getDynHold #-}
@@ -1326,30 +1541,27 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1326getDynHold d = do
1541getDynHold d = do
1327 mh <- liftIO $ readIORef $ unDyn d
1542 mh <- liftIO $ readIORef $ unDyn d
1328 case mh of
1543 case mh of
1329− Right h -> return h
1544+ HoldDyn h -> return h
1330− Left (readV0, v') -> do
1545+ UnsafeDyn (readV0, v') -> do
1331 holdInits <- getDeferralQueue
1546 holdInits <- getDeferralQueue
1332 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549+ BuildDyn (readV0, v') -> do
1550+ v0 <- liftIO $ runEventM readV0
1333 h <- hold v0 v'
1554 h <- hold v0 v'
1334− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
1335 return h
1556 return h
1337-- Always refers to 0
1559-- Always refers to 0
1338{-# NOINLINE zeroRef #-}
1560{-# NOINLINE zeroRef #-}
1339zeroRef :: IORef Height
1561zeroRef :: IORef Height
1340zeroRef = unsafePerformIO $ newIORef zeroHeight
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1342−type CanSubscribe x m =
1343− ( HasSpiderTimeline x
1344− , HasCurrentHeight x m
1345− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1346− , Defer SomeClear m -- Wiping out event firings
1347− , Defer (SomeAssignment x) m -- Updating state
1348− , Defer (SomeResetCoincidence x) m
1352−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1353getRootSubscribed k r sub = do
1565getRootSubscribed k r sub = do
1354 mSubscribed <- readIORef $ rootSubscribed r
1566 mSubscribed <- readIORef $ rootSubscribed r
1355 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1363,9 +1575,14 @@ getRootSubscribed k r sub = do
1363 let !cached = rootSubscribed r
1575 let !cached = rootSubscribed r
1364 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1365 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1366− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1367 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1368 writeIORef uninitRef $! uninit
1582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1369 let !subscribed = RootSubscribed
1586 let !subscribed = RootSubscribed
1370 { rootSubscribedKey = k
1587 { rootSubscribedKey = k
1371 , rootSubscribedCachedSubscribed = cached
1588 , rootSubscribedCachedSubscribed = cached
@@ -1374,7 +1591,7 @@ getRootSubscribed k r sub = do
1374 , rootSubscribedUninit = uninit
1591 , rootSubscribedUninit = uninit
1375 , rootSubscribedWeakSelf = weakSelf
1592 , rootSubscribedWeakSelf = weakSelf
1376#ifdef DEBUG_NODEIDS
1593#ifdef DEBUG_NODEIDS
1377− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
1380 -- If we die at the same moment that all our children die, they will
1597 -- If we die at the same moment that all our children die, they will
@@ -1404,8 +1621,90 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
1404subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1405subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624+newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
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
1635+newFanInt :: IO (FanInt x a)
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
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
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
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
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)
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1407{-# INLINABLE getFanSubscribed #-}
1706{-# INLINABLE getFanSubscribed #-}
1408−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)
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))
1409getFanSubscribed k f sub = do
1708getFanSubscribed k f sub = do
1410 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1411 case mSubscribed of
1710 case mSubscribed of
@@ -1423,13 +1722,16 @@ getFanSubscribed k f sub = do
1423 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1424 occRef <- liftIO $ newIORef parentOcc
1723 occRef <- liftIO $ newIORef parentOcc
1425 when (isJust parentOcc) $ scheduleClear occRef
1724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1426 let subscribed = FanSubscribed
1728 let subscribed = FanSubscribed
1427 { fanSubscribedCachedSubscribed = fanSubscribed f
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1428 , fanSubscribedOccurrence = occRef
1730 , fanSubscribedOccurrence = occRef
1429 , fanSubscribedParent = subscription
1731 , fanSubscribedParent = subscription
1430 , fanSubscribedSubscribers = subscribersRef
1732 , fanSubscribedSubscribers = subscribersRef
1431#ifdef DEBUG_NODEIDS
1733#ifdef DEBUG_NODEIDS
1432− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
1435 let !self = (k, subscribed)
1737 let !self = (k, subscribed)
@@ -1439,7 +1741,7 @@ getFanSubscribed k f sub = do
1439 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1440 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1442−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1443cleanupFanSubscribed (k, subscribed) = do
1745cleanupFanSubscribed (k, subscribed) = do
1444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1445 let reducedSubscribers = DMap.delete k subscribers
1747 let reducedSubscribers = DMap.delete k subscribers
@@ -1451,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
1451 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1453{-# INLINE subscribeFanSubscribed #-}
1755{-# INLINE subscribeFanSubscribed #-}
1454−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1756+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1455subscribeFanSubscribed k subscribed sub = do
1757subscribeFanSubscribed k subscribed sub = do
1456 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1457 case DMap.lookup k subscribers of
1759 case DMap.lookup k subscribers of
@@ -1464,7 +1766,7 @@ subscribeFanSubscribed k subscribed sub = do
1464 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1466{-# INLINABLE getSwitchSubscribed #-}
1768{-# INLINABLE getSwitchSubscribed #-}
1467−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)
1769+getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1468getSwitchSubscribed s sub = do
1770getSwitchSubscribed s sub = do
1469 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1470 case mSubscribed of
1772 case mSubscribed of
@@ -1489,6 +1791,9 @@ getSwitchSubscribed s sub = do
1489 when (isJust parentOcc) $ scheduleClear occRef
1791 when (isJust parentOcc) $ scheduleClear occRef
1490 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1491 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1492 let !subscribed = SwitchSubscribed
1797 let !subscribed = SwitchSubscribed
1493 { switchSubscribedCachedSubscribed = switchSubscribed s
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1494 , switchSubscribedOccurrence = occRef
1799 , switchSubscribedOccurrence = occRef
@@ -1501,7 +1806,7 @@ getSwitchSubscribed s sub = do
1501 , switchSubscribedCurrentParent = subscriptionRef
1806 , switchSubscribedCurrentParent = subscriptionRef
1502 , switchSubscribedWeakSelf = weakSelf
1807 , switchSubscribedWeakSelf = weakSelf
1503#ifdef DEBUG_NODEIDS
1808#ifdef DEBUG_NODEIDS
1504− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
1507 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1520,7 +1825,7 @@ subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBa
1520subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1522{-# INLINABLE getCoincidenceSubscribed #-}
1827{-# INLINABLE getCoincidenceSubscribed #-}
1523−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)
1828+getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1524getCoincidenceSubscribed c sub = do
1829getCoincidenceSubscribed c sub = do
1525 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1526 case mSubscribed of
1831 case mSubscribed of
@@ -1546,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
1546 scheduleClear innerSubdRef
1851 scheduleClear innerSubdRef
1547 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1548 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1549 let subscribed = CoincidenceSubscribed
1857 let subscribed = CoincidenceSubscribed
1550 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1551 , coincidenceSubscribedOccurrence = occRef
1859 , coincidenceSubscribedOccurrence = occRef
@@ -1556,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
1556 , coincidenceSubscribedInnerParent = innerSubdRef
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1557 , coincidenceSubscribedWeakSelf = weakSelf
1865 , coincidenceSubscribedWeakSelf = weakSelf
1558#ifdef DEBUG_NODEIDS
1866#ifdef DEBUG_NODEIDS
1559− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
1562 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1573,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
1573subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1574subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1576−{-# INLINE merge #-}
1884+{-# INLINE mergeG #-}
1577−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
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)
1578−merge d = cacheEvent (mergeCheap d)
1888+mergeG nt d = cacheEvent (mergeCheap nt d)
1580{-# INLINE mergeWithMove #-}
1890{-# INLINE mergeWithMove #-}
1581−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
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)
1582−mergeWithMove d = cacheEvent (mergeCheapWithMove d)
1894+mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1584{-# INLINE [1] mergeCheap #-}
1896{-# INLINE [1] mergeCheap #-}
1585−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
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)
1586−mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1588− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1589 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1590 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1591 (mOldSubd, newPs) <- case me of
1907 (mOldSubd, newPs) <- case me of
1592 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1593 Just e -> do
1909 Just e -> do
1594 let s = subscriber $ return k
1910 let s = subscriber $ return k
1595− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1596 newParentHeight <- liftIO $ getEventSubscribedHeight subd
1912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
1597 let newParent = MergeSubscribedParent subscription
1913 let newParent = MergeSubscribedParent subscription
1598 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1599 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1600 forM_ mOldSubd $ \oldSubd -> do
1916 forM_ mOldSubd $ \oldSubd -> do
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1601− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1602 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1603 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1604 foldM f ([], oldParents) $ DMap.toList p
1922 foldM f ([], oldParents) $ DMap.toList p
1605− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1606 getInitialSubscribers initialParents subscriber = do
1925 getInitialSubscribers initialParents subscriber = do
1607 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1608 let s = subscriber $ return k
1927 let s = subscriber $ return k
1609− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1610 height <- liftIO $ getEventSubscribedHeight parentSubd
1929 height <- liftIO $ getEventSubscribedHeight parentSubd
1611− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1612 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1613 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1614 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1616 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1617 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1619{-# INLINE [1] mergeCheapWithMove #-}
1939{-# INLINE [1] mergeCheapWithMove #-}
1620−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
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)
1621−mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1623− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1624 updateMe subscriber heightBagRef oldParents p = do
1947 updateMe subscriber heightBagRef oldParents p = do
1625 -- Prepare new parents for insertion
1948 -- Prepare new parents for insertion
1626− let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
1949+ let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1627 subscribeParent k e = do
1950 subscribeParent k e = do
1628 keyRef <- liftIO $ newIORef k
1951 keyRef <- liftIO $ newIORef k
1629 let s = subscriber $ liftIO $ readIORef keyRef
1952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1632,120 +1955,185 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.siz
1632 newParentHeight <- getEventSubscribedHeight subd
1955 newParentHeight <- getEventSubscribedHeight subd
1633 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1634 return $ MergeSubscribedParentWithMove subscription keyRef
1957 return $ MergeSubscribedParentWithMove subscription keyRef
1635− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1636 -- Collect old parents for deletion and update the keys of moved parents
1959 -- Collect old parents for deletion and update the keys of moved parents
1637− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1960+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1638 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1639 Nothing -> do
1962 Nothing -> do
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1966+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1640 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1641 Just toKey -> do
1968 Just toKey -> do
1642 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1643 return Nothing
1970 return Nothing
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1644− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1645 return (toDelete, applyAlways p' oldParents)
1974 return (toDelete, applyAlways p' oldParents)
1646− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1647 getInitialSubscribers initialParents subscriber = do
1976 getInitialSubscribers initialParents subscriber = do
1648 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1649 keyRef <- liftIO $ newIORef k
1978 keyRef <- liftIO $ newIORef k
1650 let s = subscriber $ liftIO $ readIORef keyRef
1979 let s = subscriber $ liftIO $ readIORef keyRef
1651− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1652 height <- liftIO $ getEventSubscribedHeight parentSubd
1981 height <- liftIO $ getEventSubscribedHeight parentSubd
1653− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1654 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1655 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1656 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1658 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1659 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1661−type MergeUpdateFunc k x p s
1991+type MergeUpdateFunc k v x p s
1662− = (forall a. EventM x (k a) -> Subscriber x a)
1992+ = (forall a. EventM x (k a) -> Subscriber x (v a))
1663 -> IORef HeightBag
1993 -> IORef HeightBag
1664 -> DMap k s
1994 -> DMap k s
1666 -> EventM x ([EventSubscription x], DMap k s)
1996 -> EventM x ([EventSubscription x], DMap k s)
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1668−type MergeInitFunc k x s
2000+type MergeInitFunc k v q x s
1669− = DMap k (Event x)
2001+ = DMap k q
1670− -> (forall a. EventM x (k a) -> Subscriber x a)
2002+ -> (forall a. EventM x (k a) -> Subscriber x (v a))
1671− -> EventM x (DMap k Identity, [Height], DMap k s)
2003+ -> EventM x (DMap k v, [Height], DMap k s)
1673type MergeDestroyFunc k s
2005type MergeDestroyFunc k s
1674 = DMap k s
2006 = DMap k s
1675 -> IO ()
2007 -> IO ()
1677−{-# INLINE mergeCheap' #-}
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))
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
2018+invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
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
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
2029+revalidateMergeHeight m = do
2030+ currentHeight <- readIORef $ _merge_heightRef m
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
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"
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
2055+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056+checkCycle subscribed = liftIO $ do
2057+ height <- readIORef (eventSubscribedHeightRef subscribed)
2059+ -- currentHeight <- getCurrentHeight
2060+ -- when (height <= currentHeight) $ if height /= invalidHeight
2062+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2065+ when (height == invalidHeight) $
2068+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070+ throwIO (EventLoopException stacks)
2072+ throwIO EventLoopException
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
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
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
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
2106+{-# INLINE mergeGCheap' #-}
2107+mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1678−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)
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)
1679−mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub -> do
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1680 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1681 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1682 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1683 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1684 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1685− let scheduleSelf height = scheduleMerge' height heightRef $ do
2115+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1686− m <- liftIO $ readIORef accumRef
2116+
1687− liftIO $ writeIORef accumRef $! DMap.empty
2117+ let subscribed = EventSubscribed
1688− --TODO: Assert that m is not empty
2118+ { eventSubscribedHeightRef = heightRef
1689− subscriberPropagate sub m
2119+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
1690− invalidateMyHeight = do
1691− oldHeight <- readIORef heightRef
1692− 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
1693− writeIORef heightRef $! invalidHeight
1694− subscriberInvalidateHeight sub oldHeight
1695− revalidateMyHeight = do
1696− currentHeight <- readIORef heightRef
1697− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1698− heights <- readIORef heightBagRef
1699− parents <- readIORef parentsRef
1700− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1701− case heightBagSize heights `compare` numParents parents of
1704− let height = succHeight $ heightBagMax heights
1705− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1706− writeIORef heightRef $! height
1707− subscriberRecalculateHeight sub height
1708− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (numParents parents) <> ") for Merge"
1709− subscriber :: forall a. EventM x (k a) -> Subscriber x a
1710− subscriber getKey = Subscriber
1711− { subscriberPropagate = \a -> do
1712− oldM <- liftIO $ readIORef accumRef
1714− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1715− tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1716− liftIO $ writeIORef accumRef $! newM
1717− when (DMap.null oldM) $ do -- Only schedule the firing once
1718− height <- liftIO $ readIORef heightRef
1719− --TODO: assertions about height
1720− currentHeight <- getCurrentHeight
1721− when (height <= currentHeight) $ do
1722− if height /= invalidHeight
1724− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1725− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1727#ifdef DEBUG_CYCLES
2120#ifdef DEBUG_CYCLES
1728− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
2121+ , eventSubscribedGetParents = do
1729− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
2122+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
1730− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
2123+ fmap getParent' . DMap.toList <$> readIORef parentsRef
1731−#else
2124+ , eventSubscribedHasOwnHeightRef = False
1732− let cycleInfo = ""
2125+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
1734− error $ "Causality loop found" <> cycleInfo
2127+ }
1735− scheduleSelf height
2128+
1736− , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2129+ m = Merge
1737− modifyIORef' heightBagRef $ heightBagRemove old
2130+ { _merge_parentsRef = parentsRef
1738− invalidateMyHeight
2131+ , _merge_heightBagRef = heightBagRef
1739− , subscriberRecalculateHeight = \new -> do
2132+ , _merge_heightRef = heightRef
1740− modifyIORef' heightBagRef $ heightBagAdd new
2133+ , _merge_sub = sub
1741− revalidateMyHeight
2134+ , _merge_accumRef = accumRef
1743− let updateMe x = do
1744− oldParents <- liftIO $ readIORef parentsRef
1745− (subscriptionsToKill, newParents) <- updateFunc subscriber heightBagRef oldParents x
1746− liftIO $ writeIORef parentsRef $! newParents
1747− return subscriptionsToKill
1748− (dm, heights, initialParentState) <- getInitialSubscribers initialParents subscriber
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1749 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1750 myHeight = if invalidHeight `elem` heights
2138 myHeight = if invalidHeight `elem` heights
1751 then invalidHeight
2139 then invalidHeight
@@ -1754,114 +2142,236 @@ mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub
1754 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1755 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1756 else (Nothing, dm)
2144 else (Nothing, dm)
1757− unless (DMap.null accum) $ do
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1758− scheduleSelf myHeight
1759− occRef <- liftIO $ newIORef occ
1760− when (isJust occ) $ scheduleClear occRef
1761 liftIO $ writeIORef accumRef $! accum
2146 liftIO $ writeIORef accumRef $! accum
1762 liftIO $ writeIORef heightRef $! myHeight
2147 liftIO $ writeIORef heightRef $! myHeight
1763 liftIO $ writeIORef heightBagRef $! myHeightBag
2148 liftIO $ writeIORef heightBagRef $! myHeightBag
1764− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1765 liftIO $ writeIORef parentsRef $! initialParentState
2149 liftIO $ writeIORef parentsRef $! initialParentState
1766 defer $ SomeMergeInit $ do
2150 defer $ SomeMergeInit $ do
1767− let s = Subscriber
2151+ let changeSubscriber = Subscriber
1768 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1769− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
1770− defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
2154+ defer $ updateMerge subscribed m updateFunc a
1771 , subscriberInvalidateHeight = \_ -> return ()
2155 , subscriberInvalidateHeight = \_ -> return ()
1772 , subscriberRecalculateHeight = \_ -> return ()
2156 , subscriberRecalculateHeight = \_ -> return ()
1774− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1775− forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1776 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
1777 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
1778 -- its subscription.
2162 -- its subscription.
1779− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1780 let unsubscribeAll = destroy =<< readIORef parentsRef
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
1781− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2169+mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170+mergeInt = cacheEvent . mergeIntCheap
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)
2185+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186+ , eventSubscribedHasOwnHeightRef = False
2187+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
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
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
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
2219+ , subscriberRecalculateHeight = \new -> do
2220+ modifyIORef' heightBagRef $ heightBagAdd new
2221+ recalculateMyHeight
2223+ forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
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
2232+ modifyIORef' heightBagRef $ heightBagAdd height
2233+ modifyIORef' heightRef $ \oldHeight ->
2234+ if oldHeight == 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
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
2246+ defer $ SomeMergeInit $ do
2247+ let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
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
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"
2267+ , subscriberInvalidateHeight = \_ -> return ()
2268+ , subscriberRecalculateHeight = \_ -> return ()
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
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
1785newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2281newtype 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) }
1787−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2284+fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
1788−fan e =
2285+fanG e = unsafePerformIO $ do
2286+ ref <- newIORef Nothing
1789 let f = Fan
2287 let f = Fan
1790 { fanParent = e
2288 { fanParent = e
1791− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
1793− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
1795−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2293+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1796−runHoldInits holdInitRef mergeInitRef = do
2294+runHoldInits holdInitRef dynInitRef mergeInitRef = do
1797 holdInits <- liftIO $ readIORef holdInitRef
2295 holdInits <- liftIO $ readIORef holdInitRef
2296+ dynInits <- liftIO $ readIORef dynInitRef
1798 mergeInits <- liftIO $ readIORef mergeInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1799− unless (null holdInits && null mergeInits) $ do
2298+ unless (null holdInits && null dynInits && null mergeInits) $ do
1800 liftIO $ writeIORef holdInitRef []
2299 liftIO $ writeIORef holdInitRef []
2300+ liftIO $ writeIORef dynInitRef []
1801 liftIO $ writeIORef mergeInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1802 mapM_ initHold holdInits
2302 mapM_ initHold holdInits
2303+ mapM_ initDyn dynInits
1803 mapM_ unSomeMergeInit mergeInits
2304 mapM_ unSomeMergeInit mergeInits
1804− runHoldInits holdInitRef mergeInitRef
2305+ runHoldInits holdInitRef dynInitRef mergeInitRef
1806initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
2307initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1807initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310+initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311+initDyn (SomeDynInit d) = void $ getDynHold d
1809newEventEnv :: IO (EventEnv x)
2313newEventEnv :: IO (EventEnv x)
1810newEventEnv = do
2314newEventEnv = do
1811 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1812 holdInitRef <- newIORef []
2316 holdInitRef <- newIORef []
2317+ dynInitRef <- newIORef []
1813 mergeUpdateRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1814 mergeInitRef <- newIORef []
2319 mergeInitRef <- newIORef []
1815 heightRef <- newIORef zeroHeight
2320 heightRef <- newIORef zeroHeight
1816 toClearRef <- newIORef []
2321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
1817 toClearRootRef <- newIORef []
2323 toClearRootRef <- newIORef []
1818 coincidenceInfosRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1819 delayedRef <- newIORef IntMap.empty
2325 delayedRef <- newIORef IntMap.empty
1820− return $ EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2326+ return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1822clearEventEnv :: EventEnv x -> IO ()
2328clearEventEnv :: EventEnv x -> IO ()
1823−clearEventEnv (EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2329+clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1824 writeIORef toAssignRef []
2330 writeIORef toAssignRef []
1825 writeIORef holdInitRef []
2331 writeIORef holdInitRef []
2332+ writeIORef dynInitRef []
1826 writeIORef mergeUpdateRef []
2333 writeIORef mergeUpdateRef []
1827 writeIORef mergeInitRef []
2334 writeIORef mergeInitRef []
1828 writeIORef heightRef zeroHeight
2335 writeIORef heightRef zeroHeight
1829 writeIORef toClearRef []
2336 writeIORef toClearRef []
2337+ writeIORef toClearIntRef []
1830 writeIORef toClearRootRef []
2338 writeIORef toClearRootRef []
1831 writeIORef coincidenceInfosRef []
2339 writeIORef coincidenceInfosRef []
1832 writeIORef delayedRef IntMap.empty
2340 writeIORef delayedRef IntMap.empty
1834-- | Run an event action outside of a frame
2342-- | Run an event action outside of a frame
1835runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1836−runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2344+runFrame a = SpiderHost $ do
1837− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1838 let go = do
2346 let go = do
1839 result <- a
2347 result <- a
1840− runHoldInits (eventEnvHoldInits 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
2348+ 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
1841 return result
2349 return result
1842 result <- runEventM go
2350 result <- runEventM go
1843 toClear <- readIORef $ eventEnvClears env
2351 toClear <- readIORef $ eventEnvClears env
1844− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
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
1845 toClearRoot <- readIORef $ eventEnvRootClears env
2355 toClearRoot <- readIORef $ eventEnvRootClears env
1846− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2356+ forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1847 toAssign <- readIORef $ eventEnvAssignments env
2357 toAssign <- readIORef $ eventEnvAssignments env
1848 toReconnectRef <- newIORef []
2358 toReconnectRef <- newIORef []
1849 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1850 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1851 writeIORef vRef v
2361 writeIORef vRef v
1852− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
1853 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1854 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1855 writeIORef (eventEnvMergeUpdates env) []
2365 writeIORef (eventEnvMergeUpdates env) []
1856− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
1857 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1858− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1859 toReconnect <- readIORef toReconnectRef
2369 toReconnect <- readIORef toReconnectRef
1860 clearEventEnv env
2370 clearEventEnv env
1861 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1862 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1863 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1864− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1865 finalize wi
2375 finalize wi
1866 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1867 wi' <- mkWeakPtrWithDebug i "wi'"
2377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -1869,13 +2379,13 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1869 writeIORef (switchSubscribedBehaviorParents subscribed) []
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1870 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
2380 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1871 e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
2381 e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1872− runEventM $ runHoldInits (eventEnvHoldInits 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
2382+ 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
1873 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
1874 sub <- newSubscriberSwitch subscribed
2384 sub <- newSubscriberSwitch subscribed
1875− 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
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
1877 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1878− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1879 EventRoot _ -> "EventRoot"
2389 EventRoot _ -> "EventRoot"
1880 EventNever -> "EventNever"
2390 EventNever -> "EventNever"
1881 _ -> "something else"
2391 _ -> "something else"
@@ -1890,7 +2400,7 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1890 myHeight <- readIORef $ switchSubscribedHeight subscribed
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1891 when (parentHeight /= myHeight) $ do
2401 when (parentHeight /= myHeight) $ do
1892 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1893− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1894 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
2404 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
1895 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
1896 unsubscribe subscription
2406 unsubscribe subscription
@@ -1931,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
1931 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1932 when (oldHeight /= invalidHeight) $ do
2442 when (oldHeight /= invalidHeight) $ do
1933 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1934− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1936updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1937updateSwitchHeight new subscribed = do
2447updateSwitchHeight new subscribed = do
@@ -1939,7 +2449,7 @@ updateSwitchHeight new subscribed = do
1939 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1940 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1941 writeIORef (switchSubscribedHeight subscribed) $! new
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1942− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1944recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1945recalculateCoincidenceHeight subscribed = do
2455recalculateCoincidenceHeight subscribed = do
@@ -1948,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
1948 height <- calculateCoincidenceHeight subscribed
2458 height <- calculateCoincidenceHeight subscribed
1949 when (height /= invalidHeight) $ do
2459 when (height /= invalidHeight) $ do
1950 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1951− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1953calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1954calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -1987,13 +2497,218 @@ invalidate toReconnectRef wis = do
1987-- Reflex integration
2497-- Reflex integration
1988--------------------------------------------------------------------------------
2498--------------------------------------------------------------------------------
1990−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2500+-- | Designates the default, global Spider timeline
1991−-- When we're specializing, we include this from Reflex.Class instead, because
2501+data SpiderTimeline x
1992−-- it needs access to these types; when we're not, we want them here, so our
2502+type role SpiderTimeline nominal
1993−-- instance isn't an orphan instance.
2503+
1994−#include "SpiderTimeline.include.hs"
2504+-- | The default, global Spider environment
1995−#include "SpiderTimelineHost.include.hs"
2505+type Spider = SpiderTimeline Global
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508+ {-# INLINABLE sample #-}
2509+ sample (SpiderBehavior b) = readBehaviorUntracked b
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
2526+instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527+ {-# INLINABLE sample #-}
2528+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2530+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531+ {-# INLINABLE sample #-}
2532+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
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
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551+ {-# INLINE return #-}
2553+ {-# INLINE (>>=) #-}
2554+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555+ {-# INLINE (>>) #-}
2557+#if !MIN_VERSION_base(4,13,0)
2558+ {-# INLINE fail #-}
2559+ fail _ = error "Dynamic does not support 'fail'"
2562+{-# INLINABLE newJoinDyn #-}
2563+newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
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'
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
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 #-}
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)
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
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
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
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
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
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
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
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
2634+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635+ {-# INLINABLE sample #-}
2636+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
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
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
2656+--------------------------------------------------------------------------------
2658+--------------------------------------------------------------------------------
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
2672+ , subscriberInvalidateHeight = \_ -> return ()
2673+ , subscriberRecalculateHeight = \_ -> return ()
2675+ return $ SpiderEventHandle
2676+ { spiderEventHandleSubscription = subscription
2677+ , spiderEventHandleValue = val
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
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
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
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
2704+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705+ {-# INLINABLE subscribeEvent #-}
2706+ subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
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
1998unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2713unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
1999unsafeNewSpiderTimelineEnv = do
2714unsafeNewSpiderTimelineEnv = do
@@ -2002,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
2002#ifdef DEBUG
2717#ifdef DEBUG
2003 depthRef <- newIORef 0
2718 depthRef <- newIORef 0
2005− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
2006 { _spiderTimeline_lock = lock
2721 { _spiderTimeline_lock = lock
2007 , _spiderTimeline_eventEnv = env
2722 , _spiderTimeline_eventEnv = env
2008#ifdef DEBUG
2723#ifdef DEBUG
@@ -2010,41 +2725,40 @@ unsafeNewSpiderTimelineEnv = do
2013−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2014-- | Create a new SpiderTimelineEnv
2728-- | Create a new SpiderTimelineEnv
2015newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2016−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
2018−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
2020instance Reifies s (SpiderTimelineEnv x) =>
2734instance Reifies s (SpiderTimelineEnv x) =>
2021 HasSpiderTimeline (LocalSpiderTimeline x s) where
2735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2022− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2024localSpiderTimeline
2738localSpiderTimeline
2025− :: Proxy s
2739+ :: proxy s
2026 -> SpiderTimelineEnv x
2740 -> SpiderTimelineEnv x
2027 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2028−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
2030-- | Pass a new timeline to the given function.
2744-- | Pass a new timeline to the given function.
2031withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2032withSpiderTimeline k = do
2746withSpiderTimeline k = do
2033 env <- unsafeNewSpiderTimelineEnv
2747 env <- unsafeNewSpiderTimelineEnv
2034 reify env $ \s -> k $ localSpiderTimeline s env
2748 reify env $ \s -> k $ localSpiderTimeline s env
2037−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2750+newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2752+type ComputeM = EventM
2039−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2754+newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2041−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2042instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2043 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2044 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2045 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2046− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2760+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2047− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
2761+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2048 type PullM (SpiderTimeline x) = SpiderPullM x
2762 type PullM (SpiderTimeline x) = SpiderPullM x
2049 type PushM (SpiderTimeline x) = SpiderPushM x
2763 type PushM (SpiderTimeline x) = SpiderPushM x
2050 {-# INLINABLE never #-}
2764 {-# INLINABLE never #-}
@@ -2057,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2057 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2058 {-# INLINABLE pull #-}
2772 {-# INLINABLE pull #-}
2059 pull = SpiderBehavior . pull . coerce
2773 pull = SpiderBehavior . pull . coerce
2060− {-# INLINABLE merge #-}
2774+ {-# INLINABLE fanG #-}
2061− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2062− {-# INLINABLE fan #-}
2063− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2775+ fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776+ {-# INLINABLE mergeG #-}
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779+ => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2781+ -> R.Event (SpiderTimeline x) (DMap k v)
2782+ mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2064 {-# INLINABLE switch #-}
2783 {-# INLINABLE switch #-}
2065 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2066 {-# INLINABLE coincidence #-}
2785 {-# INLINABLE coincidence #-}
@@ -2068,27 +2787,31 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2068 {-# INLINABLE current #-}
2787 {-# INLINABLE current #-}
2069 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2070 {-# INLINABLE updated #-}
2789 {-# INLINABLE updated #-}
2071− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2072 {-# INLINABLE unsafeBuildDynamic #-}
2791 {-# INLINABLE unsafeBuildDynamic #-}
2073− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2792+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2074 {-# INLINABLE unsafeBuildIncremental #-}
2793 {-# INLINABLE unsafeBuildIncremental #-}
2075− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2794+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2076− {-# INLINABLE mergeIncremental #-}
2795+ {-# INLINABLE mergeIncrementalG #-}
2077− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2796+ mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2078− {-# INLINABLE mergeIncrementalWithMove #-}
2797+ {-# INLINABLE mergeIncrementalWithMoveG #-}
2079− mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
2798+ mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2080 {-# INLINABLE currentIncremental #-}
2799 {-# INLINABLE currentIncremental #-}
2081 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2082 {-# INLINABLE updatedIncremental #-}
2801 {-# INLINABLE updatedIncremental #-}
2083 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2802 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2084 {-# INLINABLE incrementalToDynamic #-}
2803 {-# INLINABLE incrementalToDynamic #-}
2085− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2804+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2086 c <- readBehaviorUntracked $ dynamicCurrent i
2805 c <- readBehaviorUntracked $ dynamicCurrent i
2087 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2088 eventCoercion Coercion = Coercion
2807 eventCoercion Coercion = Coercion
2089 behaviorCoercion Coercion = Coercion
2808 behaviorCoercion Coercion = Coercion
2090− dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2809+ dynamicCoercion Coercion = Coercion
2091−#endif
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))
2093data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2816data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
@@ -2111,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
2111 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2113-- | The monad for actions that manipulate a Spider timeline identified by @x@
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2114−newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2837+newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2116instance Monad (SpiderHost x) where
2839instance Monad (SpiderHost x) where
2117 {-# INLINABLE (>>=) #-}
2840 {-# INLINABLE (>>=) #-}
@@ -2120,22 +2843,27 @@ instance Monad (SpiderHost x) where
2120 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2121 {-# INLINABLE return #-}
2844 {-# INLINABLE return #-}
2122 return x = SpiderHost $ return x
2845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
2123 {-# INLINABLE fail #-}
2847 {-# INLINABLE fail #-}
2848+ fail = MonadFail.fail
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2124− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
2126-- | Run an action affecting the global Spider timeline; this will be guarded by
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2127-- a mutex for that timeline
2856-- a mutex for that timeline
2128runSpiderHost :: SpiderHost Global a -> IO a
2857runSpiderHost :: SpiderHost Global a -> IO a
2129−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
2858+runSpiderHost (SpiderHost a) = a
2131−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2132-- | Run an action affecting a given Spider timeline; this will be guarded by a
2860-- | Run an action affecting a given Spider timeline; this will be guarded by a
2133-- mutex for that timeline
2861-- mutex for that timeline
2134runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2135−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2138−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2866+ deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2140instance Monad (SpiderHostFrame x) where
2868instance Monad (SpiderHostFrame x) where
2141 {-# INLINABLE (>>=) #-}
2869 {-# INLINABLE (>>=) #-}
@@ -2144,15 +2872,21 @@ instance Monad (SpiderHostFrame x) where
2144 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2145 {-# INLINABLE return #-}
2873 {-# INLINABLE return #-}
2146 return x = SpiderHostFrame $ return x
2874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
2147 {-# INLINABLE fail #-}
2876 {-# INLINABLE fail #-}
2148 fail s = SpiderHostFrame $ fail s
2877 fail s = SpiderHostFrame $ fail s
2880+instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881+ notReadyUntil _ = pure ()
2150−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2151newEventWithTriggerIO f = do
2885newEventWithTriggerIO f = do
2152 es <- newFanEventWithTriggerIO $ \Refl -> f
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2153 return $ select es Refl
2887 return $ select es Refl
2155−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2156newFanEventWithTriggerIO f = do
2890newFanEventWithTriggerIO f = do
2157 occRef <- newIORef DMap.empty
2891 occRef <- newIORef DMap.empty
2158 subscribedRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
@@ -2186,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2186instance PrimMonad (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2187 type PrimState (SpiderHostFrame x) = PrimState IO
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2188 primitive = SpiderHostFrame . EventM . primitive
2922 primitive = SpiderHostFrame . EventM . primitive
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()