@@ -9,125 +9,78 @@
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
25−{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
27−{-# OPTIONS_GHC -Wunused-binds #-}
28-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
21-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
29-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
22-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30−module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
23+module Reflex.Spider.Internal
32−#if MIN_VERSION_base(4,10,0)
25+ , SpiderEnv (..)
33−import Control.Applicative (liftA2)
33+import Control.Applicative
35import Control.Concurrent
34import Control.Concurrent
36import Control.Exception
35import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
36+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
38import Control.Monad.Exception
37import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
38+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
40import Control.Monad.Primitive
39import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
40+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
41import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
42import Data.Align
48import Data.Coerce
43import Data.Coerce
49−import Data.Dependent.Map (DMap)
44+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
45import 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_)
46import Data.Foldable hiding (concat, elem, sequence_)
48+import Data.Functor.Compose
55import Data.Functor.Constant
49import Data.Functor.Constant
56−import Data.Functor.Misc
57import Data.Functor.Product
50import Data.Functor.Product
58import Data.GADT.Compare
51import Data.GADT.Compare
59import Data.IntMap.Strict (IntMap)
52import Data.IntMap.Strict (IntMap)
60import qualified Data.IntMap.Strict as IntMap
53import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
54import Data.IORef
62−import Data.Kind (Type)
55+import Data.List hiding (foldl')
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
56+import Data.Maybe
57+import Data.Monoid ((<>))
65−import Data.Proxy
58+import Data.Some (Some)
59+import qualified Data.Some as Some
66import Data.These
60import Data.These
67import Data.Traversable
61import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
62+import Data.Word
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
71import GHC.IORef (IORef (..))
63import GHC.IORef (IORef (..))
72import GHC.Stack
64import GHC.Stack
73−import Reflex.FastWeak
74import System.IO.Unsafe
65import System.IO.Unsafe
75import System.Mem.Weak
66import System.Mem.Weak
76import Unsafe.Coerce
67import 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
69#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
70import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
71import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
72import qualified Data.List.NonEmpty as NonEmpty
73+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
74import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
75+#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 ((#.), (.#))
103−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
77+import Data.WeakBag (WeakBag, WeakBagTicket)
104import qualified Data.WeakBag as WeakBag
78import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
106import qualified Reflex.Class as R
79import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
80+import qualified Reflex.Host.Class as R
108−import Reflex.NotReady.Class
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
113−#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
115−import System.IO (stderr)
116−import Data.List (isPrefixOf)
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
123−#ifdef DEBUG_TRACE_EVENTS
82+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
124−withStackOneLine :: (BS8.ByteString -> a) -> a
83+import Prelude hiding (any, concat, mapM, mapM_, sequence)
125−withStackOneLine expr = unsafePerformIO $ do
126− stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
132debugPropagate :: Bool
85debugPropagate :: Bool
@@ -136,42 +89,31 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
89debugInvalidate :: Bool
138#ifdef DEBUG
91#ifdef DEBUG
139#define DEBUG_NODEIDS
93#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
95debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
97debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
99debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
101class HasNodeId a where
160 getNodeId :: a -> Int
102 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
104+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
105 getNodeId = holdNodeId
107+instance HasNodeId (PushSubscribed x a b) where
108+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
110instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
111 getNodeId = switchSubscribedNodeId
113+instance HasNodeId (MergeSubscribed x a) where
114+ getNodeId = mergeSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
116+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
117 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
119instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +127,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
128{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
129showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
130+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
132+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
133+showSubscriberType = \case
192−
134+ SubscriberPush _ _ -> "SubscriberPush"
135+ SubscriberMerge _ _ -> "SubscriberMerge"
136+ SubscriberFan _ -> "SubscriberFan"
137+ SubscriberMergeChange _ -> "SubscriberMergeChange"
138+ SubscriberHold _ -> "SubscriberHold"
139+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
140+ SubscriberSwitch _ -> "SubscriberSwitch"
141+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
142+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
143+ SubscriberHandle -> "SubscriberHandle"
145+showEventType :: Event x a -> String
146+showEventType = \case
147+ EventRoot _ _ -> "EventRoot"
148+ EventNever -> "EventNever"
149+ EventPush _ -> "EventPush"
150+ EventMerge _ -> "EventMerge"
151+ EventFan _ _ -> "EventFan"
152+ EventSwitch _ -> "EventSwitch"
153+ EventCoincidence _ -> "EventCoincidence"
154+ EventHold _ -> "EventHold"
155+ EventDyn _ -> "EventDyn"
156+ EventHoldIdentity _ -> "EventHoldIdentity"
157+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
161debugPropagate = False
197debugInvalidateHeight = False
163debugInvalidateHeight = False
198debugInvalidate = False
165debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
167-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +169,6 @@ debugInvalidate = False
202showNodeId :: a -> String
169showNodeId :: a -> String
203showNodeId _ = ""
170showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
174#ifdef DEBUG_NODEIDS
@@ -215,237 +178,66 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
179newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
180newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
220−--------------------------------------------------------------------------------
222−--------------------------------------------------------------------------------
224−--NB: Once you subscribe to an Event, you must always hold on the the WHOLE EventSubscription you get back
225−-- If you do not retain the subscription, you may be prematurely unsubscribed from the parent event.
226−data EventSubscription x = EventSubscription
227− { _eventSubscription_unsubscribe :: !(IO ())
228− , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
231−unsubscribe :: EventSubscription x -> IO ()
182+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
183+unsafeNodeId :: a -> Int
184+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
189--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
191--------------------------------------------------------------------------------
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
193+newtype Event x a = Event { subscribe :: Subscriber x a -> EventM x (EventSubscription x a) }
240−{-# INLINE subscribeAndRead #-}
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
242−subscribeAndRead = unEvent
245−"cacheEvent/cacheEvent" forall e. cacheEvent (cacheEvent e) = cacheEvent e
246−"cacheEvent/pushCheap" forall f e. pushCheap f (cacheEvent e) = cacheEvent (pushCheap f e)
247−"hold/cacheEvent" forall f e. hold f (cacheEvent e) = hold f e
250−-- | 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
252−-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
257− { subscriberPropagate = \a -> do
259− mapM_ (subscriberPropagate sub) mb
261− occ' <- join <$> mapM f occ
262− return (subscription, occ')
264−-- | A subscriber that never triggers other 'Event's
265−{-# INLINE terminalSubscriber #-}
266−terminalSubscriber :: (a -> EventM x ()) -> Subscriber x a
267−terminalSubscriber p = Subscriber
268− { subscriberPropagate = p
269− , subscriberInvalidateHeight = \_ -> return ()
270− , subscriberRecalculateHeight = \_ -> return ()
273−-- | Subscribe to an Event only for the duration of one occurrence
274−{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
195+subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x a, Maybe a)
276−subscribeAndReadHead e sub = do
277− subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
196+subscribeAndRead e sub = do
279− { subscriberPropagate = \a -> do
197+ subscription@(EventSubscription _ subd) <- subscribe e sub
280− liftIO $ unsubscribe =<< readIORef subscriptionRef
198+ occ <- liftIO $ eventSubscribedRead subd
281− subscriberPropagate sub a
283− liftIO $ case occ of
284− Nothing -> writeIORef subscriptionRef $! subscription
285− Just _ -> unsubscribe subscription
286 return (subscription, occ)
199 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
301−data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303− , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304− , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
325−-- | Construct an 'Event' whose value is guaranteed not to be recomputed
328−--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
331−{-# NOINLINE [0] cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
334−#ifdef DEBUG_TRACE_EVENTS
335− withStackOneLine $ \callSite -> Event $
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
343−#ifdef DEBUG_TRACE_EVENTS
344− unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
346− subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347− Just subscribedTicket -> return subscribedTicket
350− nodeId <- liftIO newNodeId
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
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
366− when (isJust occ) $ do
367− liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368− scheduleClear occRef
369− let !subscribed = CacheSubscribed
370− { _cacheSubscribed_subscribers = subscribers
371− , _cacheSubscribed_parent = parentSub
372− , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377− subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378− liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379− return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
413−subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414−subscribe e s = fst <$> subscribeAndRead e s
417−wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
201+wrap :: Monad m => (t -> EventSubscribed x a) -> (Subscriber x a -> m (WeakBagTicket (Subscriber x a), t)) -> Subscriber x a -> m (EventSubscription x a)
418wrap tag getSpecificSubscribed sub = do
202wrap tag getSpecificSubscribed sub = do
419− (sln, subd, occ) <- getSpecificSubscribed sub
203+ (sln, subd) <- getSpecificSubscribed sub
421− return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
204+ return $ EventSubscription (Just sln) $ tag subd
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
206+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
207eventRoot !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
209eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
210+eventNever = Event $ \_ -> return $ EventSubscription Nothing eventSubscribedNever
212+eventPush :: Push x b a -> Event x a
213+eventPush !p = Event $ wrap eventSubscribedPush $ getPushSubscribed p
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
215+eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
433−eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
216+eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
218+eventFan :: GCompare k => k a -> Fan x k -> Event x a
219+eventFan !k !f = Event $ wrap (eventSubscribedFan k) $ getFanSubscribed k f
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
221+eventSwitch :: Switch x a -> Event x a
436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
222eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
224+eventCoincidence :: Coincidence x a -> Event x a
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
225eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
441−eventHold :: Hold x p -> Event x p
227+eventHold :: (a ~ p b, R.Patch p) => Hold x p b -> Event x a
442eventHold !h = Event $ subscribeHoldEvent h
228eventHold !h = Event $ subscribeHoldEvent h
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
230+eventDyn :: (a ~ p b, R.Patch p) => Dyn x p b -> Event x a
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
231eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
233+eventHoldIdentity :: (a ~ Identity b) => Hold x Identity b -> Event x a
234+eventHoldIdentity !h = Event $ subscribeHoldEvent h
236+eventDynIdentity :: (a ~ Identity b) => Dyn x Identity b -> Event x a
237+eventDynIdentity !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
447{-# INLINE subscribeCoincidenceInner #-}
239{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
240+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x a)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
241subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
242 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
243 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +256,169 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
256 , subscriberRecalculateHeight :: !(Height -> IO ())
259+--TODO: Move this comment to WeakBag
260+-- These function are constructor functions that are marked NOINLINE so they are
261+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
262+-- so any weak references that are attached to the constructors will have their
263+-- finalizer run. Using the opaque constructor, does not see the
264+-- constructor application, so it behaves like an IORef and cannot be fused away.
266+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
267+-- the weak pointer to it in some cases.
269+newSubscriberPush :: (a -> ComputeM x (Maybe b)) -> PushSubscribed x a b -> IO (Subscriber x a)
270+newSubscriberPush compute subscribed = return $ Subscriber
271+ { subscriberPropagate = \a -> {-# SCC "traversePush" #-} do
272+ tracePropagate $ "SubscriberPush" <> showNodeId subscribed
273+ occ <- runComputeM $ compute a
275+ Nothing -> return () -- No need to write a Nothing back into the Ref
277+ liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
278+ scheduleClear $ pushSubscribedOccurrence subscribed
279+ propagate o $ pushSubscribedSubscribers subscribed
280+ , subscriberInvalidateHeight = \old -> do
281+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
282+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
283+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
284+ , subscriberRecalculateHeight = \new -> do
285+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
286+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
287+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
290+newSubscriberHold :: R.Patch p => Hold x p a -> IO (Subscriber x (p a))
468newSubscriberHold h = return $ Subscriber
291newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
292 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470 , subscriberInvalidateHeight = \_ -> return ()
293 , subscriberInvalidateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
294 , subscriberRecalculateHeight = \_ -> return ()
297+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
298+newSubscriberMerge k subscribed = return $ Subscriber
299+ { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
300+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
301+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
302+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
303+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
304+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
305+ when (DMap.null oldM) $ do -- Only schedule the firing once
306+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
307+ --TODO: assertions about height
308+ currentHeight <- getCurrentHeight
309+ when (height <= currentHeight) $ do
310+ if height /= invalidHeight
312+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
313+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
316+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
317+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
318+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
322+ error $ "Causality loop found" <> cycleInfo
323+ scheduleMerge height subscribed
324+ , subscriberInvalidateHeight = \old -> do
325+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
326+ removeMergeHeight old subscribed
327+ invalidateMergeHeight subscribed
328+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
329+ , subscriberRecalculateHeight = \new -> do
330+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
331+ addMergeHeight new subscribed
332+ revalidateMergeHeight subscribed
333+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
336+newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap (DMap k (Event x))))
337+newSubscriberMergeChange subscribed = return $ Subscriber
338+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
339+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
340+ defer $ SomeMergeUpdate a subscribed
341+ , subscriberInvalidateHeight = \_ -> return ()
342+ , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
345+newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
346+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
347 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
348 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
349+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479− liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480− scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
350+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
351 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
352 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
353 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
354 return ()
486 , subscriberInvalidateHeight = \old -> do
355 , subscriberInvalidateHeight = \old -> do
356+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
357 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
358+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
359+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
360 , subscriberRecalculateHeight = \new -> do
361+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
362 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
363+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
364+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
367+newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
368+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
369 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
370+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
371 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
372 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
373 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
374 , subscriberInvalidateHeight = \_ -> do
375+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
376 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
377 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
378 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
379+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
380+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
381+ , subscriberRecalculateHeight = \new -> do
382+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
383+ updateSwitchHeight new subscribed
384+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
387+newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
388+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
389 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
390+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
391 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
392+ tracePropagate $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
393 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
394+ tracePropagate $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
395+ tracePropagate $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
396 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
397 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
398 case occ of
520− Nothing ->
399+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
400 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
401 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
402+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
403+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
404 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
405 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
406 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
407 propagate o $ coincidenceSubscribedSubscribers subscribed
408+ , subscriberInvalidateHeight = \_ -> do
409+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
410+ invalidateCoincidenceHeight subscribed
411+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
412+ , subscriberRecalculateHeight = \_ -> do
413+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
414+ recalculateCoincidenceHeight subscribed
415+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
418+newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
419+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
420 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
421+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
422 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
423 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
424 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +426,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
426 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
427 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
428 propagate a $ coincidenceSubscribedSubscribers subscribed
429+ , subscriberInvalidateHeight = \_ -> do
430+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
431+ invalidateCoincidenceHeight subscribed
432+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
433+ , subscriberRecalculateHeight = \_ -> do
434+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
435+ recalculateCoincidenceHeight subscribed
436+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
439invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,45 +443,38 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
443recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
445-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
446+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
447+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
557− --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
560−-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
563 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
448 -- 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
449 --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
450+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
452--------------------------------------------------------------------------------
568-- EventSubscribed
453-- EventSubscribed
569--------------------------------------------------------------------------------
454--------------------------------------------------------------------------------
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
579−data EventSubscribed x = EventSubscribed
456+data EventSubscribed x a = EventSubscribed
457+ { eventSubscribedSubscribe :: !(Subscriber x a -> IO (Maybe (WeakBagTicket (Subscriber x a))))
458+ , eventSubscribedRead :: !(IO (Maybe a))
580− { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
459+ , eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581− , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
460#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
461+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
462 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
463 , eventSubscribedWhoCreated :: !(IO [String])
467+readEventSubscribed :: EventSubscribed x a -> IO (Maybe a)
468+readEventSubscribed = eventSubscribedRead
470+subscribeEventSubscribed :: EventSubscribed x a -> Subscriber x a -> IO (Maybe (WeakBagTicket (Subscriber x a)))
471+subscribeEventSubscribed = eventSubscribedSubscribe
589−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
473+eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x a
590eventSubscribedRoot !r = EventSubscribed
474eventSubscribedRoot !r = EventSubscribed
475+ { eventSubscribedSubscribe = \sub -> Just <$> subscribeRootSubscribed r sub
476+ , eventSubscribedRead = readRootSubscribed r
591− { eventSubscribedHeightRef = zeroRef
477+ , eventSubscribedHeightRef = zeroRef
592− , eventSubscribedRetained = toAny r
593#ifdef DEBUG_CYCLES
478#ifdef DEBUG_CYCLES
594 , eventSubscribedGetParents = return []
479 , eventSubscribedGetParents = return []
595 , eventSubscribedHasOwnHeightRef = False
480 , eventSubscribedHasOwnHeightRef = False
@@ -597,255 +482,157 @@ eventSubscribedRoot !r = EventSubscribed
600−eventSubscribedNever :: EventSubscribed x
485+eventSubscribedNever :: EventSubscribed x a
601eventSubscribedNever = EventSubscribed
486eventSubscribedNever = EventSubscribed
487+ { eventSubscribedSubscribe = \_ -> return Nothing
488+ , eventSubscribedRead = return Nothing
602− { eventSubscribedHeightRef = zeroRef
489+ , eventSubscribedHeightRef = zeroRef
603− , eventSubscribedRetained = toAny ()
604#ifdef DEBUG_CYCLES
490#ifdef DEBUG_CYCLES
605 , eventSubscribedGetParents = return []
491 , eventSubscribedGetParents = return []
606 , eventSubscribedHasOwnHeightRef = False
492 , eventSubscribedHasOwnHeightRef = False
607 , eventSubscribedWhoCreated = return ["never"]
493 , eventSubscribedWhoCreated = return ["never"]
610−eventSubscribedNow :: EventSubscribed x
496+
611−eventSubscribedNow = EventSubscribed
497+eventSubscribedPush :: PushSubscribed x b a -> EventSubscribed x a
498+eventSubscribedPush !subscribed = EventSubscribed
499+ { eventSubscribedSubscribe = \sub -> Just <$> subscribePushSubscribed subscribed sub
500+ , eventSubscribedRead = readPushSubscribed subscribed
612− { eventSubscribedHeightRef = zeroRef
501+ , eventSubscribedHeightRef = pushSubscribedHeight subscribed
613− , eventSubscribedRetained = toAny ()
614#ifdef DEBUG_CYCLES
502#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
503+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
616 , eventSubscribedHasOwnHeightRef = False
504 , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
505+ , eventSubscribedWhoCreated = whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
509+eventSubscribedMerge :: a ~ DMap k Identity => MergeSubscribed x k -> EventSubscribed x a
510+eventSubscribedMerge !subscribed = EventSubscribed
511+ { eventSubscribedSubscribe = \sub -> Just <$> subscribeMergeSubscribed subscribed sub
512+ , eventSubscribedRead = readMergeSubscribed subscribed
513+ , eventSubscribedHeightRef = mergeSubscribedHeight subscribed
515+ , eventSubscribedGetParents = do
516+ ps <- readIORef $ mergeSubscribedParents subscribed
517+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
518+ , eventSubscribedHasOwnHeightRef = True
519+ , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
523+eventSubscribedFan :: GCompare k => k a -> FanSubscribed x k -> EventSubscribed x a
622−eventSubscribedFan !subscribed = EventSubscribed
524+eventSubscribedFan !k !subscribed = EventSubscribed
525+ { eventSubscribedSubscribe = \sub -> Just <$> subscribeFanSubscribed k subscribed sub
526+ , eventSubscribedRead = readFanSubscribed k subscribed
623− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
527+ , eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624− , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
528#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
529+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
530 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
531 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
632−eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
535+eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x a
633eventSubscribedSwitch !subscribed = EventSubscribed
536eventSubscribedSwitch !subscribed = EventSubscribed
537+ { eventSubscribedSubscribe = \sub -> Just <$> subscribeSwitchSubscribed subscribed sub
538+ , eventSubscribedRead = readSwitchSubscribed subscribed
634− { eventSubscribedHeightRef = switchSubscribedHeight subscribed
539+ , eventSubscribedHeightRef = switchSubscribedHeight subscribed
635− , eventSubscribedRetained = toAny subscribed
636#ifdef DEBUG_CYCLES
540#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
541 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
542 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
543+ return [Some.This $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
544 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
545 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
645−eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
549+eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x a
646eventSubscribedCoincidence !subscribed = EventSubscribed
550eventSubscribedCoincidence !subscribed = EventSubscribed
551+ { eventSubscribedSubscribe = \sub -> Just <$> subscribeCoincidenceSubscribed subscribed sub
552+ , eventSubscribedRead = readCoincidenceSubscribed subscribed
647− { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
553+ , eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
648− , eventSubscribedRetained = toAny subscribed
649#ifdef DEBUG_CYCLES
554#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
555 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
556 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
557+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
558+ innerParents = maybeToList $ fmap Some.This innerSubscription
654 return $ outerParent : innerParents
559 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
560 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
561 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
660−getEventSubscribedHeight :: EventSubscribed x -> IO Height
565+getEventSubscribedHeight :: EventSubscribed x a -> IO Height
661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
566getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
663#ifdef DEBUG_CYCLES
568#ifdef DEBUG_CYCLES
664−whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
569+whoCreatedEventSubscribed :: EventSubscribed x a -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
570whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
572+walkInvalidHeightParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
573walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
574+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
575 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
576 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
577 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
578+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
579 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
580+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
581 return subscribers
679{-# INLINE subscribeHoldEvent #-}
584{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
585+subscribeHoldEvent :: (CanSubscribe x m, R.Patch p) => Hold x p a -> Subscriber x (p a) -> m (EventSubscription x (p a))
681−subscribeHoldEvent = subscribeAndRead . holdEvent
586+subscribeHoldEvent h sub = do
682−
587+ EventSubscription _ subd <- getHoldEventSubscription h
683−--------------------------------------------------------------------------------
588+ sln <- liftIO $ subscribeEventSubscribed subd sub
684−-- Behavior
589+ return $ EventSubscription sln subd
685−--------------------------------------------------------------------------------
687−newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
690−behaviorHold !h = Behavior $ readHoldTracked h
692−behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
693−behaviorHoldIdentity = behaviorHold
695−behaviorConst :: a -> Behavior x a
696−behaviorConst !a = Behavior $ return a
698−behaviorPull :: Pull x a -> Behavior x a
699−behaviorPull !p = Behavior $ do
700− val <- liftIO $ readIORef $ pullValue p
702− Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
704− askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705− liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706− return $ pullSubscribedValue subscribed
708− i <- liftIO $ newInvalidatorPull p
709− wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710− parentsRef <- liftIO $ newIORef []
711− holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713− invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714− parents <- liftIO $ readIORef parentsRef
715− let subscribed = PullSubscribed
716− { pullSubscribedValue = a
717− , pullSubscribedInvalidators = invsRef
718− , pullSubscribedOwnInvalidator = i
719− , pullSubscribedParents = parents
721− liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
726−behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
728−{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730−readHoldTracked h = do
731− result <- liftIO $ readIORef $ holdValue h
732− askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734− liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
737−{-# INLINABLE readBehaviorUntracked #-}
738−readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739−readBehaviorUntracked b = do
740− holdInits <- getDeferralQueue
741− liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
743--------------------------------------------------------------------------------
591--------------------------------------------------------------------------------
744−-- Dynamic
592+-- EventSubscription
745--------------------------------------------------------------------------------
593--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
595+data EventSubscription x a = EventSubscription
748−
596+ { _eventSubscription_ticket :: !(Maybe (WeakBagTicket (Subscriber x a)))
749−data Dynamic x target p = Dynamic
597+ , _eventSubscription_subscribed :: !(EventSubscribed x a)
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)
600+unsubscribe :: EventSubscription x a -> IO ()
755−
601+unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
759−dynamicHold :: Hold x p -> DynamicS x p
760−dynamicHold !h = Dynamic
761− { dynamicCurrent = behaviorHold h
762− , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
766−dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
769−dynamicConst !a = Dynamic
770− { dynamicCurrent = behaviorConst a
771− , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
775−dynamicDyn !d = Dynamic
776− { dynamicCurrent = behaviorDyn d
777− , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
781−dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
603--------------------------------------------------------------------------------
784-- Combinators
604-- Combinators
785--------------------------------------------------------------------------------
605--------------------------------------------------------------------------------
607+--TODO: Figure out why certain things are not 'representational', then make them
608+--representational so we can use coerce
787--type role Hold representational
610--type role Hold representational
788−data Hold x p
611+data Hold x p a
789− = Hold { holdValue :: !(IORef (PatchTarget p))
612+ = Hold { holdValue :: !(IORef a)
790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
613 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791− , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
792− , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
614+ , holdParent :: !(IORef (Either (Event x (p a)) (EventSubscription x (p a)))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
793#ifdef DEBUG_NODEIDS
615#ifdef DEBUG_NODEIDS
794 , holdNodeId :: Int
616 , holdNodeId :: Int
798−-- | A statically allocated 'SpiderTimeline'
801−{-# NOINLINE globalSpiderTimelineEnv #-}
802−globalSpiderTimelineEnv :: SpiderTimelineEnv Global
803−globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
805−-- | Stores all global data relevant to a particular Spider timeline; only one
806−-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
813− { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814− , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
816− , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
819−type role SpiderTimelineEnv' phantom
821−instance Eq (SpiderTimelineEnv x) where
822− _ == _ = True -- Since only one exists of each type
824−instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
826− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
829data EventEnv x
620data EventEnv x
621+ = EventEnv { eventEnvSpiderEnv :: !(SpiderEnv x)
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
622+ , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
623 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
624 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
625 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
626+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
627+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
628 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
629 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
630+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
843{-# INLINE runEventM #-}
633{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
634+runEventM :: EventM x a -> EventEnv x -> IO a
845−runEventM = unEventM
635+runEventM = runReaderT . unEventM
847−asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
850class MonadIO m => Defer a m where
637class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
638 getDeferralQueue :: m (IORef [a])
@@ -856,98 +643,91 @@ defer a = do
856 q <- getDeferralQueue
643 q <- getDeferralQueue
857 liftIO $ modifyIORef' q (a:)
644 liftIO $ modifyIORef' q (a:)
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
646+instance Defer (SomeAssignment x) (EventM x) where
860− {-# INLINE getDeferralQueue #-}
861− getDeferralQueue = asksEventEnv eventEnvAssignments
863−instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
864 {-# INLINE getDeferralQueue #-}
647 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
648+ getDeferralQueue = EventM $ asks eventEnvAssignments
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
650+instance Defer (SomeHoldInit x) (EventM x) where
868 {-# INLINE getDeferralQueue #-}
651 {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
652+ getDeferralQueue = EventM $ asks eventEnvHoldInits
871instance Defer (SomeHoldInit x) (BehaviorM x) where
654instance Defer (SomeHoldInit x) (BehaviorM x) where
872 {-# INLINE getDeferralQueue #-}
655 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
656 getDeferralQueue = BehaviorM $ asks snd
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
658+instance Defer (SomeMergeUpdate x) (EventM x) where
876 {-# INLINE getDeferralQueue #-}
659 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
660+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
662+instance Defer (SomeMergeInit x) (EventM x) where
880 {-# INLINE getDeferralQueue #-}
663 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
664+ getDeferralQueue = EventM $ asks eventEnvMergeInits
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
666+class HasCurrentHeight x m | m -> x where
884 getCurrentHeight :: m Height
667 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
668+ scheduleMerge :: Height -> MergeSubscribed x a -> m ()
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
670+instance HasCurrentHeight x (EventM x) where
888 {-# INLINE getCurrentHeight #-}
671 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
672+ getCurrentHeight = EventM $ do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
673+ heightRef <- asks eventEnvCurrentHeight
891 liftIO $ readIORef heightRef
674 liftIO $ readIORef heightRef
892 {-# INLINE scheduleMerge #-}
675 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
676+ scheduleMerge height subscribed = EventM $ do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
677+ delayedRef <- asks eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
678+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
680+class HasSpiderEnv x m | m -> x where
681+ -- | Retrieve the current SpiderEnv
682+ askSpiderEnv :: m (SpiderEnv x)
897−class HasSpiderTimeline x where
684+instance HasSpiderEnv x (EventM x) where
898− -- | Retrieve the current SpiderTimelineEnv
685+ {-# INLINE askSpiderEnv #-}
899− spiderTimeline :: SpiderTimelineEnv x
686+ askSpiderEnv = EventM $ asks eventEnvSpiderEnv
901−instance HasSpiderTimeline Global where
688+instance HasSpiderEnv x (SpiderHost x) where
902− spiderTimeline = globalSpiderTimelineEnv
689+ {-# INLINE askSpiderEnv #-}
690+ askSpiderEnv = SpiderHost ask
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
692+putCurrentHeight :: Height -> EventM x ()
905−putCurrentHeight h = do
693+putCurrentHeight h = EventM $ do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
694+ heightRef <- asks eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
695 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
697+instance Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
698 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
699+ getDeferralQueue = EventM $ asks eventEnvClears
913{-# INLINE scheduleClear #-}
701{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
702+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
703+scheduleClear r = defer $ SomeClear r
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
705+instance Defer SomeRootClear (EventM x) where
918 {-# INLINE getDeferralQueue #-}
706 {-# 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
926− {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
707+ getDeferralQueue = EventM $ asks eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
709{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
710+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
711+scheduleRootClear r = defer $ SomeRootClear r
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
713+instance Defer (SomeResetCoincidence x) (EventM x) where
934 {-# INLINE getDeferralQueue #-}
714 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
715+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
717-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
718+{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> EventM x (Hold x p a) #-}
719+{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> ComputeM x (Hold x p a) #-}
939−hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
720+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => a -> Event x (p a) -> m (Hold x p a)
940hold v0 e = do
721hold v0 e = do
941 valRef <- liftIO $ newIORef v0
722 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
723 invsRef <- liftIO $ newIORef []
943− parentRef <- liftIO $ newIORef Nothing
724+ parentRef <- liftIO $ newIORef $ Left e
944#ifdef DEBUG_NODEIDS
725#ifdef DEBUG_NODEIDS
945 nodeId <- liftIO newNodeId
726 nodeId <- liftIO newNodeId
947 let h = Hold
728 let h = Hold
948 { holdValue = valRef
729 { holdValue = valRef
949 , holdInvalidators = invsRef
730 , holdInvalidators = invsRef
951 , holdParent = parentRef
731 , holdParent = parentRef
952#ifdef DEBUG_NODEIDS
732#ifdef DEBUG_NODEIDS
953 , holdNodeId = nodeId
733 , holdNodeId = nodeId
@@ -957,13 +737,12 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
739{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
740+getHoldEventSubscription :: forall m p a x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, R.Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderEnv x m, m ~ EventM x) => Hold x p a -> m (EventSubscription x (p a))
961getHoldEventSubscription h = do
741getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
742 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
743 case ep of
964− Just subd -> return subd
744+ Right subd -> return subd
965− Nothing -> do
745+ Left e -> do
967 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
746 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
968 (subscription@(EventSubscription _ _), occ) <- subscribeAndRead e =<< liftIO (newSubscriberHold h)
747 (subscription@(EventSubscription _ _), occ) <- subscribeAndRead e =<< liftIO (newSubscriberHold h)
969 liftIO $ writeIORef subscriptionRef $! subscription
748 liftIO $ writeIORef subscriptionRef $! subscription
@@ -971,21 +750,21 @@ getHoldEventSubscription h = do
971 Nothing -> return ()
750 Nothing -> return ()
972 Just o -> do
751 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
752 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
753+ case R.apply o old of
975 Nothing -> return ()
754 Nothing -> return ()
976 Just new -> do
755 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
756 -- Need to evaluate these so that we don't retain the Hold itself
978 v <- liftIO $ evaluate $ holdValue h
757 v <- liftIO $ evaluate $ holdValue h
979 i <- liftIO $ evaluate $ holdInvalidators h
758 i <- liftIO $ evaluate $ holdInvalidators h
980 defer $ SomeAssignment v i new
759 defer $ SomeAssignment v i new
981− liftIO $ writeIORef (holdParent h) $ Just subscription
760+ liftIO $ writeIORef (holdParent h) $ Right subscription
982 return subscription
761 return subscription
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
763type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
765+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
766-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
767+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
769instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
770 {-# INLINE (>>=) #-}
@@ -994,16 +773,14 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
773 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
774 {-# INLINE return #-}
996 return x = BehaviorM $ return x
775 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
776 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
777 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
779data BehaviorSubscribed x a
1003− = forall p. BehaviorSubscribedHold (Hold x p)
780+ = forall p. BehaviorSubscribedHold (Hold x p a)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
781 | BehaviorSubscribedPull (PullSubscribed x a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
783+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1008--type role PullSubscribed representational
785--type role PullSubscribed representational
1009data PullSubscribed x a
786data PullSubscribed x a
@@ -1038,33 +815,55 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
818+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
819 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
820 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
821 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
824+data SomeHoldInit x = forall p a. R.Patch p => SomeHoldInit !(Hold x p a)
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
826+data SomeMergeUpdate x = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap (DMap k (Event x))) (MergeSubscribed x k)
1051−data SomeMergeUpdate x = SomeMergeUpdate
828+data SomeMergeInit x = forall k. GCompare k => SomeMergeInit !(MergeSubscribed x k) !(Event x (R.PatchDMap (DMap k (Event x))))
1052− { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053− , _someMergeUpdate_invalidateHeight :: !(IO ())
1054− , _someMergeUpdate_recalculateHeight :: !(IO ())
1057−newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
830+data SomeEventSubscription x = forall a. SomeEventSubscription (EventSubscription x a)
1059-- EventM can do everything BehaviorM can, plus create holds
832-- 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)
833+newtype EventM x (a :: *) = EventM { unEventM :: ReaderT (EventEnv x) 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
835+data PushSubscribed x a b
836+ = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed x a b)))
837+ , pushSubscribedOccurrence :: !(IORef (Maybe b)) -- If the current height is less than our height, this should always be Nothing; during our height, this will get filled in at some point, always before our children are notified; after our height, this will be filled in with the correct value (Nothing if we are not firing, Just if we are)
838+ , pushSubscribedHeight :: !(IORef Height)
839+ , pushSubscribedSubscribers :: !(WeakBag (Subscriber x b))
840+ , pushSubscribedSelf :: !(Subscriber x a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
841+ , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed x a b)))
842+ , pushSubscribedParent :: !(EventSubscription x a)
844+ , pushSubscribedNodeId :: Int
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
848+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
850+instance Defer (SomeHoldInit x) (ComputeM x) where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
851+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
852+
853+{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
854+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
855+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
858+ = Push { pushCompute :: !(a -> ComputeM x (Maybe b)) -- Compute the current firing value; assumes that its parent has been computed --TODO: This only uses Defer SomeHoldInit EventM; perhaps only the hold init queue should be passed in (also, perhaps those hold inits can be accelerated - can there be a loop we would need to worry about?)
859+ , pushParent :: !(Event x a)
860+ , pushSubscribed :: !(IORef (Maybe (PushSubscribed x a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
863+data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x a) !(Subscriber x a)
865+mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x a
866+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1069data HeightBag = HeightBag
868data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
869 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +881,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
881heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
883heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
884+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
886heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
887heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +890,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
890 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
891 _ -> 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
893heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
894heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
895 Just ((h, _), _) -> Height h
@@ -1116,25 +907,45 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
907heightBagVerify = id
910+data MergeSubscribed x k
911+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
912+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
913+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
914+ , mergeSubscribedHeight :: !(IORef Height)
915+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
916+ , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
917+ , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap (DMap k (Event x))), EventSubscribed x (R.PatchDMap (DMap k (Event x)))))
918+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
919+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
921+ , mergeSubscribedNodeId :: Int
925+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
927+ = Merge { mergeParents :: !(Dynamic x R.PatchDMap (DMap k (Event x)))
928+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
931+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
932+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
933+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
934+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
937+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
938+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
939+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129− , fanSubscribedParent :: !(EventSubscription x)
940+ , fanSubscribedParent :: !(EventSubscription x (DMap k Identity))
1130#ifdef DEBUG_NODEIDS
941#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
942 , fanSubscribedNodeId :: Int
1135−data Fan x k v
946+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
947+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
948+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
951data SwitchSubscribed x a
@@ -1146,7 +957,7 @@ data SwitchSubscribed x a
1146 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
957 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
1147 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
958 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
1148 , switchSubscribedParent :: !(Behavior x (Event x a))
959 , switchSubscribedParent :: !(Behavior x (Event x a))
1149− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
960+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription x a))
1150 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
961 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
1151#ifdef DEBUG_NODEIDS
962#ifdef DEBUG_NODEIDS
1152 , switchSubscribedNodeId :: Int
963 , switchSubscribedNodeId :: Int
@@ -1158,17 +969,15 @@ data Switch x a
1158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
969 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
972{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164data CoincidenceSubscribed x a
973data CoincidenceSubscribed x a
1165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
974 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
975 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1167 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
976 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
1168 , coincidenceSubscribedHeight :: !(IORef Height)
977 , coincidenceSubscribedHeight :: !(IORef Height)
1169 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
978 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1170− , coincidenceSubscribedOuterParent :: !(EventSubscription x)
979+ , coincidenceSubscribedOuterParent :: !(EventSubscription x (Event x a))
1171− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
980+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x a)))
1172 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
981 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
1173#ifdef DEBUG_NODEIDS
982#ifdef DEBUG_NODEIDS
1174 , coincidenceSubscribedNodeId :: Int
983 , coincidenceSubscribedNodeId :: Int
@@ -1188,111 +997,152 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
997newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189newInvalidatorPull p = return $! InvalidatorPull p
998newInvalidatorPull p = return $! InvalidatorPull p
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1000+data Dynamic x p a
1001+ = DynamicHold !(Hold x p a)
1002+ | p ~ Identity => DynamicHoldIdentity !(Hold x Identity a)
1004+ | DynamicDyn !(Dyn x p a)
1005+ | p ~ Identity => DynamicDynIdentity !(Dyn x Identity a)
1007+{-# INLINE current #-}
1008+current :: R.Patch p => Dynamic x p a -> Behavior x a
1010+ DynamicHold h -> BehaviorHold h
1011+ DynamicHoldIdentity h -> BehaviorHoldIdentity h
1012+ DynamicConst a -> BehaviorConst a
1013+ DynamicDyn d -> BehaviorDyn d
1014+ DynamicDynIdentity d -> BehaviorDynIdentity d
1016+--TODO: If you only need updated, not current, can we avoid actually constructing the Hold?
1017+{-# INLINE updated #-}
1018+updated :: R.Patch p => Dynamic x p a -> Event x (p a)
1020+ DynamicHold h -> eventHold h
1021+ DynamicHoldIdentity h -> eventHoldIdentity h
1022+ DynamicConst _ -> eventNever
1023+ DynamicDyn d -> eventDyn d
1024+ DynamicDynIdentity d -> eventDynIdentity d
1026+newMapDyn :: (a -> b) -> Dynamic x Identity a -> Dynamic x Identity b
1027+newMapDyn f d = DynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ current d) (Identity . f . runIdentity <$> updated d)
1029+instance Functor (Dynamic x Identity) where
1032+instance Applicative (Dynamic x Identity) where
1033+ pure = DynamicConst
1034+ (<*>) = zipDynWith ($)
1038+instance R.FunctorMaybe (Event x) where
1192− mapMaybe f = push $ return . f
1039+ fmapMaybe f = push $ return . f
1194−instance HasSpiderTimeline x => Align (Event x) where
1041+instance Align (Event x) where
1195 nil = eventNever
1042 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1043+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ DynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.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
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1206− zip x y = mapMaybe justThese $ align x y
1209−data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210− | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211− | HoldDyn !(Hold x p)
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
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
1045--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)
1046+zipDynWith :: (a -> b -> c) -> Dynamic x Identity a -> Dynamic x Identity b -> Dynamic x Identity c
1220zipDynWith f da db =
1047zipDynWith f da db =
1221− let eab = align (dynamicUpdated da) (dynamicUpdated db)
1048+ let eab = align (updated da) (updated db)
1222 ec = flip push eab $ \o -> do
1049 ec = flip push eab $ \o -> do
1223 (a, b) <- case o of
1050 (a, b) <- case o of
1224 This (Identity a) -> do
1051 This (Identity a) -> do
1225− b <- readBehaviorUntracked $ dynamicCurrent db
1052+ b <- readBehaviorUntracked $ current db
1226 return (a, b)
1053 return (a, b)
1227 That (Identity b) -> do
1054 That (Identity b) -> do
1228− a <- readBehaviorUntracked $ dynamicCurrent da
1055+ a <- readBehaviorUntracked $ current da
1229 return (a, b)
1056 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1057 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
1058 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1059+ in DynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (current da) <*> readBehaviorUntracked (current db)) ec
1061+instance Monad (Dynamic x Identity) where
1062+ {-# INLINE return #-}
1064+ {-# INLINE (>>=) #-}
1065+ x >>= f = DynamicDynIdentity $ newJoinDyn $ newMapDyn f x --TODO: (>>), fail
1066+ {-# INLINE (>>) #-}
1068+ {-# INLINE fail #-}
1069+ fail _ = error "Dynamic does not support 'fail'"
1071+newtype Dyn x p a = Dyn { unDyn :: IORef (Either (BehaviorM x a, Event x (p a)) (Hold x p a)) }
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1073+unsafeDyn :: BehaviorM x a -> Event x (p a) -> Dyn x p a
1235−buildDynamic readV0 v' = do
1074+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1075+ where x = (readV0, v')
1237− let !d = Dyn result
1238− defer $ SomeDynInit d
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1077+newJoinDyn :: Dynamic x Identity (Dynamic x Identity a) -> Dyn x Identity a
1242−unsafeBuildDynamic readV0 v' =
1078+newJoinDyn d =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1079+ let readV0 = readBehaviorTracked . current =<< readBehaviorTracked (current d)
1080+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . current . runIdentity) $ updated d
1081+ eInner = switch $ updated <$> current d
1082+ eBoth = coincidence $ updated . runIdentity <$> updated d
1083+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1084+ in unsafeDyn readV0 v'
1086+--type role Behavior representational
1088+ = forall p. BehaviorHold !(Hold x p a)
1089+ | BehaviorHoldIdentity !(Hold x Identity a)
1091+ | BehaviorPull !(Pull x a)
1092+ | BehaviorDynIdentity !(Dyn x Identity a)
1093+ | forall p. R.Patch p => BehaviorDyn !(Dyn x p a)
1245-- ResultM can read behaviors and events
1095-- ResultM can read behaviors and events
1246type ResultM = EventM
1096type ResultM = EventM
1098+{-# NOINLINE unsafeNewIORef #-}
1099+unsafeNewIORef :: a -> b -> IORef b
1100+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248−instance HasSpiderTimeline x => Functor (Event x) where
1102+instance Functor (Event x) where
1249 fmap f = push $ return . Just . f
1103 fmap f = push $ return . Just . f
1251instance Functor (Behavior x) where
1105instance Functor (Behavior x) where
1252 fmap f = pull . fmap f . readBehaviorTracked
1106 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
1108+{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1255−push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1109+push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256−push f e = cacheEvent (pushCheap f e)
1110+push f e = eventPush $ Push
1113+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1115+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258−{-# INLINABLE pull #-}
1117+{-# NOINLINE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1118pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1119+pull a = BehaviorPull $ Pull
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1120+ { pullCompute = a
1267− , pullValue = ref
1121+ , pullValue = unsafeNewIORef a Nothing
1268#ifdef DEBUG_NODEIDS
1122#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1123+ , pullNodeId = unsafeNodeId a
1273−{-# INLINABLE switch #-}
1127+{-# NOINLINE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1128+switch :: Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1129+switch a = eventSwitch $ Switch
1278− { switchParent = a
1130+ { switchParent = a
1279− , switchSubscribed = ref
1131+ , switchSubscribed = unsafeNewIORef a Nothing
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1134+coincidence :: Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1135+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1136+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1137+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1140-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1291−run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1141+run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1142run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1143+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1144+ spiderEnv <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1145+ result <- SpiderHost $ lift $ withMVar (_spiderEnv_lock spiderEnv) $ \_ -> flip runReaderT spiderEnv $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1146 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1147 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1148 occBefore <- readIORef occRef
@@ -1304,40 +1154,43 @@ run roots after = do
1304 else return Nothing
1154 else return Nothing
1305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1155 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306 propagate a subscribersRef
1156 propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
1157+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308 let go = do
1158 let go = do
1309 delayed <- liftIO $ readIORef delayedRef
1159 delayed <- liftIO $ readIORef delayedRef
1310 case IntMap.minViewWithKey delayed of
1160 case IntMap.minViewWithKey delayed of
1311 Nothing -> return ()
1161 Nothing -> return ()
1312 Just ((currentHeight, cur), future) -> do
1162 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
1163+ tracePropagate $ "Running height " ++ show currentHeight
1314 putCurrentHeight $ Height currentHeight
1164 putCurrentHeight $ Height currentHeight
1315 liftIO $ writeIORef delayedRef $! future
1165 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
1166+ forM_ cur $ \d -> case d of
1167+ DelayedMerge subscribed -> do
1168+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1169+ case height `compare` Height currentHeight of
1170+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1171+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1173+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1174+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1175+ --TODO: Assert that m is not empty
1176+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1177+ scheduleClear $ mergeSubscribedOccurrence subscribed
1178+ propagate m $ mergeSubscribedSubscribers subscribed
1319 putCurrentHeight maxBound
1181 putCurrentHeight maxBound
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
1183+ tracePropagate "Done running an event frame"
1322 return result
1184 return result
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1186+data SomeClear = forall a. SomeClear (IORef (Maybe a))
1325−scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1326− height <- liftIO $ readIORef heightRef
1327− currentHeight <- getCurrentHeight
1328− case height `compare` currentHeight of
1329− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1330− 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))
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1188+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1190data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1192+data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1341debugFinalize :: Bool
1194debugFinalize :: Bool
1342debugFinalize = False
1195debugFinalize = False
@@ -1346,110 +1199,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1199 x' <- evaluate x
1347 mkWeakPtr x' $
1200 mkWeakPtr x' $
1348 if debugFinalize
1201 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1202+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1203 else Nothing
1352type WeakList a = [Weak a]
1205type WeakList a = [Weak a]
1207+{-# INLINE withIncreasedDepth #-}
1209+withIncreasedDepth :: CanTrace x m => m a -> m a
1210+withIncreasedDepth a = do
1211+ spiderEnv <- askSpiderEnv
1212+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) succ
1214+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
1217+withIncreasedDepth :: m a -> m a
1218+withIncreasedDepth = id
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1221+type CanTrace x m = (HasSpiderEnv x m, MonadIO m)
1223+{-# INLINE tracePropagate #-}
1224+tracePropagate :: (CanTrace x m) => String -> m ()
1225+tracePropagate = traceWhen debugPropagate
1227+{-# INLINE traceInvalidate #-}
1228+traceInvalidate :: String -> IO ()
1229+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1231+{-# INLINE traceWhen #-}
1232+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1233+traceWhen b message = traceMWhen b $ return message
1235+{-# INLINE traceMWhen #-}
1236+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1237+traceMWhen b getMessage = when b $ do
1238+ message <- getMessage
1359#ifdef DEBUG
1239#ifdef DEBUG
1360−
1240+ spiderEnv <- askSpiderEnv
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1241+ d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
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 #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383−withIncreasedDepth _ a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
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
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418−{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1422−{-# INLINE traceInvalidate #-}
1423−traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1245+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1247whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1248whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1251groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1252groupByHead = \case
1455 [] -> []
1253 [] -> []
@@ -1460,278 +1258,334 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1258 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1260listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1261+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 #-}
1264{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1265+propagateSubscriberHold :: R.Patch p => Hold x p a -> p a -> EventM x ()
1500propagateSubscriberHold h a = do
1266propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1267+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1268 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1269 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1270 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1271+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1272 Nothing -> return ()
1508 Just v' -> do
1273 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1274+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1275 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1276 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1277 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1515−data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1279+data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x a) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1281+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
1282+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
1283+readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
1284+readBehaviorUntracked b = do
1285+ holdInits <- getDeferralQueue
1286+ liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
1517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1288runBehaviorM :: 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)
1289+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1291askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1292askInvalidator = do
1522− (!m, _) <- ask
1293+ (!m, _) <- BehaviorM ask
1523 case m of
1294 case m of
1524 Nothing -> return Nothing
1295 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1296 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1298askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1299askParentsRef = do
1529− (!m, _) <- ask
1300+ (!m, _) <- BehaviorM ask
1530 case m of
1301 case m of
1531 Nothing -> return Nothing
1302 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1303 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1305askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1306askBehaviorHoldInits = do
1536− (_, !his) <- ask
1307+ (_, !his) <- BehaviorM ask
1537 return his
1308 return his
1310+readBehaviorTracked :: Behavior x a -> BehaviorM x a
1311+readBehaviorTracked b = case b of
1312+ BehaviorHold h -> readHoldTracked h
1313+ BehaviorHoldIdentity h -> readHoldTracked h
1314+ BehaviorConst a -> return a
1315+ BehaviorPull p -> do
1316+ val <- liftIO $ readIORef $ pullValue p
1318+ Just subscribed -> do
1319+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1320+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
1321+ liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
1322+ return $ pullSubscribedValue subscribed
1324+ i <- liftIO $ newInvalidatorPull p
1325+ wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
1326+ parentsRef <- liftIO $ newIORef []
1327+ holdInits <- askBehaviorHoldInits
1328+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
1329+ invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
1330+ parents <- liftIO $ readIORef parentsRef
1331+ let subscribed = PullSubscribed
1332+ { pullSubscribedValue = a
1333+ , pullSubscribedInvalidators = invsRef
1334+ , pullSubscribedOwnInvalidator = i
1335+ , pullSubscribedParents = parents
1337+ liftIO $ writeIORef (pullValue p) $ Just subscribed
1338+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1340+ BehaviorDyn d -> readHoldTracked =<< getDynHold d
1341+ BehaviorDynIdentity d -> readHoldTracked =<< getDynHold d
1343+{-# INLINE readHoldTracked #-}
1344+readHoldTracked :: Hold x p a -> BehaviorM x a
1345+readHoldTracked h = do
1346+ result <- liftIO $ readIORef $ holdValue h
1347+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
1348+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
1539{-# INLINE getDynHold #-}
1351{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1352+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p a -> m (Hold x p a)
1541getDynHold d = do
1353getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1354 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1355 case mh of
1544− HoldDyn h -> return h
1356+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1357+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1358 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1359 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1360 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1361+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1362 return h
1364+readRootSubscribed :: RootSubscribed x a -> IO (Maybe a)
1365+readRootSubscribed = rootSubscribedOccurrence
1367+readPushSubscribed :: PushSubscribed x b a -> IO (Maybe a)
1368+readPushSubscribed subscribed = do
1369+ result <- readIORef $ pushSubscribedOccurrence subscribed -- Since ResultM is always called after the final height is reached, this will always be valid
1370+ touch $ pushSubscribedSelf subscribed
1373+readMergeSubscribed :: MergeSubscribed x k -> IO (Maybe (DMap k Identity))
1374+readMergeSubscribed subscribed = do
1375+ result <- readIORef $ mergeSubscribedOccurrence subscribed
1376+ touch $ mergeSubscribedParents subscribed
1379+readFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> IO (Maybe a)
1380+readFanSubscribed k fs = do
1381+ parentOcc <- readEventSubscribed $ _eventSubscription_subscribed $ fanSubscribedParent fs
1382+ return $ coerce $ DMap.lookup k =<< parentOcc
1384+readSwitchSubscribed :: SwitchSubscribed x a -> IO (Maybe a)
1385+readSwitchSubscribed subscribed = do
1386+ result <- readIORef $ switchSubscribedOccurrence subscribed
1387+ touch $ switchSubscribedOwnInvalidator subscribed
1390+readCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO (Maybe a)
1391+readCoincidenceSubscribed subscribed = do
1392+ result <- readIORef $ coincidenceSubscribedOccurrence subscribed
1393+ touch $ coincidenceSubscribedOuter subscribed
1394+ --TODO: do we need to touch the inner subscriber?
1559-- Always refers to 0
1397-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1398{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1399zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1400zeroRef = unsafePerformIO $ newIORef zeroHeight
1402+type CanSubscribe x m =
1404+ , HasCurrentHeight x m
1405+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1406+ , Defer SomeClear m -- Wiping out event firings
1407+ , Defer (SomeAssignment x) m -- Updating state
1408+ , Defer (SomeResetCoincidence x) m
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)
1412+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a), RootSubscribed x a)
1565getRootSubscribed k r sub = do
1413getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1414 mSubscribed <- readIORef $ rootSubscribed r
1567− let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1568 case DMap.lookup k mSubscribed of
1415 case DMap.lookup k mSubscribed of
1569 Just subscribed -> {-# SCC "hitRoot" #-} do
1416 Just subscribed -> {-# SCC "hitRoot" #-} do
1570 sln <- subscribeRootSubscribed subscribed sub
1417 sln <- subscribeRootSubscribed subscribed sub
1572− return (sln, subscribed, occ)
1418+ return (sln, subscribed)
1573 Nothing -> {-# SCC "missRoot" #-} do
1419 Nothing -> {-# SCC "missRoot" #-} do
1574 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
1420 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
1575 let !cached = rootSubscribed r
1421 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1422 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1423 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1424+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1425 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1426 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1427+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1428 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1429 , rootSubscribedCachedSubscribed = cached
1589− , rootSubscribedOccurrence = getOcc
1430+ , rootSubscribedOccurrence = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1590 , rootSubscribedSubscribers = subs
1431 , rootSubscribedSubscribers = subs
1591 , rootSubscribedUninit = uninit
1432 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1433 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1434#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1435+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1597− -- If we die at the same moment that all our children die, they will
1598− -- try to clean us up but will fail because their Weak reference to us
1599− -- will also be dead. So, if we are dying, check if there are any
1600− -- children; since children don't bother cleaning themselves up if
1601− -- their parents are already dead, I don't think there's a race
1602− -- condition here. However, if there are any children, then we can
1603− -- infer that we need to clean ourselves up, so we do.
1605− cs <- readIORef $ _weakBag_children subs
1606− when (not $ IntMap.null cs) (cleanupRootSubscribed subscribed)
1607− writeIORef weakSelf =<< evaluate =<< mkWeakPtr subscribed (Just finalCleanup)
1438+ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
1608 modifyIORef' (rootSubscribed r) $ DMap.insertWith (error $ "getRootSubscribed: duplicate key inserted into Root") k subscribed --TODO: I think we can just write back mSubscribed rather than re-reading it
1439 modifyIORef' (rootSubscribed r) $ DMap.insertWith (error $ "getRootSubscribed: duplicate key inserted into Root") k subscribed --TODO: I think we can just write back mSubscribed rather than re-reading it
1610− return (sln, subscribed, occ)
1440+ return (sln, subscribed)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1442{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1443cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1444+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1445 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1446 modifyIORef' cached $ DMap.delete k
1620{-# INLINE subscribeRootSubscribed #-}
1448{-# INLINE subscribeRootSubscribed #-}
1621−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1449+subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1450subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1452+-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1625−
1453+{-# SPECIALIZE getPushSubscribed :: Push x a b -> Subscriber x b -> EventM x (WeakBagTicket (Subscriber x b), PushSubscribed x a b) #-}
1626−data FanInt x a = FanInt
1454+getPushSubscribed :: CanSubscribe x m => Push x a b -> Subscriber x b -> m (WeakBagTicket (Subscriber x b), PushSubscribed x a b)
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
1455+getPushSubscribed p sub = do
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1456+ mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1457+ case mSubscribed of
1630−#ifdef DEBUG_NODEIDS
1458+ Just subscribed -> {-# SCC "hitPush" #-} do
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1459+ sln <- liftIO $ subscribePushSubscribed subscribed sub
1632−#endif
1460+ return (sln, subscribed)
1633− }
1461+ Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1634−
1462+ subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1635−newFanInt :: IO (FanInt x a)
1463+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1636−newFanInt = do
1464+ s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
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
1465+ (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead (pushParent p) s
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1466+ occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1467+ occRef <- liftIO $ newIORef occ
1468+ when (isJust occ) $ scheduleClear occRef
1469+ weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1470+ let !cached = pushSubscribed p
1471+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1472+ let subscribed = PushSubscribed
1473+ { pushSubscribedCachedSubscribed = cached
1474+ , pushSubscribedOccurrence = occRef
1475+ , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1476+ , pushSubscribedSubscribers = subs
1477+ , pushSubscribedSelf = s
1478+ , pushSubscribedWeakSelf = weakSelf
1479+ , pushSubscribedParent = subscription
1640#ifdef DEBUG_NODEIDS
1480#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1481+ , pushSubscribedNodeId = unsafeNodeId p
1643− return $ FanInt
1483+ }
1644− { _fanInt_subscribers = subscribers
1484+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1645− , _fanInt_subscriptionRef = subscriptionRef
1485+ liftIO $ writeIORef subscribedRef $! subscribed
1646− , _fanInt_occRef = occRef
1486+ liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1487+ return (sln, subscribed)
1489+cleanupPushSubscribed :: PushSubscribed x a b -> IO ()
1490+cleanupPushSubscribed self = do
1491+ unsubscribe $ pushSubscribedParent self
1492+ writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1494+{-# INLINE subscribePushSubscribed #-}
1495+subscribePushSubscribed :: PushSubscribed x a b -> Subscriber x b -> IO (WeakBagTicket (Subscriber x b))
1496+subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1498+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k) #-}
1499+getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k)
1500+getMergeSubscribed m sub = do
1501+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1502+ case mSubscribed of
1503+ Just subscribed -> {-# SCC "hitMerge" #-} do
1504+ sln <- liftIO $ subscribeMergeSubscribed subscribed sub
1505+ return (sln, subscribed)
1506+ Nothing -> {-# SCC "missMerge" #-} do
1507+ subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1508+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1509+ initialParents <- readBehaviorUntracked $ current $ mergeParents m
1510+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1511+ s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1512+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1513+ height <- liftIO $ getEventSubscribedHeight parentSubd
1514+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1515+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1516+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1517+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1518+ myHeight = if invalidHeight `elem` heights
1520+ else succHeight $ heightBagMax myHeightBag
1521+ currentHeight <- getCurrentHeight
1522+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1523+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1525+ unless (DMap.null accum) $ do
1526+ scheduleMerge myHeight subscribedUnsafe
1527+ occRef <- liftIO $ newIORef occ
1528+ when (isJust occ) $ scheduleClear occRef
1529+ accumRef <- liftIO $ newIORef accum
1530+ heightRef <- liftIO $ newIORef myHeight
1531+ heightMapRef <- liftIO $ newIORef myHeightBag
1532+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1533+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1534+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1535+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1536+ let !subscribed = MergeSubscribed
1537+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1538+ , mergeSubscribedOccurrence = occRef
1539+ , mergeSubscribedAccum = accumRef
1540+ , mergeSubscribedHeight = heightRef
1541+ , mergeSubscribedHeightBag = heightMapRef
1542+ , mergeSubscribedSubscribers = subs
1543+ , mergeSubscribedChange = changeSubdRef
1544+ , mergeSubscribedParents = parentsRef
1545+ , mergeSubscribedWeakSelf = weakSelf
1647#ifdef DEBUG_NODEIDS
1546#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1547+ , mergeSubscribedNodeId = unsafeNodeId m
1651−
1550+ defer $ SomeMergeInit subscribed $ updated $ mergeParents m
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1551+ liftIO $ writeIORef subscribedRef $! subscribed
1653−fanInt p = unsafePerformIO $ do
1552+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1654− self <- newFanInt
1553+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1554+ return (sln, subscribed)
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1555+
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1556+cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1557+cleanupMergeSubscribed subscribed = do
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1558+ parents <- readIORef $ mergeSubscribedParents subscribed
1660− { subscriberPropagate = \m -> do
1559+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1661− liftIO $ writeIORef (_fanInt_occRef self) m
1560+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1662− scheduleIntClear $ _fanInt_occRef self
1561+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1562+
1664− FastWeakBag.traverse_ b $ \s ->
1563+{-# INLINE subscribeMergeSubscribed #-}
1665− subscriberPropagate s v
1564+subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO (WeakBagTicket (Subscriber x (DMap k Identity)))
1666− , subscriberInvalidateHeight = \old ->
1565+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1566+
1668− FastWeakBag.traverse_ b $ \s ->
1567+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), FanSubscribed x k) #-}
1669− subscriberInvalidateHeight s old
1568+getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderEnv x m, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), FanSubscribed x k)
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 #-}
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))
1708getFanSubscribed k f sub = do
1569getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1570 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1571 case mSubscribed of
1711− Just subscribed -> {-# SCC "hitFan" #-} liftIO $ do
1572+ Just subscribed -> {-# SCC "hitFan" #-} do
1712− sln <- subscribeFanSubscribed k subscribed sub
1573+ sln <- liftIO $ subscribeFanSubscribed k subscribed sub
1713− occ <- readIORef $ fanSubscribedOccurrence subscribed
1714− return (sln, subscribed, coerce $ DMap.lookup k =<< occ)
1574+ return (sln, subscribed)
1715 Nothing -> {-# SCC "missFan" #-} do
1575 Nothing -> {-# SCC "missFan" #-} do
1716 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
1576 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
1717 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1577 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1718 s <- liftIO $ newSubscriberFan subscribedUnsafe
1578 s <- liftIO $ newSubscriberFan subscribedUnsafe
1719− (subscription, parentOcc) <- subscribeAndRead (fanParent f) s
1579+ subscription <- subscribe (fanParent f) s
1720 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
1580 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
1721 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
1581 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1582 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723− occRef <- liftIO $ newIORef parentOcc
1724− when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1583 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1584 { fanSubscribedCachedSubscribed = fanSubscribed f
1730− , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1585 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1586 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1587#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1588+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1591 let !self = (k, subscribed)
@@ -1739,9 +1593,9 @@ getFanSubscribed k f sub = do
1739 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
1593 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
1740 liftIO $ writeIORef subscribedRef $! subscribed
1594 liftIO $ writeIORef subscribedRef $! subscribed
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1595 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742− return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1596+ return (slnForSub, subscribed)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1598+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1599cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1600 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1601 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1607,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1607 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1609{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1610+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1757subscribeFanSubscribed k subscribed sub = do
1611subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1612 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1613 case DMap.lookup k subscribers of
@@ -1761,19 +1615,18 @@ subscribeFanSubscribed k subscribed sub = do
1761 let !self = (k, subscribed)
1615 let !self = (k, subscribed)
1762 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
1616 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
1763 (list, sln) <- WeakBag.singleton sub weakSelf cleanupFanSubscribed
1617 (list, sln) <- WeakBag.singleton sub weakSelf cleanupFanSubscribed
1764− writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeFanSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
1618+ writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeEventSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
1765 return sln
1619 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1620 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1622+{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), SwitchSubscribed x a) #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1623+getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderEnv x m, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), SwitchSubscribed x a)
1770getSwitchSubscribed s sub = do
1624getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1625 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1626 case mSubscribed of
1773− Just subscribed -> {-# SCC "hitSwitch" #-} liftIO $ do
1627+ Just subscribed -> {-# SCC "hitSwitch" #-} do
1774− sln <- subscribeSwitchSubscribed subscribed sub
1628+ sln <- liftIO $ subscribeSwitchSubscribed subscribed sub
1775− occ <- readIORef $ switchSubscribedOccurrence subscribed
1776− return (sln, subscribed, occ)
1629+ return (sln, subscribed)
1777 Nothing -> {-# SCC "missSwitch" #-} do
1630 Nothing -> {-# SCC "missSwitch" #-} do
1778 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
1631 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
1779 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1632 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
@@ -1791,9 +1644,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1644 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1645 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1646 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1647 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1648 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1649 , switchSubscribedOccurrence = occRef
@@ -1806,13 +1656,13 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1656 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1657 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1658#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1659+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1662 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1813 liftIO $ writeIORef subscribedRef $! subscribed
1663 liftIO $ writeIORef subscribedRef $! subscribed
1814 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1664 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1815− return (slnForSub, subscribed, parentOcc)
1665+ return (slnForSub, subscribed)
1817cleanupSwitchSubscribed :: SwitchSubscribed x a -> IO ()
1667cleanupSwitchSubscribed :: SwitchSubscribed x a -> IO ()
1818cleanupSwitchSubscribed subscribed = do
1668cleanupSwitchSubscribed subscribed = do
@@ -1821,18 +1671,17 @@ cleanupSwitchSubscribed subscribed = do
1821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1671 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1823{-# INLINE subscribeSwitchSubscribed #-}
1673{-# INLINE subscribeSwitchSubscribed #-}
1824−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1674+subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1675subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1677+{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a) #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1678+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, HasSpiderEnv x m, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a)
1829getCoincidenceSubscribed c sub = do
1679getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1680 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1681 case mSubscribed of
1832− Just subscribed -> {-# SCC "hitCoincidence" #-} liftIO $ do
1682+ Just subscribed -> {-# SCC "hitCoincidence" #-} do
1833− sln <- subscribeCoincidenceSubscribed subscribed sub
1683+ sln <- liftIO $ subscribeCoincidenceSubscribed subscribed sub
1834− occ <- readIORef $ coincidenceSubscribedOccurrence subscribed
1835− return (sln, subscribed, occ)
1684+ return (sln, subscribed)
1836 Nothing -> {-# SCC "missCoincidence" #-} do
1685 Nothing -> {-# SCC "missCoincidence" #-} do
1837 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
1686 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
1838 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1687 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
@@ -1851,9 +1700,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1700 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1701 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1702 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1703 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1704 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1705 , coincidenceSubscribedOccurrence = occRef
@@ -1864,13 +1710,13 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1710 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1711 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1712#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1713+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1716 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1871 liftIO $ writeIORef subscribedRef $! subscribed
1717 liftIO $ writeIORef subscribedRef $! subscribed
1872 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1718 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1873− return (slnForSub, subscribed, occ)
1719+ return (slnForSub, subscribed)
1875cleanupCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO ()
1721cleanupCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO ()
1876cleanupCoincidenceSubscribed subscribed = do
1722cleanupCoincidenceSubscribed subscribed = do
@@ -1878,535 +1724,145 @@ cleanupCoincidenceSubscribed subscribed = do
1878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1724 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1880{-# INLINE subscribeCoincidenceSubscribed #-}
1726{-# INLINE subscribeCoincidenceSubscribed #-}
1881−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1727+subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1728subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1730+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1731+merge :: GCompare k => Dynamic x R.PatchDMap (DMap k (Event x)) -> Event x (DMap k Identity)
1886− => (forall a. q a -> Event x (v a))
1732+merge m = eventMerge $ Merge
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1733+ { mergeParents = m
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1734+ , mergeSubscribed = unsafeNewIORef m Nothing
1890−{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1896−{-# INLINE [1] mergeCheap #-}
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905− updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1906− let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1907− (mOldSubd, newPs) <- case me of
1908− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1910− let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1912− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1913− let newParent = MergeSubscribedParent subscription
1914− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916− forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1920− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921− return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922− foldM f ([], oldParents) $ DMap.toList p
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1925− getInitialSubscribers initialParents subscriber = do
1926− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1927− let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1929− height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1936− destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1937− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1939−{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947− updateMe subscriber heightBagRef oldParents p = do
1948− -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1950− subscribeParent k e = do
1951− keyRef <- liftIO $ newIORef k
1952− let s = subscriber $ liftIO $ readIORef keyRef
1953− subscription@(EventSubscription _ subd) <- subscribe e s
1955− newParentHeight <- getEventSubscribedHeight subd
1956− modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957− return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1959− -- 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
1961− moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1966− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967− return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1969− liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1974− return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976− getInitialSubscribers initialParents subscriber = do
1977− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1978− keyRef <- liftIO $ newIORef k
1979− let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1981− height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1988− destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1989− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1996− -> EventM x ([EventSubscription x], DMap k s)
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
2000−type MergeInitFunc k v q x s
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
2005−type MergeDestroyFunc k s
2009−data Merge x k v s = Merge
2010− { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011− , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012− , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
2018−invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2020−invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021−invalidateMergeHeight' heightRef sub = do
2022− oldHeight <- readIORef heightRef
2023− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024− when (oldHeight /= invalidHeight) $ do
2025− writeIORef heightRef $! invalidHeight
2026− subscriberInvalidateHeight sub oldHeight
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
2029−revalidateMergeHeight m = do
2030− currentHeight <- readIORef $ _merge_heightRef m
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
2034− heights <- readIORef $ _merge_heightBagRef m
2035− parents <- readIORef $ _merge_parentsRef m
2036− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037− case heightBagSize heights `compare` DMap.size parents of
2040− let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042− writeIORef (_merge_heightRef m) $! height
2043− subscriberRecalculateHeight (_merge_sub m) height
2044− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047−scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048− vals <- liftIO $ readIORef $ _merge_accumRef m
2049− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052− --TODO: Assert that m is not empty
2053− subscriberPropagate (_merge_sub m) vals
2055−checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056−checkCycle subscribed = liftIO $ do
2057− height <- readIORef (eventSubscribedHeightRef subscribed)
2059− -- currentHeight <- getCurrentHeight
2060− -- when (height <= currentHeight) $ if height /= invalidHeight
2062− -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063− -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2065− when (height == invalidHeight) $
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
2072− throwIO EventLoopException
2076−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077−mergeSubscriber subscribed m getKey = Subscriber
2078− { subscriberPropagate = \a -> do
2079− oldM <- liftIO $ readIORef $ _merge_accumRef m
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082− tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083− liftIO $ writeIORef (_merge_accumRef m) $! newM
2084− when (DMap.null oldM) $ do -- Only schedule the firing once
2085− height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2088− scheduleMergeSelf m height
2089− , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090− modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091− invalidateMergeHeight m
2092− , subscriberRecalculateHeight = \new -> do
2093− modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094− revalidateMergeHeight m
2097−--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100− where updateMe = do
2101− oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103− liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104− return subscriptionsToKill
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
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
2111− accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112− heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113− heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114− parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2121− , eventSubscribedGetParents = do
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123− fmap getParent' . DMap.toList <$> readIORef parentsRef
2124− , eventSubscribedHasOwnHeightRef = False
2125− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2130− { _merge_parentsRef = parentsRef
2131− , _merge_heightBagRef = heightBagRef
2132− , _merge_heightRef = heightRef
2134− , _merge_accumRef = accumRef
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
2137− let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138− myHeight = if invalidHeight `elem` heights
2140− else succHeight $ heightBagMax myHeightBag
2141− currentHeight <- getCurrentHeight
2142− 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)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
2146− liftIO $ writeIORef accumRef $! accum
2147− liftIO $ writeIORef heightRef $! myHeight
2148− liftIO $ writeIORef heightBagRef $! myHeightBag
2149− liftIO $ writeIORef parentsRef $! initialParentState
2150− defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
2152− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
2155− , subscriberInvalidateHeight = \_ -> return ()
2156− , subscriberRecalculateHeight = \_ -> return ()
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2160− -- 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
2162− -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2164− let unsubscribeAll = destroy =<< readIORef parentsRef
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2169−mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170−mergeInt = cacheEvent . mergeIntCheap
2172−{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174−mergeIntCheap d = Event $ \sub -> do
2175− initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176− accum <- liftIO $ FastMutableIntMap.newEmpty
2177− heightRef <- liftIO $ newIORef zeroHeight
2178− heightBagRef <- liftIO $ newIORef heightBagEmpty
2179− parents <- liftIO $ FastMutableIntMap.newEmpty
2180− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181− let subscribed = EventSubscribed
2182− { eventSubscribedHeightRef = heightRef
2183− , eventSubscribedRetained = toAny (parents, changeSubdRef)
2185− , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186− , eventSubscribedHasOwnHeightRef = False
2187− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2190− let scheduleSelf = do
2191− height <- liftIO $ readIORef $ heightRef
2192− scheduleMerge' height heightRef $ do
2193− vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194− subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196− recalculateMyHeight = do
2197− currentHeight <- readIORef heightRef
2198− when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
2199− heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
2201− case heightBagSize heights `compare` numParents of
2204− let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206− writeIORef heightRef $! height
2207− subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209− mySubscriber k = Subscriber
2210− { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2213− wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214− liftIO $ FastMutableIntMap.insert accum k a
2215− when wasEmpty scheduleSelf
2216− , subscriberInvalidateHeight = \old -> do
2217− modifyIORef' heightBagRef $ heightBagRemove old
2219− , subscriberRecalculateHeight = \new -> do
2220− modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
2223− forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2226− forM_ parentOcc $ FastMutableIntMap.insert accum k
2227− FastMutableIntMap.insert parents k subscription
2228− height <- getEventSubscribedHeight parentSubd
2229− if height == invalidHeight
2230− then writeIORef heightRef invalidHeight
2232− modifyIORef' heightBagRef $ heightBagAdd height
2233− modifyIORef' heightRef $ \oldHeight ->
2234− if oldHeight == invalidHeight
2236− else max (succHeight height) oldHeight
2237− myHeight <- liftIO $ readIORef heightRef
2238− currentHeight <- getCurrentHeight
2239− isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240− occ <- if currentHeight >= myHeight -- If we should have fired by now
2242− then return Nothing
2243− else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244− else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2246− defer $ SomeMergeInit $ do
2247− let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2250− let f k newParent = do
2251− subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252− newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254− return subscription
2255− newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256− oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257− liftIO $ for_ oldParents $ \oldParent -> do
2258− oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2260− print ("updateMe", oldParentHeight)
2261− modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262− return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2264− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2267− , subscriberInvalidateHeight = \_ -> return ()
2268− , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271− forM_ change $ \c -> defer $ updateMe c
2272− -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273− -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274− -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276− let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
1737newtype 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
1739+fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
1740+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
1741 let f = Fan
2288 { fanParent = e
1742 { fanParent = e
2289− , fanSubscribed = ref
1743+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1745+ in EventSelector $ \k -> eventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1747+runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1748+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1749 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1750 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1751+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1752 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1753 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1754 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
1755+ mapM_ initMerge mergeInits
2304− mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1756+ runHoldInits holdInitRef mergeInitRef
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1758+initHold :: SomeHoldInit x -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1759initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
1761+initMerge :: SomeMergeInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1762+initMerge (SomeMergeInit subscribed changed) = do
1763+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1764+ (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1765+ forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1766+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2313−newEventEnv :: IO (EventEnv x)
1768+-- | Run an event action outside of a frame
2314−newEventEnv = do
1769+runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1770+runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1771+ -- Clear out pending unsubscriptions; these will need to happen eventually anyway, and might cause us a lot of extra work during the frame, so get rid of them now
1772+ pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1773+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1774 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1775 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1776 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1777 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1778 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1779 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1780 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1781 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
1782+ delayedRef <- liftIO $ newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1783+ let env = EventEnv spiderEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2328−clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2330− writeIORef toAssignRef []
2331− writeIORef holdInitRef []
2332− writeIORef dynInitRef []
2333− writeIORef mergeUpdateRef []
2334− writeIORef mergeInitRef []
2335− writeIORef heightRef zeroHeight
2336− writeIORef toClearRef []
2337− writeIORef toClearIntRef []
2338− writeIORef toClearRootRef []
2339− writeIORef coincidenceInfosRef []
2340− writeIORef delayedRef IntMap.empty
2342−-- | Run an event action outside of a frame
2343−runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344−runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2346 let go = do
1784 let go = do
2347 result <- a
1785 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
1786+ runHoldInits holdInitRef mergeInitRef -- 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
1787 return result
2350− result <- runEventM go
1788+ result <- runEventM go env
2351− toClear <- readIORef $ eventEnvClears env
1789+ toClear <- readIORef toClearRef
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1790+ 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
1791+ toClearRoot <- readIORef toClearRootRef
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1792+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1793+ toAssign <- readIORef toAssignRef
2358 toReconnectRef <- newIORef []
1794 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1795+ coincidenceInfos <- readIORef coincidenceInfosRef
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1796 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1797 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1798+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1799 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1800+ mergeUpdates <- readIORef mergeUpdateRef
2365− writeIORef (eventEnvMergeUpdates env) []
1801+ writeIORef mergeUpdateRef []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1802+ let updateMerge :: SomeMergeUpdate x -> IO [SomeEventSubscription x]
1803+ updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k (Event x))) m) = do
1804+ oldParents <- readIORef $ mergeSubscribedParents m
1805+ let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1806+ (mOldSubd, newPs) <- case me of
1807+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1809+ s <- liftIO $ newSubscriberMerge k m
1810+ subscription@(EventSubscription _ subd) <- subscribe e s
1811+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1812+ let newParent = MergeSubscribedParent subscription s
1813+ liftIO $ addMergeHeight newParentHeight m
1814+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1815+ forM_ mOldSubd $ \oldSubd -> do
1816+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1817+ liftIO $ removeMergeHeight oldHeight m
1818+ return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1819+ (subscriptionsToKill, newParents) <- flip runEventM env $ foldM f ([], oldParents) $ DMap.toList p --TODO: I think this runEventM is OK, since no events are firing at this time, but it might not be
1820+ writeIORef (mergeSubscribedParents m) $! newParents
1821+ return subscriptionsToKill
1822+ when debugPropagate $ putStrLn "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1823+ mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1824+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1825 toReconnect <- readIORef toReconnectRef
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1826 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1827 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1828 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1829+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1830 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1831 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1832 wi' <- mkWeakPtrWithDebug i "wi'"
2378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
1833 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1834 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1835+ writeIORef holdInitRef [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1836+ e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
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
1837+ runEventM (runHoldInits holdInitRef mergeInitRef) 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
1838 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1839 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
1840+ subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderEnv --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)
1842 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1843+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1844 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1845 EventNever -> "EventNever"
2391 _ -> "something else"
1846 _ -> "something else"
2393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1848 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
2394− return oldSubscription
1849+ return $ SomeEventSubscription oldSubscription
2395− liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
1850+ forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2396− liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
1851+ forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1852 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
1853 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
2399 parentHeight <- getEventSubscribedHeight subd'
1854 parentHeight <- getEventSubscribedHeight subd'
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1855 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1856 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1857 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1858+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1859+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
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
1860+ invalidateMergeHeight m --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
1861 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1862 unsubscribe subscription
2407 mapM_ invalidateCoincidenceHeight mcs
1863 mapM_ invalidateCoincidenceHeight mcs
2408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1864 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
2409− mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
1865+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
1866 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
2411 height <- calculateSwitchHeight subscribed
1867 height <- calculateSwitchHeight subscribed
2412 updateSwitchHeight height subscribed
1868 updateSwitchHeight height subscribed
@@ -2436,12 +1892,50 @@ succHeight h@(Height a) =
2436 then invalidHeight
1892 then invalidHeight
2437 else Height $ succ a
1893 else Height $ succ a
1895+removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1896+removeMergeHeight oldParentHeight subscribed = do
1897+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1898+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1899+ let newHeights = heightBagRemove oldParentHeight oldHeights
1900+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1902+invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1903+invalidateMergeHeight subscribed = do
1904+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1905+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1906+ when (oldHeight /= invalidHeight) $ do
1907+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1908+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1910+addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1911+addMergeHeight newParentHeight subscribed = do
1912+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1913+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1914+ let newHeights = heightBagAdd newParentHeight oldHeights
1915+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1917+revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1918+revalidateMergeHeight subscribed = do
1919+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1920+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1921+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1922+ parents <- readIORef $ mergeSubscribedParents subscribed
1923+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1924+ case heightBagSize heights `compare` DMap.size parents of
1927+ let height = succHeight $ heightBagMax heights
1928+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1929+ writeIORef (mergeSubscribedHeight subscribed) $! height
1930+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1931+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
2439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1933invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2440invalidateCoincidenceHeight subscribed = do
1934invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1935 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1936 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1937 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1938+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1940updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
1941updateSwitchHeight new subscribed = do
@@ -2449,7 +1943,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1943 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
1944 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1945 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1946+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1948recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1949recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1952,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
1952 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1953 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1954 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1955+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1957calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1958calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,170 +1991,157 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1991-- Reflex integration
2498--------------------------------------------------------------------------------
1992--------------------------------------------------------------------------------
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2504-- | The default, global Spider environment
1994-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
1995+type Spider = SpiderEnv Global
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
1997+-- | Designates the default, global Spider timeline
2512− {-# INLINABLE hold #-}
1998+data Global
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
2000+{-# NOINLINE globalSpiderEnv #-}
2531− {-# INLINABLE sample #-}
2001+globalSpiderEnv :: SpiderEnv Global
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2002+globalSpiderEnv = unsafePerformIO unsafeNewSpiderEnv
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2004+-- | Stores all global data relevant to a particular Spider timeline; only one
2535− {-# INLINABLE hold #-}
2005+-- value should exist for each type @x@
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2006+data SpiderEnv x = SpiderEnv
2537− {-# INLINABLE holdDyn #-}
2007+ { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription x])
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2008+ , _spiderEnv_lock :: !(MVar ())
2539− {-# INLINABLE holdIncremental #-}
2009+ , _spiderEnv_cleanups :: !(IORef [IO ()])
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2010+#ifdef DEBUG
2541− {-# INLINABLE buildDynamic #-}
2011+ , _spiderEnv_depth :: !(IORef Int)
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2012+#endif
2543− {-# INLINABLE headE #-}
2013+ }
2544− headE = R.slowHeadE
2014+type role SpiderEnv nominal
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2016+instance GEq SpiderEnv where
2017+ a `geq` b = if _spiderEnv_lock a == _spiderEnv_lock b
2018+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderEnv can't have two different 'x' arguments
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2021+unsafeNewSpiderEnv :: forall x. IO (SpiderEnv x)
2551− {-# INLINE return #-}
2022+unsafeNewSpiderEnv = do
2552− return = pure
2023+ toUnsubscribe <- newIORef []
2553− {-# INLINE (>>=) #-}
2024+ lock <- newMVar ()
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2025+ cleanups <- newIORef []
2555− {-# INLINE (>>) #-}
2026+#ifdef DEBUG
2556− (>>) = (*>)
2027+ depthRef <- newIORef 0
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2561−
2029+ return $ SpiderEnv
2562−{-# INLINABLE newJoinDyn #-}
2030+ { _spiderEnv_toUnsubscribe = toUnsubscribe
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2031+ , _spiderEnv_lock = lock
2564−newJoinDyn d =
2032+ , _spiderEnv_cleanups = cleanups
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2033+#ifdef DEBUG
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2034+ , _spiderEnv_depth = depthRef
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
2036+ }
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)
2038+-- | Create a new SpiderEnv
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2039+newSpiderEnv :: IO (Some SpiderEnv)
2040+newSpiderEnv = Some.This <$> unsafeNewSpiderEnv
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2042+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
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)
2044+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
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)
2046+instance R.Reflex (SpiderEnv x) where
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2047+ newtype Behavior (SpiderEnv x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2048+ newtype Event (SpiderEnv x) a = SpiderEvent { unSpiderEvent :: Event x a }
2049+ newtype Dynamic (SpiderEnv x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x Identity a } deriving (Functor, Applicative, Monad)
2050+ newtype Incremental (SpiderEnv x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic x p a }
2051+ type PullM (SpiderEnv x) = SpiderPullM x
2052+ type PushM (SpiderEnv x) = SpiderPushM x
2053+ {-# INLINABLE never #-}
2054+ never = SpiderEvent eventNever
2055+ {-# INLINABLE constant #-}
2056+ constant = SpiderBehavior . BehaviorConst
2057+ {-# INLINABLE push #-}
2058+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2059+ {-# INLINABLE pull #-}
2060+ pull = SpiderBehavior . pull . coerce
2061+ {-# INLINABLE merge #-}
2062+ merge = SpiderEvent . merge . DynamicConst . (unsafeCoerce :: DMap k (R.Event (SpiderEnv x)) -> DMap k (Event x))
2063+ {-# INLINABLE fan #-}
2064+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2065+ {-# INLINABLE switch #-}
2066+ switch = SpiderEvent . switch . (unsafeCoerce :: Behavior x (R.Event (SpiderEnv x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2067+ {-# INLINABLE coincidence #-}
2068+ coincidence = SpiderEvent . coincidence . (unsafeCoerce :: Event x (R.Event (SpiderEnv x) a) -> Event x (Event x a)) . unSpiderEvent
2069+ {-# INLINABLE current #-}
2070+ current = SpiderBehavior . current . unSpiderDynamic
2071+ {-# INLINABLE updated #-}
2072+ updated = SpiderEvent . fmap runIdentity . updated . unSpiderDynamic
2073+ {-# INLINABLE unsafeBuildDynamic #-}
2074+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (coerce readV0) $ addIdentity $ unSpiderEvent v'
2075+ {-# INLINABLE unsafeBuildIncremental #-}
2076+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ DynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2077+ {-# INLINABLE mergeIncremental #-}
2078+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x R.PatchDMap (DMap k (R.Event (SpiderEnv x))) -> Dynamic x R.PatchDMap (DMap k (Event x))) . unSpiderIncremental
2079+ {-# INLINABLE currentIncremental #-}
2080+ currentIncremental = SpiderBehavior . current . unSpiderIncremental
2081+ {-# INLINABLE updatedIncremental #-}
2082+ updatedIncremental = SpiderEvent . updated . unSpiderIncremental
2083+ {-# INLINABLE incrementalToDynamic #-}
2084+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ current i) $ flip push (updated i) $ \p -> do
2085+ c <- readBehaviorUntracked $ current i
2086+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2088+instance R.MonadSample (SpiderEnv x) (EventM x) where
2089+ {-# INLINABLE sample #-}
2090+ sample (SpiderBehavior b) = readBehaviorUntracked b
2092+instance R.MonadHold (SpiderEnv x) (EventM x) where
2602 {-# INLINABLE hold #-}
2093 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2094+ hold = holdSpiderEventM
2604 {-# INLINABLE holdDyn #-}
2095 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2096+ holdDyn = holdDynSpiderEventM
2606 {-# INLINABLE holdIncremental #-}
2097 {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2098+ holdIncremental = holdIncrementalSpiderEventM
2608− {-# INLINABLE buildDynamic #-}
2099+
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2100+holdSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Behavior (SpiderEnv x) a)
2610− {-# INLINABLE headE #-}
2101+holdSpiderEventM v0 e = fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2102+
2612− {-# INLINABLE now #-}
2103+holdDynSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Dynamic (SpiderEnv x) a)
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2104+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
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
2106+holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderEnv x) (p a) -> EventM x (R.Incremental (SpiderEnv x) p a)
2107+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2109+instance R.MonadHold (SpiderEnv x) (SpiderHost x) where
2620 {-# INLINABLE hold #-}
2110 {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2111+ hold v0 e = R.runHostFrame $ R.hold v0 e
2622 {-# INLINABLE holdDyn #-}
2112 {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2113+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2624 {-# INLINABLE holdIncremental #-}
2114 {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2115+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2626− {-# INLINABLE buildDynamic #-}
2116+
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
2117+instance R.MonadSample (SpiderEnv x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2118 {-# INLINABLE sample #-}
2636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2119 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2121+instance R.MonadSample (SpiderEnv x) (SpiderPullM x) where
2639 {-# INLINABLE sample #-}
2122 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2123+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2125+instance R.MonadSample (SpiderEnv x) (SpiderPushM x) where
2126+ {-# INLINABLE sample #-}
2127+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2129+instance R.MonadHold (SpiderEnv x) (SpiderPushM x) where
2643 {-# INLINABLE hold #-}
2130 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2131+ hold v0 e = R.current <$> R.holdDyn v0 e
2645 {-# INLINABLE holdDyn #-}
2132 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2133+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity e
2647 {-# INLINABLE holdIncremental #-}
2134 {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2135+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . DynamicHold <$> hold 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−--------------------------------------------------------------------------------
2137+data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2658−--------------------------------------------------------------------------------
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2139+data SpiderEventHandle x a = SpiderEventHandle
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2140+ { spiderEventHandleSubscription :: EventSubscription x a
2662−type SpiderEnv = SpiderTimeline
2141+ , spiderEventHandleValue :: IORef (Maybe a)
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2144+instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHostFrame x) where
2664 {-# INLINABLE subscribeEvent #-}
2145 {-# INLINABLE subscribeEvent #-}
2665 subscribeEvent e = SpiderHostFrame $ do
2146 subscribeEvent e = SpiderHostFrame $ do
2666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
2147 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2677,148 +2158,16 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTim
2677 , spiderEventHandleValue = val
2158 , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2161+instance R.ReflexHost (SpiderEnv x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2162+ type EventTrigger (SpiderEnv x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2163+ type EventHandle (SpiderEnv x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2164+ type HostFrame (SpiderEnv x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2166+instance R.MonadReadEvent (SpiderEnv x) (ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2167+ {-# INLINABLE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2168+ readEvent h = 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
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
2718− depthRef <- newIORef 0
2720− return $ STE $ SpiderTimelineEnv
2721− { _spiderTimeline_lock = lock
2722− , _spiderTimeline_eventEnv = env
2724− , _spiderTimeline_depth = depthRef
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2732−data LocalSpiderTimeline (x :: Type) s
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2744−-- | Pass a new timeline to the given function.
2745−withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746−withSpiderTimeline k = do
2747− env <- unsafeNewSpiderTimelineEnv
2748− reify env $ \s -> k $ localSpiderTimeline s env
2750−newtype SpiderPullM (x :: Type) 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)
2756−instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757− {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2762− type PullM (SpiderTimeline x) = SpiderPullM x
2763− type PushM (SpiderTimeline x) = SpiderPushM x
2764− {-# INLINABLE never #-}
2765− never = SpiderEvent eventNever
2766− {-# INLINABLE constant #-}
2767− constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
2769− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772− {-# INLINABLE pull #-}
2773− pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783− {-# INLINABLE switch #-}
2784− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785− {-# INLINABLE coincidence #-}
2786− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2787− {-# INLINABLE current #-}
2788− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789− {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2791− {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793− {-# INLINABLE unsafeBuildIncremental #-}
2794− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799− {-# INLINABLE currentIncremental #-}
2800− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801− {-# INLINABLE updatedIncremental #-}
2802− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803− {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805− c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807− eventCoercion Coercion = Coercion
2808− behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2811− {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813− {-# INLINABLE fanInt #-}
2814− fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2816−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2818−data SpiderEventHandle x a = SpiderEventHandle
2819− { spiderEventHandleSubscription :: EventSubscription x
2820− , spiderEventHandleValue :: IORef (Maybe a)
2170+ readIORef $ spiderEventHandleValue h
2823instance MonadRef (EventM x) where
2172instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2173 type Ref (EventM x) = Ref IO
@@ -2834,7 +2183,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2183 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2185-- | 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)
2186+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2188instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2189 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2192,15 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2192 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2193 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2194 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847− {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852 {-# INLINABLE fail #-}
2195 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2196+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2198-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2199-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2200runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2201+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderEnv
2860−-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861−-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2203+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2205instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2206 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2209,30 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2209 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2210 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2211 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2212 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2213 fail s = SpiderHostFrame $ fail s
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2215+instance R.MonadSample (SpiderEnv x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2216+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2882− notReady = pure ()
2217+
2218+addIdentity :: Event x a -> Event x (Identity a)
2219+--addIdentity = fmap Identity
2220+addIdentity = unsafeCoerce
2222+instance R.MonadHold (SpiderEnv x) (SpiderHostFrame x) where
2223+ {-# INLINABLE hold #-}
2224+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2225+ {-# INLINABLE holdDyn #-}
2226+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2227+ {-# INLINABLE holdIncremental #-}
2228+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2230+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2231newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2232 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2233 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2235+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2236newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2237 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2238 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2243,41 @@ newFanEventWithTriggerIO f = do
2898 return $ EventSelector $ \k -> eventRoot k r
2244 return $ EventSelector $ \k -> eventRoot k r
2246+instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHost x) where
2247+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2248+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2249+ es <- newFanEventWithTriggerIO f
2250+ return $ R.EventSelector $ SpiderEvent . select es
2252+instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHostFrame x) where
2253+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2254+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2255+ es <- newFanEventWithTriggerIO f
2256+ return $ R.EventSelector $ SpiderEvent . select es
2258+instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHost x) where
2259+ {-# INLINABLE subscribeEvent #-}
2260+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2262newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2264+instance R.MonadSample (SpiderEnv x) (ReadPhase x) where
2265+ {-# INLINABLE sample #-}
2266+ sample = ReadPhase . R.sample
2268+instance R.MonadHold (SpiderEnv x) (ReadPhase x) where
2269+ {-# INLINABLE hold #-}
2270+ hold v0 e = ReadPhase $ R.hold v0 e
2271+ {-# INLINABLE holdDyn #-}
2272+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2273+ {-# INLINABLE holdIncremental #-}
2274+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2276+instance R.MonadReflexHost (SpiderEnv x) (SpiderHost x) where
2277+ type ReadPhase (SpiderHost x) = ReadPhase x
2278+ fireEventsAndRead es (ReadPhase a) = run es a
2279+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2281instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2282 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2283 newRef = SpiderHost . newRef
@@ -2916,15 +2295,3 @@ instance MonadRef (SpiderHostFrame x) where
2917instance MonadAtomicRef (SpiderHostFrame x) where
2296instance MonadAtomicRef (SpiderHostFrame x) where
2918 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2297 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2920−instance PrimMonad (SpiderHostFrame x) where
2921− type PrimState (SpiderHostFrame x) = PrimState IO
2922− primitive = SpiderHostFrame . EventM . primitive
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()