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