@@ -2,132 +2,77 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE ConstraintKinds #-}
4{-# LANGUAGE EmptyDataDecls #-}
4{-# LANGUAGE EmptyDataDecls #-}
5−{-# LANGUAGE ExistentialQuantification #-}
6{-# LANGUAGE FlexibleContexts #-}
5{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
8{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE FunctionalDependencies #-}
9{-# LANGUAGE GADTs #-}
8{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
10{-# LANGUAGE LambdaCase #-}
11+{-# LANGUAGE MagicHash #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
12{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE ScopedTypeVariables #-}
16{-# LANGUAGE ScopedTypeVariables #-}
15{-# LANGUAGE TypeFamilies #-}
17{-# LANGUAGE TypeFamilies #-}
16{-# LANGUAGE TypeOperators #-}
18{-# LANGUAGE TypeOperators #-}
17{-# LANGUAGE UndecidableInstances #-}
19{-# 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
20-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
29-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
21-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30−module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
22+module Reflex.Spider.Internal where
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
24+import Control.Applicative
35import Control.Concurrent
25import Control.Concurrent
36import Control.Exception
26import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
27+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
38import Control.Monad.Exception
28import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
29+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
40import Control.Monad.Primitive
30import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
31+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
32import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
33import Data.Align
48import Data.Coerce
34import Data.Coerce
49−import Data.Dependent.Map (DMap)
35+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
36import 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_)
37import Data.Foldable hiding (concat, elem, sequence_)
55import Data.Functor.Constant
39import Data.Functor.Constant
56−import Data.Functor.Misc
57import Data.Functor.Product
40import Data.Functor.Product
58import Data.GADT.Compare
41import Data.GADT.Compare
59import Data.IntMap.Strict (IntMap)
42import Data.IntMap.Strict (IntMap)
60import qualified Data.IntMap.Strict as IntMap
43import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
44import Data.IORef
62−import Data.Kind (Type)
45+import Data.List hiding (foldl')
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
46+import Data.Maybe
47+import Data.Monoid ((<>))
65−import Data.Proxy
48+import Data.Some (Some)
49+import qualified Data.Some as Some
66import Data.These
50import Data.These
67import Data.Traversable
51import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
52+import Data.Type.Coercion
69−import Data.Witherable (Filterable, mapMaybe)
53+import Data.Word
70−import GHC.Exts hiding (toList)
54+import GHC.Exts
71import GHC.IORef (IORef (..))
55import GHC.IORef (IORef (..))
72import GHC.Stack
56import GHC.Stack
73−import Reflex.FastWeak
74import System.IO.Unsafe
57import System.IO.Unsafe
75import System.Mem.Weak
58import System.Mem.Weak
76import Unsafe.Coerce
59import 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
61#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
62import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
63import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
64import qualified Data.List.NonEmpty as NonEmpty
65+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
66import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
67+#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)
69+import Data.WeakBag (WeakBag, WeakBagTicket)
104import qualified Data.WeakBag as WeakBag
70import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
106import qualified Reflex.Class as R
71import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
72+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
74+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
120−debugStrLn :: String -> IO ()
75+import Prelude hiding (any, concat, mapM, mapM_, sequence)
121−debugStrLn = putStrLn
123−#ifdef DEBUG_TRACE_EVENTS
124−withStackOneLine :: (BS8.ByteString -> a) -> a
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
77debugPropagate :: Bool
@@ -136,42 +81,31 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
81debugInvalidate :: Bool
138#ifdef DEBUG
83#ifdef DEBUG
139#define DEBUG_NODEIDS
85#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
87debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
89debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
91debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
93class HasNodeId a where
160 getNodeId :: a -> Int
94 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
96+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
97 getNodeId = holdNodeId
99+instance HasNodeId (PushSubscribed x a b) where
100+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
102instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
103 getNodeId = switchSubscribedNodeId
105+instance HasNodeId (MergeSubscribed x a) where
106+ getNodeId = mergeSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
108+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
109 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
111instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +119,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
120{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
121showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
122+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
124+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
125+showSubscriberType = \case
192−
126+ SubscriberPush _ _ -> "SubscriberPush"
127+ SubscriberMerge _ _ -> "SubscriberMerge"
128+ SubscriberFan _ -> "SubscriberFan"
129+ SubscriberMergeChange _ -> "SubscriberMergeChange"
130+ SubscriberHold _ -> "SubscriberHold"
131+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
132+ SubscriberSwitch _ -> "SubscriberSwitch"
133+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
134+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
135+ SubscriberHandle -> "SubscriberHandle"
137+showEventType :: Event x a -> String
138+showEventType = \case
139+ EventRoot _ _ -> "EventRoot"
140+ EventNever -> "EventNever"
141+ EventPush _ -> "EventPush"
142+ EventMerge _ -> "EventMerge"
143+ EventFan _ _ -> "EventFan"
144+ EventSwitch _ -> "EventSwitch"
145+ EventCoincidence _ -> "EventCoincidence"
146+ EventHold _ -> "EventHold"
147+ EventDyn _ -> "EventDyn"
148+ EventHoldIdentity _ -> "EventHoldIdentity"
149+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
153debugPropagate = False
197debugInvalidateHeight = False
155debugInvalidateHeight = False
198debugInvalidate = False
157debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
159-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +161,6 @@ debugInvalidate = False
202showNodeId :: a -> String
161showNodeId :: a -> String
203showNodeId _ = ""
162showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
166#ifdef DEBUG_NODEIDS
@@ -215,200 +170,93 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
171newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
172newNodeId = 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 ()
174+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
175+unsafeNodeId :: a -> Int
176+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
181--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
183--------------------------------------------------------------------------------
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
240−{-# INLINE subscribeAndRead #-}
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
185+newtype Event x a = Event { subscribeAndRead :: 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
187-- | 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
188-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
189-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
190+{-# INLINABLE pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
191+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
192+pushCheap f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
193+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
194 { subscriberPropagate = \a -> do
258− mb <- f a
195+ mb <- runComputeM $ f a
259 mapM_ (subscriberPropagate sub) mb
196 mapM_ (subscriberPropagate sub) mb
261− occ' <- join <$> mapM f occ
198+ occ' <- join <$> mapM (runComputeM . f) occ
262 return (subscription, occ')
199 return (subscription, occ')
264−-- | A subscriber that never triggers other 'Event's
265−{-# INLINE terminalSubscriber #-}
266−terminalSubscriber :: (a -> EventM x ()) -> Subscriber x a
267−terminalSubscriber p = Subscriber
268− { subscriberPropagate = p
269− , subscriberInvalidateHeight = \_ -> return ()
270− , subscriberRecalculateHeight = \_ -> return ()
273−-- | Subscribe to an Event only for the duration of one occurrence
274−{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276−subscribeAndReadHead e sub = do
277− subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279− { subscriberPropagate = \a -> do
280− liftIO $ unsubscribe =<< readIORef subscriptionRef
281− subscriberPropagate sub a
283− liftIO $ case occ of
284− Nothing -> writeIORef subscriptionRef $! subscription
285− Just _ -> unsubscribe subscription
286− return (subscription, occ)
288−--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
291− parent <- liftIO $ newIORef $ Just originalE
292− defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293− let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295− when (isJust occ) clearParent
296− return $ Event $ \sub ->
297− liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
299− Just e -> subscribeAndReadHead e sub
301data CacheSubscribed x a
201data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
202+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
203+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
204 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
205+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
206 , _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
209-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
210-- repeatedly
328--TODO: Try a caching strategy where we subscribe directly to the parent when
212--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
213+--there's only one subscriber, and then build our own WeakBag only when a second
330--subscriber joins
214--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
215+{-# INLINABLE cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
216+cacheEvent :: Event x a -> Event x a
333−cacheEvent e =
217+cacheEvent e = Event $ \sub -> do
334−#ifdef DEBUG_TRACE_EVENTS
218+ let !mSubscribedRef = unsafeNewIORef e Nothing
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
219+ mSubscribed <- liftIO $ readIORef mSubscribedRef
347− Just subscribedTicket -> return subscribedTicket
220+ case mSubscribed of
348− Nothing -> do
221+ Just subscribed -> liftIO $ do
349−#ifdef DEBUG_NODEIDS
222+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
350− nodeId <- liftIO newNodeId
223+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
351−#endif
224+ let es = EventSubscribed
352− subscribers <- liftIO FastWeakBag.empty
225+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
353− occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
226+ , eventSubscribedRetained = toAny subscribed
354−#ifdef DEBUG_NODEIDS
227+ }
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
228+ return (EventSubscription (Just ticket) es, occ)
356−#else
229+ Nothing -> do
230+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
231+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
232+ occRef <- liftIO $ newIORef undefined
357− (parentSub, occ) <- subscribeAndRead e $ Subscriber
233+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
234+ { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
235+ liftIO $ writeIORef occRef $ Just a
361− scheduleClear occRef
236+ scheduleClear occRef
362− propagateFast a subscribers
237+ propagate a subscribers
238+ , subscriberInvalidateHeight = \old -> do
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
239+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
240+ , subscriberRecalculateHeight = \new -> do
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
241+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
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
410− return (es, occ)
243+ liftIO $ writeIORef occRef occ
244+ when (isJust occ) $ scheduleClear occRef
245+ let !subscribed = CacheSubscribed
246+ { _cacheSubscribed_subscribers = subscribers
247+ , _cacheSubscribed_weakSelf = weakSelf
248+ , _cacheSubscribed_parent = parentSub
249+ , _cacheSubscribed_cached = mSubscribedRef
250+ , _cacheSubscribed_occurrence = occRef
252+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
253+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
254+ return (EventSubscription (Just ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
256+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
257+cleanupCacheSubscribed self = do
258+ unsubscribe $ _cacheSubscribed_parent self
259+ writeIORef (_cacheSubscribed_cached self) Nothing
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
261subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
262subscribe e s = fst <$> subscribeAndRead e s
@@ -418,34 +266,34 @@ wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTi
418wrap tag getSpecificSubscribed sub = do
266wrap tag getSpecificSubscribed sub = do
419 (sln, subd, occ) <- getSpecificSubscribed sub
267 (sln, subd, occ) <- getSpecificSubscribed sub
420 let es = tag subd
268 let es = tag subd
421− return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
269+ return (EventSubscription (Just sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
271+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
272eventRoot !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
274eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
275+eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
277+eventMerge :: GCompare k => Merge x k -> Event x (DMap k Identity)
278+eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
280+eventFan :: GCompare k => k a -> Fan x k -> Event x a
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
281eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
283+eventSwitch :: Switch x a -> Event x a
436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
284eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
286+eventCoincidence :: Coincidence x a -> Event x a
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
287eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
441eventHold :: Hold x p -> Event x p
289eventHold :: Hold x p -> Event x p
442eventHold !h = Event $ subscribeHoldEvent h
290eventHold !h = Event $ subscribeHoldEvent h
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
292+eventDyn :: R.Patch p => Dyn x p -> Event x p
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
293eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
447{-# INLINE subscribeCoincidenceInner #-}
295{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
296+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
297subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
298 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
299 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +312,150 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
312 , subscriberRecalculateHeight :: !(Height -> IO ())
315+--TODO: Move this comment to WeakBag
316+-- These function are constructor functions that are marked NOINLINE so they are
317+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
318+-- so any weak references that are attached to the constructors will have their
319+-- finalizer run. Using the opaque constructor, does not see the
320+-- constructor application, so it behaves like an IORef and cannot be fused away.
322+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
323+-- the weak pointer to it in some cases.
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
325+newSubscriberHold :: R.Patch p => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
326newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
327 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470 , subscriberInvalidateHeight = \_ -> return ()
328 , subscriberInvalidateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
329 , subscriberRecalculateHeight = \_ -> return ()
332+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
333+newSubscriberMerge k subscribed = return $ Subscriber
334+ { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
335+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
336+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
337+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
338+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
339+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
340+ when (DMap.null oldM) $ do -- Only schedule the firing once
341+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
342+ --TODO: assertions about height
343+ currentHeight <- getCurrentHeight
344+ when (height <= currentHeight) $ do
345+ if height /= invalidHeight
347+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
348+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
351+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
352+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
353+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
357+ error $ "Causality loop found" <> cycleInfo
358+ scheduleMerge height subscribed
359+ , subscriberInvalidateHeight = \old -> do
360+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
361+ removeMergeHeight old subscribed
362+ invalidateMergeHeight subscribed
363+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
364+ , subscriberRecalculateHeight = \new -> do
365+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
366+ addMergeHeight new subscribed
367+ revalidateMergeHeight subscribed
368+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
371+newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap k (Event x)))
372+newSubscriberMergeChange subscribed = return $ Subscriber
373+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
374+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
375+ defer $ SomeMergeUpdate (mkUpdateMerge a subscribed) (invalidateMergeHeight subscribed) (revalidateMergeHeight subscribed)
376+ , subscriberInvalidateHeight = \_ -> return ()
377+ , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
380+newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
381+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
382 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
383 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
384+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
385 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
386 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
387+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
388 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
389 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
390 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
391 return ()
486 , subscriberInvalidateHeight = \old -> do
392 , subscriberInvalidateHeight = \old -> do
393+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
394 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
395+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
396+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
397 , subscriberRecalculateHeight = \new -> do
398+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
399 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
400+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
401+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
404+newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
405+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
406 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
407+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
408 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
409 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
410 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
411 , subscriberInvalidateHeight = \_ -> do
412+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
413 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
414 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
415 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
416+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
417+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
418+ , subscriberRecalculateHeight = \new -> do
419+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
420+ updateSwitchHeight new subscribed
421+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
424+newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
425+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
426 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
427+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
428 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
429+ tracePropagate $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
430 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
431+ tracePropagate $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
432+ tracePropagate $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
433 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
434 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
435 case occ of
520− Nothing ->
436+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
437 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
438 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
439+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
440+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
441 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
442 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
443 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
444 propagate o $ coincidenceSubscribedSubscribers subscribed
445+ , subscriberInvalidateHeight = \_ -> do
446+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
447+ invalidateCoincidenceHeight subscribed
448+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
449+ , subscriberRecalculateHeight = \_ -> do
450+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
451+ recalculateCoincidenceHeight subscribed
452+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
455+newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
456+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
457 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
458+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
459 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
460 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
461 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +463,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
463 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
464 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
465 propagate a $ coincidenceSubscribedSubscribers subscribed
466+ , subscriberInvalidateHeight = \_ -> do
467+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
468+ invalidateCoincidenceHeight subscribed
469+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
470+ , subscriberRecalculateHeight = \_ -> do
471+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
472+ recalculateCoincidenceHeight subscribed
473+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
476invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +480,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
480recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
482-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
483+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
484+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
485 -- 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
486 --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
487+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
489--------------------------------------------------------------------------------
568-- EventSubscribed
490-- EventSubscribed
@@ -571,16 +493,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571toAny :: a -> Any
493toAny :: a -> Any
572toAny = unsafeCoerce
494toAny = unsafeCoerce
574−-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575−-- existential type? Sadly, GHC does not currently know how to unbox types
576−-- with existentially quantified fields. So instead we just coerce values
577−-- to type Any on the way in. Since we never coerce them back, this is
579data EventSubscribed x = EventSubscribed
496data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
497 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
498 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
499#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
500+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
501 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
502 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +524,26 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
524 , eventSubscribedWhoCreated = return ["never"]
610−eventSubscribedNow :: EventSubscribed x
527+
611−eventSubscribedNow = EventSubscribed
528+eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x
529+eventSubscribedMerge !subscribed = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
530+ { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
613− , eventSubscribedRetained = toAny ()
531+ , eventSubscribedRetained = toAny subscribed
614#ifdef DEBUG_CYCLES
532#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
533+ , eventSubscribedGetParents = do
534+ ps <- readIORef $ mergeSubscribedParents subscribed
535+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
616− , eventSubscribedHasOwnHeightRef = False
536+ , eventSubscribedHasOwnHeightRef = True
617− , eventSubscribedWhoCreated = return ["now"]
537+ , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
541+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
542eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
543 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
544 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
545#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
546+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
547 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
548 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +556,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
556#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
557 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
558 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
559+ return [Some.This $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
560 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
561 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +569,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
569#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
570 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
571 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
572+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
573+ innerParents = maybeToList $ fmap Some.This innerSubscription
654 return $ outerParent : innerParents
574 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
575 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
576 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,29 +584,41 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
584whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
585whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
587+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
588walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
589+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
590 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
591 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
592 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
593+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
594 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
595+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
596 return subscribers
679{-# INLINE subscribeHoldEvent #-}
599{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
600+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681subscribeHoldEvent = subscribeAndRead . holdEvent
601subscribeHoldEvent = subscribeAndRead . holdEvent
603+--------------------------------------------------------------------------------
605+--------------------------------------------------------------------------------
607+data EventSubscription x = EventSubscription
608+ { _eventSubscription_ticket :: !(Maybe WeakBagTicket)
609+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
612+unsubscribe :: EventSubscription x -> IO ()
613+unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
683--------------------------------------------------------------------------------
615--------------------------------------------------------------------------------
684-- Behavior
616-- Behavior
685--------------------------------------------------------------------------------
617--------------------------------------------------------------------------------
687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
619newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
621+behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
690behaviorHold !h = Behavior $ readHoldTracked h
622behaviorHold !h = Behavior $ readHoldTracked h
692behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
624behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -700,7 +632,7 @@ behaviorPull !p = Behavior $ do
700 val <- liftIO $ readIORef $ pullValue p
632 val <- liftIO $ readIORef $ pullValue p
701 case val of
633 case val of
702 Just subscribed -> do
634 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
635+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
636 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
637 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706 return $ pullSubscribedValue subscribed
638 return $ pullSubscribedValue subscribed
@@ -709,7 +641,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
641 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
642 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
643 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
644+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
645 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
646 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
647 let subscribed = PullSubscribed
@@ -719,22 +651,22 @@ behaviorPull !p = Behavior $ do
719 , pullSubscribedParents = parents
651 , pullSubscribedParents = parents
721 liftIO $ writeIORef (pullValue p) $ Just subscribed
653 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
654+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
657+behaviorDyn :: R.Patch p => Dyn x p -> Behavior x (R.PatchTarget p)
726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
658behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
728{-# INLINE readHoldTracked #-}
660{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
661+readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
730readHoldTracked h = do
662readHoldTracked h = do
731 result <- liftIO $ readIORef $ holdValue h
663 result <- liftIO $ readIORef $ holdValue h
732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
664 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
665+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734− liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735 return result
666 return result
668+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
737−{-# INLINABLE readBehaviorUntracked #-}
669+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
670readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739readBehaviorUntracked b = do
671readBehaviorUntracked b = do
740 holdInits <- getDeferralQueue
672 holdInits <- getDeferralQueue
@@ -744,49 +676,45 @@ readBehaviorUntracked b = do
744-- Dynamic
676-- Dynamic
745--------------------------------------------------------------------------------
677--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
679+data Dynamic x p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
680+ { dynamicCurrent :: !(Behavior x (R.PatchTarget p))
751− , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
681+ , dynamicUpdated :: !(Event x p)
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
759−dynamicHold :: Hold x p -> DynamicS x p
684+dynamicHold :: Hold x p -> Dynamic x p
760dynamicHold !h = Dynamic
685dynamicHold !h = Dynamic
761 { dynamicCurrent = behaviorHold h
686 { dynamicCurrent = behaviorHold h
762 , dynamicUpdated = eventHold h
687 , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
690+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766dynamicHoldIdentity = dynamicHold
691dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
693+dynamicConst :: R.PatchTarget p -> Dynamic x p
769dynamicConst !a = Dynamic
694dynamicConst !a = Dynamic
770 { dynamicCurrent = behaviorConst a
695 { dynamicCurrent = behaviorConst a
771 , dynamicUpdated = eventNever
696 , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
699+dynamicDyn :: R.Patch p => Dyn x p -> Dynamic x p
775dynamicDyn !d = Dynamic
700dynamicDyn !d = Dynamic
776 { dynamicCurrent = behaviorDyn d
701 { dynamicCurrent = behaviorDyn d
777 , dynamicUpdated = eventDyn d
702 , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
705+dynamicDynIdentity :: Dyn x (Identity a) -> Dynamic x (Identity a)
781dynamicDynIdentity = dynamicDyn
706dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
708--------------------------------------------------------------------------------
784-- Combinators
709-- Combinators
785--------------------------------------------------------------------------------
710--------------------------------------------------------------------------------
712+--TODO: Figure out why certain things are not 'representational', then make them
713+--representational so we can use coerce
787--type role Hold representational
715--type role Hold representational
788data Hold x p
716data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
717+ = Hold { holdValue :: !(IORef (R.PatchTarget p))
790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
718 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
719 , 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
720 , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
@@ -795,57 +723,22 @@ data Hold x p
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
726data EventEnv x
727+ = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
728+ , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
729 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
730 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
731 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
732+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
733+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
734 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
735 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
736+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
843{-# INLINE runEventM #-}
739{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
740+runEventM :: EventM x a -> EventEnv x -> IO a
845−runEventM = unEventM
741+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
743class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
744 getDeferralQueue :: m (IORef [a])
@@ -856,87 +749,81 @@ defer a = do
856 q <- getDeferralQueue
749 q <- getDeferralQueue
857 liftIO $ modifyIORef' q (a:)
750 liftIO $ modifyIORef' q (a:)
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
752+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 #-}
753 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
754+ getDeferralQueue = EventM $ asks eventEnvAssignments
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
756+instance Defer (SomeHoldInit x) (EventM x) where
868 {-# INLINE getDeferralQueue #-}
757 {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
758+ getDeferralQueue = EventM $ asks eventEnvHoldInits
871instance Defer (SomeHoldInit x) (BehaviorM x) where
760instance Defer (SomeHoldInit x) (BehaviorM x) where
872 {-# INLINE getDeferralQueue #-}
761 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
762 getDeferralQueue = BehaviorM $ asks snd
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
764+instance Defer (SomeMergeUpdate x) (EventM x) where
876 {-# INLINE getDeferralQueue #-}
765 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
766+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
768+instance Defer (SomeMergeInit x) (EventM x) where
880 {-# INLINE getDeferralQueue #-}
769 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
770+ getDeferralQueue = EventM $ asks eventEnvMergeInits
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
772+class HasCurrentHeight x m | m -> x where
884 getCurrentHeight :: m Height
773 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
774+ scheduleMerge :: Height -> MergeSubscribed x a -> m ()
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
776+instance HasCurrentHeight x (EventM x) where
888 {-# INLINE getCurrentHeight #-}
777 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
778+ getCurrentHeight = EventM $ do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
779+ heightRef <- asks eventEnvCurrentHeight
891 liftIO $ readIORef heightRef
780 liftIO $ readIORef heightRef
892 {-# INLINE scheduleMerge #-}
781 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
782+ scheduleMerge height subscribed = EventM $ do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
783+ delayedRef <- asks eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
784+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
897−class HasSpiderTimeline x where
786+class HasSpiderTimeline x m | m -> x where
898− -- | Retrieve the current SpiderTimelineEnv
787+ -- | Retrieve the current SpiderTimeline
899− spiderTimeline :: SpiderTimelineEnv x
788+ askSpiderTimeline :: m (SpiderTimeline x)
901−instance HasSpiderTimeline Global where
790+instance HasSpiderTimeline x (EventM x) where
902− spiderTimeline = globalSpiderTimelineEnv
791+ {-# INLINE askSpiderTimeline #-}
792+ askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
794+instance HasSpiderTimeline x (SpiderHost x) where
795+ {-# INLINE askSpiderTimeline #-}
796+ askSpiderTimeline = SpiderHost ask
798+putCurrentHeight :: Height -> EventM x ()
905−putCurrentHeight h = do
799+putCurrentHeight h = EventM $ do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
800+ heightRef <- asks eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
801 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
803+instance Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
804 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
805+ getDeferralQueue = EventM $ asks eventEnvClears
913{-# INLINE scheduleClear #-}
807{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
808+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
809+scheduleClear r = defer $ SomeClear r
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918− {-# INLINE getDeferralQueue #-}
919− getDeferralQueue = asksEventEnv eventEnvIntClears
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
811+instance Defer SomeRootClear (EventM x) where
926 {-# INLINE getDeferralQueue #-}
812 {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
813+ getDeferralQueue = EventM $ asks eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
815{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
816+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
817+scheduleRootClear r = defer $ SomeRootClear r
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
819+instance Defer (SomeResetCoincidence x) (EventM x) where
934 {-# INLINE getDeferralQueue #-}
820 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
821+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
823-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
824+{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
825+{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> ComputeM x (Hold x p) #-}
939−hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
826+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
940hold v0 e = do
827hold v0 e = do
941 valRef <- liftIO $ newIORef v0
828 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
829 invsRef <- liftIO $ newIORef []
@@ -957,7 +844,7 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
846{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
847+getHoldEventSubscription :: forall m p 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, HasSpiderTimeline x m, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961getHoldEventSubscription h = do
848getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
849 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
850 case ep of
@@ -971,7 +858,7 @@ getHoldEventSubscription h = do
971 Nothing -> return ()
858 Nothing -> return ()
972 Just o -> do
859 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
860 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
861+ case R.apply o old of
975 Nothing -> return ()
862 Nothing -> return ()
976 Just new -> do
863 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
864 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +870,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
871type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
873+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
874-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
875+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
877instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
878 {-# INLINE (>>=) #-}
@@ -994,16 +881,14 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
881 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
882 {-# INLINE return #-}
996 return x = BehaviorM $ return x
883 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
884 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
885 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
887data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
888 = forall p. BehaviorSubscribedHold (Hold x p)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
889 | BehaviorSubscribedPull (PullSubscribed x a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
891+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1008--type role PullSubscribed representational
893--type role PullSubscribed representational
1009data PullSubscribed x a
894data PullSubscribed x a
@@ -1038,15 +923,13 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
926+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
927 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
928 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
929 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
932+data SomeHoldInit x = forall p. R.Patch p => SomeHoldInit !(Hold x p)
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
1051data SomeMergeUpdate x = SomeMergeUpdate
934data SomeMergeUpdate x = SomeMergeUpdate
1052 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
935 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
@@ -1057,14 +940,21 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
940newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
942-- 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)
943+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
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
945+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
947+instance Defer (SomeHoldInit x) (ComputeM x) where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
948+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
949+
1067− }
950+{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
951+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
952+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
954+data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x) !(Subscriber x a)
956+mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x
957+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1069data HeightBag = HeightBag
959data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
960 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +972,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
972heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
974heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
975+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
977heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
978heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +981,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
981 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
982 _ -> 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
984heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
985heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
986 Just ((h, _), _) -> Height h
@@ -1116,25 +998,46 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
998heightBagVerify = id
1001+data MergeSubscribed x k
1002+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
1003+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1004+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
1005+ , mergeSubscribedHeight :: !(IORef Height)
1006+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
1007+ , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
1008+ , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap k (Event x)), EventSubscribed x))
1009+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
1010+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
1011+#ifdef DEBUG_NODEIDS
1012+ , mergeSubscribedNodeId :: Int
1016+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
1018+ = Merge { mergeParents :: !(Dynamic x (R.PatchDMap k (Event x)))
1019+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
1022+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1023+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1024+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1025+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
1028+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1029+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1030+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1031+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129 , fanSubscribedParent :: !(EventSubscription x)
1032 , fanSubscribedParent :: !(EventSubscription x)
1130#ifdef DEBUG_NODEIDS
1033#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
1034 , fanSubscribedNodeId :: Int
1135−data Fan x k v
1038+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
1039+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1040+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
1043data SwitchSubscribed x a
@@ -1158,9 +1061,7 @@ data Switch x a
1158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1061 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1064{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164data CoincidenceSubscribed x a
1065data CoincidenceSubscribed x a
1165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1066 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1067 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +1089,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1089newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189newInvalidatorPull p = return $! InvalidatorPull p
1090newInvalidatorPull p = return $! InvalidatorPull p
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1092+instance R.FunctorMaybe (Event x) where
1192− mapMaybe f = push $ return . f
1093+ fmapMaybe f = push $ return . f
1194−instance HasSpiderTimeline x => Align (Event x) where
1095+instance Align (Event x) where
1195 nil = eventNever
1096 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1097+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
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)
1099+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (R.PatchTarget p), Event x p) (Hold 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)
1101+newMapDyn :: (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1216−newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1102+newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1218--TODO: Avoid the duplication between this and R.zipDynWith
1104--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)
1105+zipDynWith :: (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1220zipDynWith f da db =
1106zipDynWith f da db =
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1107 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1222 ec = flip push eab $ \o -> do
1108 ec = flip push eab $ \o -> do
@@ -1229,70 +1115,75 @@ zipDynWith f da db =
1229 return (a, b)
1115 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1116 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
1117 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1118+ in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1120+unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1235−buildDynamic readV0 v' = do
1121+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1122+ 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
1124+newJoinDyn :: Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1242−unsafeBuildDynamic readV0 v' =
1125+newJoinDyn d =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1126+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1127+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1128+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1129+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1130+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1131+ in unsafeDyn readV0 v'
1245-- ResultM can read behaviors and events
1133-- ResultM can read behaviors and events
1246type ResultM = EventM
1134type ResultM = EventM
1136+{-# NOINLINE unsafeNewIORef #-}
1137+unsafeNewIORef :: a -> b -> IORef b
1138+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248−instance HasSpiderTimeline x => Functor (Event x) where
1140+instance Functor (Event x) where
1249 fmap f = push $ return . Just . f
1141 fmap f = push $ return . Just . f
1251instance Functor (Behavior x) where
1143instance Functor (Behavior x) where
1252 fmap f = pull . fmap f . readBehaviorTracked
1144 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
1146+{-# INLINABLE 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
1147+push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256push f e = cacheEvent (pushCheap f e)
1148push f e = cacheEvent (pushCheap f e)
1150+push f e = eventPush $ Push
1153+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1155+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258{-# INLINABLE pull #-}
1158{-# INLINABLE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1159pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1265− pure $ behaviorPull $ Pull
1160+pull a = behaviorPull $ Pull
1266− { pullCompute = a
1161+ { pullCompute = a
1267− , pullValue = ref
1162+ , pullValue = unsafeNewIORef a Nothing
1268#ifdef DEBUG_NODEIDS
1163#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1164+ , pullNodeId = unsafeNodeId a
1273{-# INLINABLE switch #-}
1168{-# INLINABLE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1169+switch :: Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1170+switch a = eventSwitch $ Switch
1278− { switchParent = a
1171+ { switchParent = a
1279− , switchSubscribed = ref
1172+ , switchSubscribed = unsafeNewIORef a Nothing
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1175+coincidence :: Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1176+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1177+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1178+ , 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
1181-- 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
1182+run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1183run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1184+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1185+ spiderTimeline <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1186+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1187 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1188 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1189 occBefore <- readIORef occRef
@@ -1304,40 +1195,43 @@ run roots after = do
1304 else return Nothing
1195 else return Nothing
1305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1196 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306 propagate a subscribersRef
1197 propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
1198+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308 let go = do
1199 let go = do
1309 delayed <- liftIO $ readIORef delayedRef
1200 delayed <- liftIO $ readIORef delayedRef
1310 case IntMap.minViewWithKey delayed of
1201 case IntMap.minViewWithKey delayed of
1311 Nothing -> return ()
1202 Nothing -> return ()
1312 Just ((currentHeight, cur), future) -> do
1203 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
1204+ tracePropagate $ "Running height " ++ show currentHeight
1314 putCurrentHeight $ Height currentHeight
1205 putCurrentHeight $ Height currentHeight
1315 liftIO $ writeIORef delayedRef $! future
1206 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
1207+ forM_ cur $ \d -> case d of
1208+ DelayedMerge subscribed -> do
1209+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1210+ case height `compare` Height currentHeight of
1211+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1212+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1214+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1215+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1216+ --TODO: Assert that m is not empty
1217+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1218+ scheduleClear $ mergeSubscribedOccurrence subscribed
1219+ propagate m $ mergeSubscribedSubscribers subscribed
1319 putCurrentHeight maxBound
1222 putCurrentHeight maxBound
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
1224+ tracePropagate "Done running an event frame"
1322 return result
1225 return result
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1227+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))
1229+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
1231data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1233+data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1341debugFinalize :: Bool
1235debugFinalize :: Bool
1342debugFinalize = False
1236debugFinalize = False
@@ -1346,110 +1240,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1240 x' <- evaluate x
1347 mkWeakPtr x' $
1241 mkWeakPtr x' $
1348 if debugFinalize
1242 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1243+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1244 else Nothing
1352type WeakList a = [Weak a]
1246type WeakList a = [Weak a]
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1381{-# INLINE withIncreasedDepth #-}
1248{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1250+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1251+withIncreasedDepth a = do
1252+ spiderTimeline <- askSpiderTimeline
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1253+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1385 result <- a
1254 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1255+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1387 return result
1256 return result
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1258+withIncreasedDepth :: m a -> m a
1259+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1262+type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1264{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1265+tracePropagate :: (CanTrace x m) => String -> m ()
1420−tracePropagate _ _ = return ()
1266+tracePropagate = traceWhen debugPropagate
1422{-# INLINE traceInvalidate #-}
1268{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1269traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1270+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1272+{-# INLINE traceWhen #-}
1273+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1274+traceWhen b message = traceMWhen b $ return message
1440−{-# INLINE trace #-}
1276+{-# INLINE traceMWhen #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1277+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1442−trace _ _ = return ()
1278+traceMWhen b getMessage = when b $ do
1443−
1279+ message <- getMessage
1444−{-# INLINE traceM #-}
1280+#ifdef DEBUG
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1281+ spiderTimeline <- askSpiderTimeline
1446−traceM _ _ = return ()
1282+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1286+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1288whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1289whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1292groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1293groupByHead = \case
1455 [] -> []
1294 [] -> []
@@ -1460,54 +1299,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1299 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1301listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1302+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 #-}
1305{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1306+propagateSubscriberHold :: R.Patch p => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1307propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1308+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1309 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1310 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1311 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1312+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1313 Nothing -> return ()
1508 Just v' -> do
1314 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1315+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1316 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1317 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1318 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,53 +1320,56 @@ propagateSubscriberHold h a = do
1515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1320data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1322runBehaviorM :: 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)
1323+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1325askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1326askInvalidator = do
1522− (!m, _) <- ask
1327+ (!m, _) <- BehaviorM ask
1523 case m of
1328 case m of
1524 Nothing -> return Nothing
1329 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1330 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1332askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1333askParentsRef = do
1529− (!m, _) <- ask
1334+ (!m, _) <- BehaviorM ask
1530 case m of
1335 case m of
1531 Nothing -> return Nothing
1336 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1337 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1339askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1340askBehaviorHoldInits = do
1536− (_, !his) <- ask
1341+ (_, !his) <- BehaviorM ask
1537 return his
1342 return his
1539{-# INLINE getDynHold #-}
1344{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1345+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
1541getDynHold d = do
1346getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1347 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1348 case mh of
1544− HoldDyn h -> return h
1349+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1350+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1351 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1352 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1353 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1354+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1355 return h
1559-- Always refers to 0
1357-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1358{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1359zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1360zeroRef = unsafePerformIO $ newIORef zeroHeight
1362+type CanSubscribe x m =
1363+ ( HasSpiderTimeline x m
1364+ , HasCurrentHeight x m
1365+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1366+ , Defer SomeClear m -- Wiping out event firings
1367+ , Defer (SomeAssignment x) m -- Updating state
1368+ , 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)
1372+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1373getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1374 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1375 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1383,10 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1383 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1384 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1385 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1386+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1387 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1388 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1389+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1390 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1391 , rootSubscribedCachedSubscribed = cached
1589 , rootSubscribedOccurrence = getOcc
1392 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1394,17 @@ getRootSubscribed k r sub = do
1591 , rootSubscribedUninit = uninit
1394 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1395 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1396#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1397+ , 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)
1400+ 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
1401 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
1609 occ <- getOcc
1402 occ <- getOcc
1610 return (sln, subscribed, occ)
1403 return (sln, subscribed, occ)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1405{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1406cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1407+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1408 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1409 modifyIORef' cached $ DMap.delete k
@@ -1621,90 +1412,78 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
1621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1412subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1413subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1415+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1625−
1416+getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity))
1626−data FanInt x a = FanInt
1417+getMergeSubscribed m sub = do
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
1418+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1419+ case mSubscribed of
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1420+ Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1421+ sln <- subscribeMergeSubscribed subscribed sub
1422+ occ <- readIORef $ mergeSubscribedOccurrence subscribed
1423+ return (sln, subscribed, occ)
1424+ Nothing -> {-# SCC "missMerge" #-} do
1425+ subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1426+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1427+ initialParents <- readBehaviorUntracked $ dynamicCurrent $ mergeParents m
1428+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1429+ s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1430+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1431+ height <- liftIO $ getEventSubscribedHeight parentSubd
1432+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1433+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1434+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1435+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1436+ myHeight = if invalidHeight `elem` heights
1438+ else succHeight $ heightBagMax myHeightBag
1439+ currentHeight <- getCurrentHeight
1440+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1441+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1443+ unless (DMap.null accum) $ do
1444+ scheduleMerge myHeight subscribedUnsafe
1445+ occRef <- liftIO $ newIORef occ
1446+ when (isJust occ) $ scheduleClear occRef
1447+ accumRef <- liftIO $ newIORef accum
1448+ heightRef <- liftIO $ newIORef myHeight
1449+ heightMapRef <- liftIO $ newIORef myHeightBag
1450+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1451+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1452+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1453+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1454+ let !subscribed = MergeSubscribed
1455+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1456+ , mergeSubscribedOccurrence = occRef
1457+ , mergeSubscribedAccum = accumRef
1458+ , mergeSubscribedHeight = heightRef
1459+ , mergeSubscribedHeightBag = heightMapRef
1460+ , mergeSubscribedSubscribers = subs
1461+ , mergeSubscribedChange = changeSubdRef
1462+ , mergeSubscribedParents = parentsRef
1463+ , mergeSubscribedWeakSelf = weakSelf
1630#ifdef DEBUG_NODEIDS
1464#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1465+ , mergeSubscribedNodeId = unsafeNodeId m
1468+ defer $ SomeMergeInit $ mkInitMerge subscribed $ dynamicUpdated $ mergeParents m
1469+ liftIO $ writeIORef subscribedRef $! subscribed
1470+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1471+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1472+ return (sln, subscribed, occ)
1635−newFanInt :: IO (FanInt x a)
1474+cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1636−newFanInt = do
1475+cleanupMergeSubscribed subscribed = do
1637− subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1476+ parents <- readIORef $ mergeSubscribedParents subscribed
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1477+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1478+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1640−#ifdef DEBUG_NODEIDS
1479+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1641− nodeId <- newNodeId
1644− { _fanInt_subscribers = subscribers
1645− , _fanInt_subscriptionRef = subscriptionRef
1646− , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660− { subscriberPropagate = \m -> do
1661− liftIO $ writeIORef (_fanInt_occRef self) m
1662− scheduleIntClear $ _fanInt_occRef self
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1665− subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1669− subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1673− subscriberRecalculateHeight s new
1676− writeIORef (_fanInt_subscriptionRef self) subscription
1677− writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678− scheduleIntClear $ _fanInt_occRef self
1680− b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1682− b <- FastWeakBag.empty
1683− FastMutableIntMap.insert (_fanInt_subscribers self) k b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1687− currentOcc <- readIORef (_fanInt_occRef self)
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1692−fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1694− subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1696− { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697− , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1481+{-# INLINE subscribeMergeSubscribed #-}
1482+subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO WeakBagTicket
1483+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1706−{-# INLINABLE getFanSubscribed #-}
1485+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1486+getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
1708getFanSubscribed k f sub = do
1487getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1488 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1489 case mSubscribed of
@@ -1722,16 +1501,13 @@ getFanSubscribed k f sub = do
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1501 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723 occRef <- liftIO $ newIORef parentOcc
1502 occRef <- liftIO $ newIORef parentOcc
1724 when (isJust parentOcc) $ scheduleClear occRef
1503 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1504 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1505 { fanSubscribedCachedSubscribed = fanSubscribed f
1730 , fanSubscribedOccurrence = occRef
1506 , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1507 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1508 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1509#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1510+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1513 let !self = (k, subscribed)
@@ -1741,7 +1517,7 @@ getFanSubscribed k f sub = do
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1517 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1518 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1520+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1521cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1522 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1523 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1529,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1529 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1531{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1532+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1757subscribeFanSubscribed k subscribed sub = do
1533subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1534 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1535 case DMap.lookup k subscribers of
@@ -1765,8 +1541,8 @@ subscribeFanSubscribed k subscribed sub = do
1765 return sln
1541 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1542 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1544+{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a) #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1545+getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x m, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1770getSwitchSubscribed s sub = do
1546getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1547 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1548 case mSubscribed of
@@ -1791,9 +1567,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1567 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1568 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1569 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1570 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1571 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1572 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1579,7 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1579 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1580 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1581#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1582+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1585 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1597,8 @@ cleanupSwitchSubscribed subscribed = do
1824subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1597subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1598subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1600+{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a) #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1601+getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1829getCoincidenceSubscribed c sub = do
1602getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1603 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1604 case mSubscribed of
@@ -1851,9 +1624,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1624 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1625 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1626 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1627 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1628 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1629 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1634,7 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1634 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1635 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1636#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1637+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1640 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,511 +1651,121 @@ cleanupCoincidenceSubscribed subscribed = do
1881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1651subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1652subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1654+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1655+merge :: GCompare k => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1886− => (forall a. q a -> Event x (v a))
1656+merge m = eventMerge $ Merge
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1657+ { mergeParents = m
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1658+ , 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 }
1661newtype 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
1663+fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
1664+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
1665 let f = Fan
2288 { fanParent = e
1666 { fanParent = e
2289− , fanSubscribed = ref
1667+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1669+ in EventSelector $ \k -> eventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1671+runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1672+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1673 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1674 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1675+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1676 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1677 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1678 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
2304 mapM_ unSomeMergeInit mergeInits
1679 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1680+ runHoldInits holdInitRef mergeInitRef
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1682+initHold :: SomeHoldInit x -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1683initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
1685+mkInitMerge :: GCompare k => MergeSubscribed x k -> Event x (R.PatchDMap k (Event x)) -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1686+mkInitMerge subscribed changed = do
1687+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1688+ (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1689+ forM_ change $ \c -> defer $ SomeMergeUpdate (mkUpdateMerge c subscribed) (invalidateMergeHeight subscribed) (revalidateMergeHeight subscribed)
1690+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
1692+mkUpdateMerge :: forall k x. GCompare k => R.PatchDMap k (Event x) -> MergeSubscribed x k -> EventM x [EventSubscription x]
1693+mkUpdateMerge (R.PatchDMap p) m = do
1694+ oldParents <- liftIO $ readIORef $ mergeSubscribedParents m
1695+ let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1696+ (mOldSubd, newPs) <- case me of
1697+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1699+ s <- liftIO $ newSubscriberMerge k m
1700+ subscription@(EventSubscription _ subd) <- subscribe e s
1701+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1702+ let newParent = MergeSubscribedParent subscription s
1703+ liftIO $ addMergeHeight newParentHeight m
1704+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1705+ forM_ mOldSubd $ \oldSubd -> do
1706+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1707+ liftIO $ removeMergeHeight oldHeight m
1708+ return (maybeToList (mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1709+ (subscriptionsToKill, newParents) <- 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
1710+ liftIO $ writeIORef (mergeSubscribedParents m) $! newParents
1711+ return subscriptionsToKill
2313−newEventEnv :: IO (EventEnv x)
1713+-- | Run an event action outside of a frame
2314−newEventEnv = do
1714+runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1715+runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
1716+ -- 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
1717+ pendingCleanups <- atomicModifyIORef (_spiderTimeline_cleanups spiderTimeline) $ \x -> ([], x)
1718+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1719 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1720 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1721 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1722 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1723 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1724 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1725 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1726 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
1727+ delayedRef <- liftIO $ newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1728+ let env = EventEnv spiderTimeline 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
1729 let go = do
2347 result <- a
1730 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
1731+ 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
1732 return result
2350− result <- runEventM go
1733+ result <- runEventM go env
2351− toClear <- readIORef $ eventEnvClears env
1734+ toClear <- readIORef toClearRef
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1735+ 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
1736+ toClearRoot <- readIORef toClearRootRef
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1737+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1738+ toAssign <- readIORef toAssignRef
2358 toReconnectRef <- newIORef []
1739 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1740+ coincidenceInfos <- readIORef coincidenceInfosRef
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1741 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1742 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1743+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1744 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1745+ mergeUpdates <- readIORef mergeUpdateRef
2365− writeIORef (eventEnvMergeUpdates env) []
1746+ writeIORef mergeUpdateRef []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1747+ when debugPropagate $ putStrLn "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1748+ mergeSubscriptionsToKill <- flip runEventM env $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1749+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1750 toReconnect <- readIORef toReconnectRef
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1751 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1752 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1753 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1754+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1755 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1756 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1757 wi' <- mkWeakPtrWithDebug i "wi'"
2378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
1758 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1759 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1760+ writeIORef holdInitRef [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1761+ 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
1762+ 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
1763 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1764 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
1765+ subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderTimeline --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1767 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1768+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1769 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1770 EventNever -> "EventNever"
2391 _ -> "something else"
1771 _ -> "something else"
@@ -2400,7 +1780,7 @@ runFrame a = SpiderHost $ do
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1780 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1781 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1782 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1783+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2404 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
1784 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
2405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
1785 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1786 unsubscribe subscription
@@ -2436,12 +1816,50 @@ succHeight h@(Height a) =
2436 then invalidHeight
1816 then invalidHeight
2437 else Height $ succ a
1817 else Height $ succ a
1819+removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1820+removeMergeHeight oldParentHeight subscribed = do
1821+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1822+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1823+ let newHeights = heightBagRemove oldParentHeight oldHeights
1824+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1826+invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1827+invalidateMergeHeight subscribed = do
1828+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1829+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1830+ when (oldHeight /= invalidHeight) $ do
1831+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1832+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1834+addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1835+addMergeHeight newParentHeight subscribed = do
1836+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1837+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1838+ let newHeights = heightBagAdd newParentHeight oldHeights
1839+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1841+revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1842+revalidateMergeHeight subscribed = do
1843+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1844+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1845+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1846+ parents <- readIORef $ mergeSubscribedParents subscribed
1847+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1848+ case heightBagSize heights `compare` DMap.size parents of
1851+ let height = succHeight $ heightBagMax heights
1852+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1853+ writeIORef (mergeSubscribedHeight subscribed) $! height
1854+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1855+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
2439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1857invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2440invalidateCoincidenceHeight subscribed = do
1858invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1859 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1860 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1861 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1862+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1864updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
1865updateSwitchHeight new subscribed = do
@@ -2449,7 +1867,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1867 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
1868 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1869 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1870+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1872recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1873recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1876,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
1876 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1877 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1878 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1879+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1881calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1882calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,170 +1915,183 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1915-- Reflex integration
2498--------------------------------------------------------------------------------
1916--------------------------------------------------------------------------------
1918+-- | The default, global Spider environment
1919+type Spider = SpiderTimeline Global
2500-- | Designates the default, global Spider timeline
1921-- | Designates the default, global Spider timeline
1924+{-# NOINLINE globalSpiderTimeline #-}
1925+globalSpiderTimeline :: SpiderTimeline Global
1926+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
1928+-- | Stores all global data relevant to a particular Spider timeline; only one
1929+-- value should exist for each type @x@
2501−data SpiderTimeline x
1930+data SpiderTimeline x = SpiderTimeline
1931+ { _spiderTimeline_toUnsubscribe :: !(IORef [EventSubscription x])
1932+ , _spiderTimeline_lock :: !(MVar ())
1933+ , _spiderTimeline_cleanups :: !(IORef [IO ()])
1935+ , _spiderTimeline_depth :: !(IORef Int)
2502type role SpiderTimeline nominal
1938type role SpiderTimeline nominal
2504−-- | The default, global Spider environment
1940+instance GEq SpiderTimeline where
2505−type Spider = SpiderTimeline Global
1941+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1942+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
1945+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
2508− {-# INLINABLE sample #-}
1946+unsafeNewSpiderTimeline = do
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
1947+ toUnsubscribe <- newIORef []
1949+ cleanups <- newIORef []
1951+ depthRef <- newIORef 0
1953+ return $ SpiderTimeline
1954+ { _spiderTimeline_toUnsubscribe = toUnsubscribe
1955+ , _spiderTimeline_lock = lock
1956+ , _spiderTimeline_cleanups = cleanups
1958+ , _spiderTimeline_depth = depthRef
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
1962+-- | Create a new SpiderTimeline
2512− {-# INLINABLE hold #-}
1963+newSpiderTimeline :: IO (Some SpiderTimeline)
2513− hold = holdSpiderEventM
1964+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
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
1966+-- | Pass a new timeline to the given function.
2531− {-# INLINABLE sample #-}
1967+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1968+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
1970+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1972+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1974+instance Functor (R.Dynamic (SpiderTimeline x)) where
2535− {-# INLINABLE hold #-}
1975+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
1977+instance Applicative (R.Dynamic (SpiderTimeline x)) where
1978+ pure = SpiderDynamic . dynamicConst
1979+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
1983+instance Monad (R.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
1984 {-# INLINE return #-}
2552 return = pure
1985 return = pure
2553 {-# INLINE (>>=) #-}
1986 {-# INLINE (>>=) #-}
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1987 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555 {-# INLINE (>>) #-}
1988 {-# INLINE (>>) #-}
2556− (>>) = (*>)
1989+ _ >> y = y
2557−#if !MIN_VERSION_base(4,13,0)
2558 {-# INLINE fail #-}
1990 {-# INLINE fail #-}
2559 fail _ = error "Dynamic does not support 'fail'"
1991 fail _ = error "Dynamic does not support 'fail'"
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
1993+instance R.Reflex (SpiderTimeline x) where
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
1994+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2578−{-# INLINE [1] mapDynamicSpider #-}
1995+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
1996+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
1997+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
1998+ type PullM (SpiderTimeline x) = SpiderPullM x
1999+ type PushM (SpiderTimeline x) = SpiderPushM x
2000+ {-# INLINABLE never #-}
2001+ never = SpiderEvent eventNever
2002+ {-# INLINABLE constant #-}
2003+ constant = SpiderBehavior . behaviorConst
2004+ {-# INLINABLE push #-}
2005+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2006+ {-# INLINABLE pull #-}
2007+ pull = SpiderBehavior . pull . coerce
2008+ {-# INLINABLE merge #-}
2009+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2010+ {-# INLINABLE fan #-}
2011+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2012+ {-# INLINABLE switch #-}
2013+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2014+ {-# INLINABLE coincidence #-}
2015+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2016+ {-# INLINABLE current #-}
2017+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2018+ {-# INLINABLE updated #-}
2019+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2020+ {-# INLINABLE unsafeBuildDynamic #-}
2021+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2022+ {-# INLINABLE unsafeBuildIncremental #-}
2023+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2024+ {-# INLINABLE mergeIncremental #-}
2025+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
2026+ {-# INLINABLE currentIncremental #-}
2027+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2028+ {-# INLINABLE updatedIncremental #-}
2029+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2030+ {-# INLINABLE incrementalToDynamic #-}
2031+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2032+ c <- readBehaviorUntracked $ dynamicCurrent i
2033+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2034+ eventCoercion Coercion = Coercion
2035+ behaviorCoercion Coercion = Coercion
2036+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2038+instance R.MonadSample (SpiderTimeline x) (EventM x) where
2581− pure = SpiderDynamic . dynamicConst
2039+ {-# INLINABLE sample #-}
2582−#if MIN_VERSION_base(4,10,0)
2040+ sample (SpiderBehavior b) = readBehaviorUntracked b
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2042+instance R.MonadHold (SpiderTimeline x) (EventM x) where
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2043+ {-# INLINABLE hold #-}
2044+ hold = holdSpiderEventM
2045+ {-# INLINABLE holdDyn #-}
2046+ holdDyn = holdDynSpiderEventM
2047+ {-# INLINABLE holdIncremental #-}
2048+ holdIncremental = holdIncrementalSpiderEventM
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2050+holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2051+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ 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)
2053+holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2054+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2056+holdIncrementalSpiderEventM :: R.Patch p => R.PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2057+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2059+instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602 {-# INLINABLE hold #-}
2060 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2061+ hold v0 e = R.runHostFrame $ R.hold v0 e
2604 {-# INLINABLE holdDyn #-}
2062 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2063+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2606 {-# INLINABLE holdIncremental #-}
2064 {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2065+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2067+instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2068 {-# INLINABLE sample #-}
2636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2069 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2071+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2072+ {-# INLINABLE sample #-}
2073+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2075+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2639 {-# INLINABLE sample #-}
2076 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2077+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2079+instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2643 {-# INLINABLE hold #-}
2080 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2081+ hold v0 e = R.current <$> R.holdDyn v0 e
2645 {-# INLINABLE holdDyn #-}
2082 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2083+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
2647 {-# INLINABLE holdIncremental #-}
2084 {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2085+ 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−--------------------------------------------------------------------------------
2087+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'
2089+data SpiderEventHandle x a = SpiderEventHandle
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2090+ { spiderEventHandleSubscription :: EventSubscription x
2662−type SpiderEnv = SpiderTimeline
2091+ , spiderEventHandleValue :: IORef (Maybe a)
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2094+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664 {-# INLINABLE subscribeEvent #-}
2095 {-# INLINABLE subscribeEvent #-}
2665 subscribeEvent e = SpiderHostFrame $ do
2096 subscribeEvent e = SpiderHostFrame $ do
2666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
2097 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2677,149 +2108,18 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTim
2677 , spiderEventHandleValue = val
2108 , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2111+instance R.ReflexHost (SpiderTimeline x) where
2681 type EventTrigger (SpiderTimeline x) = RootTrigger x
2112 type EventTrigger (SpiderTimeline x) = RootTrigger x
2682 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2113 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2114 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2116+instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2686 {-# NOINLINE readEvent #-}
2117 {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2118+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2688 result <- readIORef $ spiderEventHandleValue h
2119 result <- readIORef $ spiderEventHandleValue h
2690 return result
2121 return result
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)
2823instance MonadRef (EventM x) where
2123instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2124 type Ref (EventM x) = Ref IO
2825 {-# INLINABLE newRef #-}
2125 {-# INLINABLE newRef #-}
@@ -2834,7 +2134,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2134 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2136-- | 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)
2137+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2139instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2140 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2143,20 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2143 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2144 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2145 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 #-}
2146 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2147+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2149-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2150-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2151runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2152+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2860-- | Run an action affecting a given Spider timeline; this will be guarded by a
2154-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861-- mutex for that timeline
2155-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2156+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2157+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2159+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2161instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2162 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2165,26 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2165 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2166 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2167 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2168 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2169 fail s = SpiderHostFrame $ fail s
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2171+instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2172+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2882− notReady = pure ()
2173+
2174+instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2175+ {-# INLINABLE hold #-}
2176+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2177+ {-# INLINABLE holdDyn #-}
2178+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2179+ {-# INLINABLE holdIncremental #-}
2180+ 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)
2182+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2183newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2184 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2185 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2187+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2188newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2189 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2190 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2195,41 @@ newFanEventWithTriggerIO f = do
2898 return $ EventSelector $ \k -> eventRoot k r
2196 return $ EventSelector $ \k -> eventRoot k r
2198+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2199+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2200+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2201+ es <- newFanEventWithTriggerIO f
2202+ return $ R.EventSelector $ SpiderEvent . select es
2204+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2205+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2206+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2207+ es <- newFanEventWithTriggerIO f
2208+ return $ R.EventSelector $ SpiderEvent . select es
2210+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2211+ {-# INLINABLE subscribeEvent #-}
2212+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2214newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2216+instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2217+ {-# INLINABLE sample #-}
2218+ sample = ReadPhase . R.sample
2220+instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2221+ {-# INLINABLE hold #-}
2222+ hold v0 e = ReadPhase $ R.hold v0 e
2223+ {-# INLINABLE holdDyn #-}
2224+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2225+ {-# INLINABLE holdIncremental #-}
2226+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2228+instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2229+ type ReadPhase (SpiderHost x) = ReadPhase x
2230+ fireEventsAndRead es (ReadPhase a) = run es a
2231+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2233instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2234 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2235 newRef = SpiderHost . newRef
@@ -2921,10 +2252,9 @@ instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2252 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2253 primitive = SpiderHostFrame . EventM . primitive
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2255+--------------------------------------------------------------------------------
2925− notReadyUntil _ = return ()
2256+-- Deprecated items
2926− notReady = return ()
2257+--------------------------------------------------------------------------------
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2259+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2929− notReadyUntil _ = return ()
2260+type SpiderEnv = SpiderTimeline
2930− notReady = return ()