@@ -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,28 @@ 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
174−instance HasNodeId (FanSubscribed x v a) where
105+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
106 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
108instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +116,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
117{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
118showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
119+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
121+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
122+showSubscriberType = \case
192−
123+ SubscriberPush _ _ -> "SubscriberPush"
124+ SubscriberMerge _ _ -> "SubscriberMerge"
125+ SubscriberFan _ -> "SubscriberFan"
126+ SubscriberMergeChange _ -> "SubscriberMergeChange"
127+ SubscriberHold _ -> "SubscriberHold"
128+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
129+ SubscriberSwitch _ -> "SubscriberSwitch"
130+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
131+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
132+ SubscriberHandle -> "SubscriberHandle"
134+showEventType :: Event x a -> String
135+showEventType = \case
136+ EventRoot _ _ -> "EventRoot"
137+ EventNever -> "EventNever"
138+ EventPush _ -> "EventPush"
139+ EventMerge _ -> "EventMerge"
140+ EventFan _ _ -> "EventFan"
141+ EventSwitch _ -> "EventSwitch"
142+ EventCoincidence _ -> "EventCoincidence"
143+ EventHold _ -> "EventHold"
144+ EventDyn _ -> "EventDyn"
145+ EventHoldIdentity _ -> "EventHoldIdentity"
146+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
150debugPropagate = False
197debugInvalidateHeight = False
152debugInvalidateHeight = False
198debugInvalidate = False
154debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
156-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +158,6 @@ debugInvalidate = False
202showNodeId :: a -> String
158showNodeId :: a -> String
203showNodeId _ = ""
159showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
163#ifdef DEBUG_NODEIDS
@@ -215,200 +167,93 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
168newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
169newNodeId = 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 ()
171+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
172+unsafeNodeId :: a -> Int
173+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
178--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
180--------------------------------------------------------------------------------
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)
182+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
184-- | 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
185-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
186-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
187+{-# INLINABLE pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
188+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
189+pushCheap f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
190+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
191 { subscriberPropagate = \a -> do
258− mb <- f a
192+ mb <- runComputeM $ f a
259 mapM_ (subscriberPropagate sub) mb
193 mapM_ (subscriberPropagate sub) mb
261− occ' <- join <$> mapM f occ
195+ occ' <- join <$> mapM (runComputeM . f) occ
262 return (subscription, occ')
196 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
198data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
199+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
200+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
201 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
202+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
203 , _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
206-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
207-- repeatedly
328--TODO: Try a caching strategy where we subscribe directly to the parent when
209--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
210+--there's only one subscriber, and then build our own WeakBag only when a second
330--subscriber joins
211--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
212+{-# INLINABLE cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
213+cacheEvent :: Event x a -> Event x a
333−cacheEvent e =
214+cacheEvent e = Event $ \sub -> do
334−#ifdef DEBUG_TRACE_EVENTS
215+ 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
216+ mSubscribed <- liftIO $ readIORef mSubscribedRef
347− Just subscribedTicket -> return subscribedTicket
217+ case mSubscribed of
348− Nothing -> do
218+ Just subscribed -> liftIO $ do
350− nodeId <- liftIO newNodeId
352− subscribers <- liftIO FastWeakBag.empty
353− occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
357− (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
366− when (isJust occ) $ do
367− liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368− scheduleClear occRef
369− let !subscribed = CacheSubscribed
370− { _cacheSubscribed_subscribers = subscribers
371− , _cacheSubscribed_parent = parentSub
372− , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377− subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378− liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379− return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
219+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
220+ 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
221+ let es = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
222+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
402− , eventSubscribedRetained = toAny subscribedTicket
223+ , eventSubscribedRetained = toAny subscribed
403−#ifdef DEBUG_CYCLES
224+ }
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
225+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
405− , eventSubscribedHasOwnHeightRef = False
226+ Nothing -> do
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
227+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
407−#endif
228+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
408− }
229+ occRef <- liftIO $ newIORef undefined
230+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
231+ { subscriberPropagate = \a -> do
232+ liftIO $ writeIORef occRef $ Just a
233+ scheduleClear occRef
234+ propagate a subscribers
235+ , subscriberInvalidateHeight = \old -> do
236+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
237+ , subscriberRecalculateHeight = \new -> do
238+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
410− return (es, occ)
240+ liftIO $ writeIORef occRef occ
241+ when (isJust occ) $ scheduleClear occRef
242+ let !subscribed = CacheSubscribed
243+ { _cacheSubscribed_subscribers = subscribers
244+ , _cacheSubscribed_weakSelf = weakSelf
245+ , _cacheSubscribed_parent = parentSub
246+ , _cacheSubscribed_cached = mSubscribedRef
247+ , _cacheSubscribed_occurrence = occRef
249+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
250+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
251+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
253+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
254+cleanupCacheSubscribed self = do
255+ unsubscribe $ _cacheSubscribed_parent self
256+ writeIORef (_cacheSubscribed_cached self) Nothing
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
258subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
259subscribe e s = fst <$> subscribeAndRead e s
@@ -420,32 +265,29 @@ wrap tag getSpecificSubscribed sub = do
420 let es = tag subd
265 let es = tag subd
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
266 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
268+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
269eventRoot !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
271eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
272+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
274+eventFan :: GCompare k => k a -> Fan x k -> Event x a
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
275eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
277+eventSwitch :: Switch x a -> Event x a
436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
278eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
280+eventCoincidence :: Coincidence x a -> Event x a
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
281eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
441eventHold :: Hold x p -> Event x p
283eventHold :: Hold x p -> Event x p
442eventHold !h = Event $ subscribeHoldEvent h
284eventHold !h = Event $ subscribeHoldEvent h
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
286+eventDyn :: R.Patch p => Dyn x p -> Event x p
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
287eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
447{-# INLINE subscribeCoincidenceInner #-}
289{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
290+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
291subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
292 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
293 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +306,102 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
306 , subscriberRecalculateHeight :: !(Height -> IO ())
309+--TODO: Move this comment to WeakBag
310+-- These function are constructor functions that are marked NOINLINE so they are
311+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
312+-- so any weak references that are attached to the constructors will have their
313+-- finalizer run. Using the opaque constructor, does not see the
314+-- constructor application, so it behaves like an IORef and cannot be fused away.
316+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
317+-- the weak pointer to it in some cases.
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
319+newSubscriberHold :: R.Patch p => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
320newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
321 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470 , subscriberInvalidateHeight = \_ -> return ()
322 , subscriberInvalidateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
323 , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
326+newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
327+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
328 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
329 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
330+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
331 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
332 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
333+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
334 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
335 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
336 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
337 return ()
486 , subscriberInvalidateHeight = \old -> do
338 , subscriberInvalidateHeight = \old -> do
339+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
340 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
341+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
342+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
343 , subscriberRecalculateHeight = \new -> do
344+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
345 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
346+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
347+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
350+newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
351+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
352 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
353+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
354 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
355 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
356 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
357 , subscriberInvalidateHeight = \_ -> do
358+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
359 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
360 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
361 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
362+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
363+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
364+ , subscriberRecalculateHeight = \new -> do
365+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
366+ updateSwitchHeight new subscribed
367+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
370+newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
371+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
372 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
373+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
374 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
375+ tracePropagate $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
376 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
377+ tracePropagate $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
378+ tracePropagate $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
379 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
380 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
381 case occ of
520− Nothing ->
382+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
383 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
384 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
385+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
386+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
387 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
388 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
389 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
390 propagate o $ coincidenceSubscribedSubscribers subscribed
391+ , subscriberInvalidateHeight = \_ -> do
392+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
393+ invalidateCoincidenceHeight subscribed
394+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
395+ , subscriberRecalculateHeight = \_ -> do
396+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
397+ recalculateCoincidenceHeight subscribed
398+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
401+newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
402+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
403 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
404+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
405 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
406 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
407 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +409,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
409 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
410 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
411 propagate a $ coincidenceSubscribedSubscribers subscribed
412+ , subscriberInvalidateHeight = \_ -> do
413+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
414+ invalidateCoincidenceHeight subscribed
415+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
416+ , subscriberRecalculateHeight = \_ -> do
417+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
418+ recalculateCoincidenceHeight subscribed
419+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
422invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +426,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
426recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
428-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
429+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
430+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
431 -- 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
432 --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
433+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
435--------------------------------------------------------------------------------
568-- EventSubscribed
436-- EventSubscribed
@@ -571,16 +439,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571toAny :: a -> Any
439toAny :: a -> Any
572toAny = unsafeCoerce
440toAny = 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
442data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
443 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
444 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
445#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
446+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
447 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
448 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +470,13 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
470 , eventSubscribedWhoCreated = return ["never"]
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
474+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
475eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
476 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
477 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
478#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
479+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
480 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
481 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +489,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
489#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
490 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
491 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
492+ return [Some.This $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
493 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
494 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +502,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
502#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
503 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
504 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
505+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
506+ innerParents = maybeToList $ fmap Some.This innerSubscription
654 return $ outerParent : innerParents
507 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
508 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
509 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,29 +517,41 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
517whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
518whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
520+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
521walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
522+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
523 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
524 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
525 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
526+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
527 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
528+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
529 return subscribers
679{-# INLINE subscribeHoldEvent #-}
532{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
533+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681subscribeHoldEvent = subscribeAndRead . holdEvent
534subscribeHoldEvent = subscribeAndRead . holdEvent
536+--------------------------------------------------------------------------------
538+--------------------------------------------------------------------------------
540+data EventSubscription x = EventSubscription
541+ { _eventSubscription_unsubscribe :: !(IO ())
542+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
545+unsubscribe :: EventSubscription x -> IO ()
546+unsubscribe (EventSubscription u _) = u
683--------------------------------------------------------------------------------
548--------------------------------------------------------------------------------
684-- Behavior
549-- Behavior
685--------------------------------------------------------------------------------
550--------------------------------------------------------------------------------
687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
552newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
554+behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
690behaviorHold !h = Behavior $ readHoldTracked h
555behaviorHold !h = Behavior $ readHoldTracked h
692behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
557behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -700,7 +565,7 @@ behaviorPull !p = Behavior $ do
700 val <- liftIO $ readIORef $ pullValue p
565 val <- liftIO $ readIORef $ pullValue p
701 case val of
566 case val of
702 Just subscribed -> do
567 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
568+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
569 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
570 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706 return $ pullSubscribedValue subscribed
571 return $ pullSubscribedValue subscribed
@@ -709,7 +574,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
574 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
575 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
576 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
577+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
578 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
579 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
580 let subscribed = PullSubscribed
@@ -719,22 +584,22 @@ behaviorPull !p = Behavior $ do
719 , pullSubscribedParents = parents
584 , pullSubscribedParents = parents
721 liftIO $ writeIORef (pullValue p) $ Just subscribed
586 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
587+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
590+behaviorDyn :: R.Patch p => Dyn x p -> Behavior x (R.PatchTarget p)
726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
591behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
728{-# INLINE readHoldTracked #-}
593{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
594+readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
730readHoldTracked h = do
595readHoldTracked h = do
731 result <- liftIO $ readIORef $ holdValue h
596 result <- liftIO $ readIORef $ holdValue h
732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
597 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
598+ 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
599 return result
601+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
737−{-# INLINABLE readBehaviorUntracked #-}
602+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
603readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739readBehaviorUntracked b = do
604readBehaviorUntracked b = do
740 holdInits <- getDeferralQueue
605 holdInits <- getDeferralQueue
@@ -744,49 +609,45 @@ readBehaviorUntracked b = do
744-- Dynamic
609-- Dynamic
745--------------------------------------------------------------------------------
610--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
612+data Dynamic x p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
613+ { 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`?
614+ , dynamicUpdated :: !(Event x p)
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
759−dynamicHold :: Hold x p -> DynamicS x p
617+dynamicHold :: Hold x p -> Dynamic x p
760dynamicHold !h = Dynamic
618dynamicHold !h = Dynamic
761 { dynamicCurrent = behaviorHold h
619 { dynamicCurrent = behaviorHold h
762 , dynamicUpdated = eventHold h
620 , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
623+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766dynamicHoldIdentity = dynamicHold
624dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
626+dynamicConst :: R.PatchTarget p -> Dynamic x p
769dynamicConst !a = Dynamic
627dynamicConst !a = Dynamic
770 { dynamicCurrent = behaviorConst a
628 { dynamicCurrent = behaviorConst a
771 , dynamicUpdated = eventNever
629 , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
632+dynamicDyn :: R.Patch p => Dyn x p -> Dynamic x p
775dynamicDyn !d = Dynamic
633dynamicDyn !d = Dynamic
776 { dynamicCurrent = behaviorDyn d
634 { dynamicCurrent = behaviorDyn d
777 , dynamicUpdated = eventDyn d
635 , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
638+dynamicDynIdentity :: Dyn x (Identity a) -> Dynamic x (Identity a)
781dynamicDynIdentity = dynamicDyn
639dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
641--------------------------------------------------------------------------------
784-- Combinators
642-- Combinators
785--------------------------------------------------------------------------------
643--------------------------------------------------------------------------------
645+--TODO: Figure out why certain things are not 'representational', then make them
646+--representational so we can use coerce
787--type role Hold representational
648--type role Hold representational
788data Hold x p
649data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
650+ = Hold { holdValue :: !(IORef (R.PatchTarget p))
790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
651 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
652 , 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
653 , 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 +656,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
659data EventEnv x
660+ = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
661+ , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
662 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
663 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
664 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
665+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
666+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
667 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
668 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
669 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
843{-# INLINE runEventM #-}
672{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
673+runEventM :: EventM x a -> EventEnv x -> IO a
845−runEventM = unEventM
674+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
676class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
677 getDeferralQueue :: m (IORef [a])
@@ -856,87 +682,81 @@ defer a = do
856 q <- getDeferralQueue
682 q <- getDeferralQueue
857 liftIO $ modifyIORef' q (a:)
683 liftIO $ modifyIORef' q (a:)
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
685+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 #-}
686 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
687+ getDeferralQueue = EventM $ asks eventEnvAssignments
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
689+instance Defer (SomeHoldInit x) (EventM x) where
868 {-# INLINE getDeferralQueue #-}
690 {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
691+ getDeferralQueue = EventM $ asks eventEnvHoldInits
871instance Defer (SomeHoldInit x) (BehaviorM x) where
693instance Defer (SomeHoldInit x) (BehaviorM x) where
872 {-# INLINE getDeferralQueue #-}
694 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
695 getDeferralQueue = BehaviorM $ asks snd
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
697+instance Defer (SomeMergeUpdate x) (EventM x) where
876 {-# INLINE getDeferralQueue #-}
698 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
699+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
701+instance Defer (SomeMergeInit x) (EventM x) where
880 {-# INLINE getDeferralQueue #-}
702 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
703+ getDeferralQueue = EventM $ asks eventEnvMergeInits
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
705+class HasCurrentHeight x m | m -> x where
884 getCurrentHeight :: m Height
706 getCurrentHeight :: m Height
885 scheduleMerge :: Height -> EventM x () -> m ()
707 scheduleMerge :: Height -> EventM x () -> m ()
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
709+instance HasCurrentHeight x (EventM x) where
888 {-# INLINE getCurrentHeight #-}
710 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
711+ getCurrentHeight = EventM $ do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
712+ heightRef <- asks eventEnvCurrentHeight
891 liftIO $ readIORef heightRef
713 liftIO $ readIORef heightRef
892 {-# INLINE scheduleMerge #-}
714 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
715+ scheduleMerge height subscribed = EventM $ do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
716+ delayedRef <- asks eventEnvDelayedMerges
895 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
717 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
897−class HasSpiderTimeline x where
719+class HasSpiderTimeline x m | m -> x where
898− -- | Retrieve the current SpiderTimelineEnv
720+ -- | Retrieve the current SpiderTimeline
899− spiderTimeline :: SpiderTimelineEnv x
721+ askSpiderTimeline :: m (SpiderTimeline x)
723+instance HasSpiderTimeline x (EventM x) where
724+ {-# INLINE askSpiderTimeline #-}
725+ askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
901−instance HasSpiderTimeline Global where
727+instance HasSpiderTimeline x (SpiderHost x) where
902− spiderTimeline = globalSpiderTimelineEnv
728+ {-# INLINE askSpiderTimeline #-}
729+ askSpiderTimeline = SpiderHost ask
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
731+putCurrentHeight :: Height -> EventM x ()
905−putCurrentHeight h = do
732+putCurrentHeight h = EventM $ do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
733+ heightRef <- asks eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
734 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
736+instance Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
737 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
738+ getDeferralQueue = EventM $ asks eventEnvClears
913{-# INLINE scheduleClear #-}
740{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
741+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
742+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
744+instance Defer SomeRootClear (EventM x) where
926 {-# INLINE getDeferralQueue #-}
745 {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
746+ getDeferralQueue = EventM $ asks eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
748{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
749+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
750+scheduleRootClear r = defer $ SomeRootClear r
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
752+instance Defer (SomeResetCoincidence x) (EventM x) where
934 {-# INLINE getDeferralQueue #-}
753 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
754+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
756-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
757+{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
758+{-# 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)
759+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
940hold v0 e = do
760hold v0 e = do
941 valRef <- liftIO $ newIORef v0
761 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
762 invsRef <- liftIO $ newIORef []
@@ -957,7 +777,7 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
779{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
780+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
781getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
782 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
783 case ep of
@@ -971,7 +791,7 @@ getHoldEventSubscription h = do
971 Nothing -> return ()
791 Nothing -> return ()
972 Just o -> do
792 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
793 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
794+ case R.apply o old of
975 Nothing -> return ()
795 Nothing -> return ()
976 Just new -> do
796 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
797 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +803,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
804type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
806+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
807-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
808+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
810instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
811 {-# INLINE (>>=) #-}
@@ -994,16 +814,14 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
814 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
815 {-# INLINE return #-}
996 return x = BehaviorM $ return x
816 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
817 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
818 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
820data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
821 = forall p. BehaviorSubscribedHold (Hold x p)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
822 | BehaviorSubscribedPull (PullSubscribed x a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
824+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1008--type role PullSubscribed representational
826--type role PullSubscribed representational
1009data PullSubscribed x a
827data PullSubscribed x a
@@ -1038,15 +856,13 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
859+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
860 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
861 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
862 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
865+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
867data SomeMergeUpdate x = SomeMergeUpdate
1052 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
868 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
@@ -1057,14 +873,18 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
873newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
875-- 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)
876+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 }
878+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
880+instance Defer (SomeHoldInit x) (ComputeM x) where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
881+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
882+
1067− }
883+{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
884+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
885+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
887+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1069data HeightBag = HeightBag
889data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
890 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +902,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
902heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
904heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
905+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
907heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
908heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +911,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
911 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
912 _ -> 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
914heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
915heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
916 Just ((h, _), _) -> Height h
@@ -1116,25 +928,25 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
928heightBagVerify = id
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
931+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
932+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
933+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
934+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
937+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
938+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
939+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
940+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129 , fanSubscribedParent :: !(EventSubscription x)
941 , fanSubscribedParent :: !(EventSubscription x)
1130#ifdef DEBUG_NODEIDS
942#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
943 , fanSubscribedNodeId :: Int
1135−data Fan x k v
947+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
948+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
949+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
952data SwitchSubscribed x a
@@ -1158,9 +970,7 @@ data Switch x a
1158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
970 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
973{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164data CoincidenceSubscribed x a
974data CoincidenceSubscribed x a
1165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
975 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
976 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +998,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
998newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189newInvalidatorPull p = return $! InvalidatorPull p
999newInvalidatorPull p = return $! InvalidatorPull p
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1001+instance R.FunctorMaybe (Event x) where
1192− mapMaybe f = push $ return . f
1002+ fmapMaybe f = push $ return . f
1194−instance HasSpiderTimeline x => Align (Event x) where
1004+instance Align (Event x) where
1195 nil = eventNever
1005 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 $
1006+ 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)
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) }
1008+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (R.PatchTarget p), Event x p) (Hold x p)) }
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1010+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)
1011+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
1013--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)
1014+zipDynWith :: (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1220zipDynWith f da db =
1015zipDynWith f da db =
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1016 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1222 ec = flip push eab $ \o -> do
1017 ec = flip push eab $ \o -> do
@@ -1229,70 +1024,75 @@ zipDynWith f da db =
1229 return (a, b)
1024 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1025 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
1026 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1027+ 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)
1029+unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1235−buildDynamic readV0 v' = do
1030+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1031+ 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
1033+newJoinDyn :: Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1242−unsafeBuildDynamic readV0 v' =
1034+newJoinDyn d =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1035+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1036+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1037+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1038+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1039+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1040+ in unsafeDyn readV0 v'
1245-- ResultM can read behaviors and events
1042-- ResultM can read behaviors and events
1246type ResultM = EventM
1043type ResultM = EventM
1045+{-# NOINLINE unsafeNewIORef #-}
1046+unsafeNewIORef :: a -> b -> IORef b
1047+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248−instance HasSpiderTimeline x => Functor (Event x) where
1049+instance Functor (Event x) where
1249 fmap f = push $ return . Just . f
1050 fmap f = push $ return . Just . f
1251instance Functor (Behavior x) where
1052instance Functor (Behavior x) where
1252 fmap f = pull . fmap f . readBehaviorTracked
1053 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
1055+{-# 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
1056+push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256push f e = cacheEvent (pushCheap f e)
1057push f e = cacheEvent (pushCheap f e)
1059+push f e = eventPush $ Push
1062+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1064+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258{-# INLINABLE pull #-}
1067{-# INLINABLE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1068pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1265− pure $ behaviorPull $ Pull
1069+pull a = behaviorPull $ Pull
1266− { pullCompute = a
1070+ { pullCompute = a
1267− , pullValue = ref
1071+ , pullValue = unsafeNewIORef a Nothing
1268#ifdef DEBUG_NODEIDS
1072#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1073+ , pullNodeId = unsafeNodeId a
1273{-# INLINABLE switch #-}
1077{-# INLINABLE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1078+switch :: Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1079+switch a = eventSwitch $ Switch
1278− { switchParent = a
1080+ { switchParent = a
1279− , switchSubscribed = ref
1081+ , switchSubscribed = unsafeNewIORef a Nothing
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1084+coincidence :: Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1085+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1086+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1087+ , 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
1090-- 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
1091+run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1092run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1093+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1094+ spiderTimeline <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1095+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1096 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1097 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1098 occBefore <- readIORef occRef
@@ -1304,13 +1104,13 @@ run roots after = do
1304 else return Nothing
1104 else return Nothing
1305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1105 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306 propagate a subscribersRef
1106 propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
1107+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308 let go = do
1108 let go = do
1309 delayed <- liftIO $ readIORef delayedRef
1109 delayed <- liftIO $ readIORef delayedRef
1310 case IntMap.minViewWithKey delayed of
1110 case IntMap.minViewWithKey delayed of
1311 Nothing -> return ()
1111 Nothing -> return ()
1312 Just ((currentHeight, cur), future) -> do
1112 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
1113+ tracePropagate $ "Running height " ++ show currentHeight
1314 putCurrentHeight $ Height currentHeight
1114 putCurrentHeight $ Height currentHeight
1315 liftIO $ writeIORef delayedRef $! future
1115 liftIO $ writeIORef delayedRef $! future
1316 sequence_ cur
1116 sequence_ cur
@@ -1318,10 +1118,10 @@ run roots after = do
1319 putCurrentHeight maxBound
1119 putCurrentHeight maxBound
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
1121+ tracePropagate "Done running an event frame"
1322 return result
1122 return result
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1124+scheduleMerge' :: Height -> IORef Height -> EventM x () -> EventM x ()
1325scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1125scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1326 height <- liftIO $ readIORef heightRef
1126 height <- liftIO $ readIORef heightRef
1327 currentHeight <- getCurrentHeight
1127 currentHeight <- getCurrentHeight
@@ -1330,11 +1130,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1130 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))
1133+data SomeClear = forall a. SomeClear (IORef (Maybe a))
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1135+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
1137data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
@@ -1346,110 +1144,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1144 x' <- evaluate x
1347 mkWeakPtr x' $
1145 mkWeakPtr x' $
1348 if debugFinalize
1146 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1147+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1148 else Nothing
1352type WeakList a = [Weak a]
1150type 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 #-}
1152{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1154+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1155+withIncreasedDepth a = do
1156+ spiderTimeline <- askSpiderTimeline
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1157+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1385 result <- a
1158 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1159+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1387 return result
1160 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
1162+withIncreasedDepth :: m a -> m a
1163+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1166+type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1168{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1169+tracePropagate :: (CanTrace x m) => String -> m ()
1420−tracePropagate _ _ = return ()
1170+tracePropagate = traceWhen debugPropagate
1422{-# INLINE traceInvalidate #-}
1172{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1173traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1174+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
1176+{-# INLINE traceWhen #-}
1177+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1178+traceWhen b message = traceMWhen b $ return message
1440−{-# INLINE trace #-}
1180+{-# INLINE traceMWhen #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1181+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1442−trace _ _ = return ()
1182+traceMWhen b getMessage = when b $ do
1443−
1183+ message <- getMessage
1444−{-# INLINE traceM #-}
1184+#ifdef DEBUG
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1185+ spiderTimeline <- askSpiderTimeline
1446−traceM _ _ = return ()
1186+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1190+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1192whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1193whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1196groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1197groupByHead = \case
1455 [] -> []
1198 [] -> []
@@ -1460,54 +1203,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1203 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1205listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1206+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 #-}
1209{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1210+propagateSubscriberHold :: R.Patch p => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1211propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1212+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1213 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1214 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1215 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1216+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1217 Nothing -> return ()
1508 Just v' -> do
1218 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1219+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1220 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1221 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1222 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,53 +1224,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
1224data 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
1226runBehaviorM :: 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)
1227+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1229askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1230askInvalidator = do
1522− (!m, _) <- ask
1231+ (!m, _) <- BehaviorM ask
1523 case m of
1232 case m of
1524 Nothing -> return Nothing
1233 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1234 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1236askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1237askParentsRef = do
1529− (!m, _) <- ask
1238+ (!m, _) <- BehaviorM ask
1530 case m of
1239 case m of
1531 Nothing -> return Nothing
1240 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1241 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1243askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1244askBehaviorHoldInits = do
1536− (_, !his) <- ask
1245+ (_, !his) <- BehaviorM ask
1537 return his
1246 return his
1539{-# INLINE getDynHold #-}
1248{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1249+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
1541getDynHold d = do
1250getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1251 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1252 case mh of
1544− HoldDyn h -> return h
1253+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1254+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1255 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1256 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1257 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1258+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1259 return h
1559-- Always refers to 0
1261-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1262{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1263zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1264zeroRef = unsafePerformIO $ newIORef zeroHeight
1266+type CanSubscribe x m =
1267+ ( HasSpiderTimeline x m
1268+ , HasCurrentHeight x m
1269+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1270+ , Defer SomeClear m -- Wiping out event firings
1271+ , Defer (SomeAssignment x) m -- Updating state
1272+ , 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)
1276+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1277getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1278 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1279 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1287,10 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1287 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1288 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1289 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1290+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1291 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1292 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1293+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1294 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1295 , rootSubscribedCachedSubscribed = cached
1589 , rootSubscribedOccurrence = getOcc
1296 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1298,17 @@ getRootSubscribed k r sub = do
1591 , rootSubscribedUninit = uninit
1298 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1299 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1300#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1301+ , 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)
1304+ 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
1305 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
1306 occ <- getOcc
1610 return (sln, subscribed, occ)
1307 return (sln, subscribed, occ)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1309{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1310cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1311+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1312 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1313 modifyIORef' cached $ DMap.delete k
@@ -1621,90 +1316,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
1621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1316subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1317subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1319+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1625−
1320+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)
1626−data FanInt x a = FanInt
1627− { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1635−newFanInt :: IO (FanInt x a)
1637− subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1644− { _fanInt_subscribers = subscribers
1645− , _fanInt_subscriptionRef = subscriptionRef
1646− , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660− { subscriberPropagate = \m -> do
1661− liftIO $ writeIORef (_fanInt_occRef self) m
1662− scheduleIntClear $ _fanInt_occRef self
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1665− subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1669− subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1673− subscriberRecalculateHeight s new
1676− writeIORef (_fanInt_subscriptionRef self) subscription
1677− writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678− scheduleIntClear $ _fanInt_occRef self
1680− b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1682− b <- FastWeakBag.empty
1683− FastMutableIntMap.insert (_fanInt_subscribers self) k b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1687− currentOcc <- readIORef (_fanInt_occRef self)
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1692−fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1694− subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1696− { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697− , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1706−{-# INLINABLE getFanSubscribed #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1708getFanSubscribed k f sub = do
1321getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1322 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1323 case mSubscribed of
@@ -1722,16 +1335,13 @@ getFanSubscribed k f sub = do
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1335 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723 occRef <- liftIO $ newIORef parentOcc
1336 occRef <- liftIO $ newIORef parentOcc
1724 when (isJust parentOcc) $ scheduleClear occRef
1337 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1338 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1339 { fanSubscribedCachedSubscribed = fanSubscribed f
1730 , fanSubscribedOccurrence = occRef
1340 , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1341 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1342 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1343#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1344+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1347 let !self = (k, subscribed)
@@ -1741,7 +1351,7 @@ getFanSubscribed k f sub = do
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1351 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1352 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1354+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1355cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1356 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1357 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1363,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1363 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1365{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1366+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1757subscribeFanSubscribed k subscribed sub = do
1367subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1368 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1369 case DMap.lookup k subscribers of
@@ -1765,8 +1375,8 @@ subscribeFanSubscribed k subscribed sub = do
1765 return sln
1375 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1376 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1378+{-# 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)
1379+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
1380getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1381 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1382 case mSubscribed of
@@ -1791,9 +1401,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1401 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1402 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1403 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1404 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1405 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1406 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1413,7 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1413 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1414 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1415#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1416+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1419 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1431,8 @@ cleanupSwitchSubscribed subscribed = do
1824subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1431subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1432subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1434+{-# 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)
1435+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
1436getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1437 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1438 case mSubscribed of
@@ -1851,9 +1458,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1458 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1459 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1460 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1461 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1462 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1463 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1468,7 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1468 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1469 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1470#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1471+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1474 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,511 +1485,212 @@ cleanupCoincidenceSubscribed subscribed = do
1881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1485subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1486subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1488+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1489+merge :: forall k x. GCompare k => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1886− => (forall a. q a -> Event x (v a))
1490+merge d = cacheEvent $ Event $ \sub -> do
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
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
1491 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1492 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1493 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1494 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114− parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1495+ parentsRef <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1496+ let scheduleSelf height = scheduleMerge' height heightRef $ do
2116−
1497+ m <- liftIO $ readIORef accumRef
2117− let subscribed = EventSubscribed
1498+ liftIO $ writeIORef accumRef $! DMap.empty
2118− { eventSubscribedHeightRef = heightRef
1499+ --TODO: Assert that m is not empty
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
1500+ subscriberPropagate sub m
2120−#ifdef DEBUG_CYCLES
1501+ invalidateMyHeight = do
2121− , eventSubscribedGetParents = do
1502+ oldHeight <- readIORef heightRef
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
1503+ when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
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
1504+ writeIORef heightRef $! invalidHeight
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 ()
1505+ subscriberInvalidateHeight sub oldHeight
2156− , subscriberRecalculateHeight = \_ -> return ()
1506+ revalidateMyHeight = do
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
1507 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?
1508+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2199 heights <- readIORef heightBagRef
1509 heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
1510+ parents <- readIORef parentsRef
1511+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2201− case heightBagSize heights `compare` numParents of
1512+ case heightBagSize heights `compare` DMap.size parents of
2202 LT -> return ()
1513 LT -> return ()
2203 EQ -> do
1514 EQ -> do
2204 let height = succHeight $ heightBagMax heights
1515 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1516+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2206 writeIORef heightRef $! height
1517 writeIORef heightRef $! height
2207 subscriberRecalculateHeight sub height
1518 subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
1519+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge"
1520+ subscriber :: forall a. k a -> Subscriber x a
2209− mySubscriber k = Subscriber
1521+ subscriber k = Subscriber
2210 { subscriberPropagate = \a -> do
1522 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
1523+ oldM <- liftIO $ readIORef accumRef
2212−
1524+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
2213− wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
1525+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2214− liftIO $ FastMutableIntMap.insert accum k a
1526+ liftIO $ writeIORef accumRef $! newM
1527+ when (DMap.null oldM) $ do -- Only schedule the firing once
1528+ height <- liftIO $ readIORef heightRef
1529+ --TODO: assertions about height
1530+ currentHeight <- getCurrentHeight
1531+ when (height <= currentHeight) $ do
1532+ if height /= invalidHeight
1534+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1535+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1538+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1539+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1540+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1544+ error $ "Causality loop found" <> cycleInfo
2215− when wasEmpty scheduleSelf
1545+ scheduleSelf height
2216− , subscriberInvalidateHeight = \old -> do
1546+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2217 modifyIORef' heightBagRef $ heightBagRemove old
1547 modifyIORef' heightBagRef $ heightBagRemove old
2218 invalidateMyHeight
1548 invalidateMyHeight
2219 , subscriberRecalculateHeight = \new -> do
1549 , subscriberRecalculateHeight = \new -> do
2220 modifyIORef' heightBagRef $ heightBagAdd new
1550 modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
1551+ revalidateMyHeight
2223− forM_ (IntMap.toList initialParents) $ \(k, p) -> do
1553+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1554+ let s = subscriber k
2224− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
1555+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
2226− forM_ parentOcc $ FastMutableIntMap.insert accum k
2227− FastMutableIntMap.insert parents k subscription
2228− height <- getEventSubscribedHeight parentSubd
1556+ height <- liftIO $ getEventSubscribedHeight parentSubd
2229− if height == invalidHeight
1557+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
2230− then writeIORef heightRef invalidHeight
1558+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
2231− else do
1559+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
2232− modifyIORef' heightBagRef $ heightBagAdd height
1560+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2233− modifyIORef' heightRef $ \oldHeight ->
1561+ myHeight = if invalidHeight `elem` heights
2234− if oldHeight == invalidHeight
1562+ then invalidHeight
2235− then invalidHeight
1563+ else succHeight $ heightBagMax myHeightBag
2236− else max (succHeight height) oldHeight
2237− myHeight <- liftIO $ readIORef heightRef
2238 currentHeight <- getCurrentHeight
1564 currentHeight <- getCurrentHeight
2239− isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240− occ <- if currentHeight >= myHeight -- If we should have fired by now
1565+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2241− then if isEmpty
1566+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2242− then return Nothing
1567+ else (Nothing, dm)
2243− else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
1568+ unless (DMap.null accum) $ do
2244− else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
1569+ scheduleSelf myHeight
2245− return Nothing
1570+ occRef <- liftIO $ newIORef occ
1571+ when (isJust occ) $ scheduleClear occRef
1572+ liftIO $ writeIORef accumRef $! accum
1573+ liftIO $ writeIORef heightRef $! myHeight
1574+ liftIO $ writeIORef heightBagRef $! myHeightBag
1575+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1576+ liftIO $ writeIORef parentsRef $! DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1577+ let updateMe (R.PatchDMap p) = do
1578+ oldParents <- liftIO $ readIORef parentsRef
1579+ let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1580+ (mOldSubd, newPs) <- case me of
1581+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1583+ let s = subscriber k
1584+ subscription@(EventSubscription _ subd) <- subscribe e s
1585+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1586+ let newParent = MergeSubscribedParent subscription
1587+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1588+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1589+ forM_ mOldSubd $ \oldSubd -> do
1590+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1591+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1592+ return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1593+ (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
1594+ liftIO $ writeIORef parentsRef $! newParents
1595+ return subscriptionsToKill
2246 defer $ SomeMergeInit $ do
1596 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
1597+ let s = Subscriber
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1598 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
1599+ tracePropagate $ "SubscriberMerge/Change"
2266− defer $ updateMe a
1600+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
2267 , subscriberInvalidateHeight = \_ -> return ()
1601 , subscriberInvalidateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
1602 , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1604+ (EventSubscription _ changeSubd, change) <- subscribeAndRead (dynamicUpdated d) s
2271− forM_ change $ \c -> defer $ updateMe c
1605+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
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)
1606+ liftIO $ writeIORef changeSubdRef (s, changeSubd)
2276− let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
1607+ let unsubscribeAll = do
2277−
1608+ parents <- readIORef parentsRef
2278−
1609+ forM_ (DMap.toList parents) $ \(_ :=> MergeSubscribedParent s) -> unsubscribe s
2279− return (EventSubscription unsubscribeAll subscribed, occ)
1610+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
1614newtype 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
1616+fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
1617+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
1618 let f = Fan
2288 { fanParent = e
1619 { fanParent = e
2289− , fanSubscribed = ref
1620+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1622+ in EventSelector $ \k -> eventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1624+runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1625+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1626 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1627 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1628+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1629 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1630 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1631 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
2304 mapM_ unSomeMergeInit mergeInits
1632 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1633+ runHoldInits holdInitRef mergeInitRef
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1635+initHold :: SomeHoldInit x -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1636initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
1638+-- | Run an event action outside of a frame
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1639+runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2312−
1640+runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
2313−newEventEnv :: IO (EventEnv x)
1641+ -- 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
2314−newEventEnv = do
1642+ pendingCleanups <- atomicModifyIORef (_spiderTimeline_cleanups spiderTimeline) $ \x -> ([], x)
1643+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1644 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1645 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1646 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1647 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1648 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1649 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1650 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1651 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
1652+ delayedRef <- liftIO $ newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1653+ 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
1654 let go = do
2347 result <- a
1655 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
1656+ 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
1657 return result
2350− result <- runEventM go
1658+ result <- runEventM go env
2351− toClear <- readIORef $ eventEnvClears env
1659+ toClear <- readIORef toClearRef
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1660+ 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
1661+ toClearRoot <- readIORef toClearRootRef
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1662+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1663+ toAssign <- readIORef toAssignRef
2358 toReconnectRef <- newIORef []
1664 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1665+ coincidenceInfos <- readIORef coincidenceInfosRef
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1666 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1667 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1668+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1669 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1670+ mergeUpdates <- readIORef mergeUpdateRef
2365− writeIORef (eventEnvMergeUpdates env) []
1671+ writeIORef mergeUpdateRef []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1672+ when debugPropagate $ putStrLn "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1673+ mergeSubscriptionsToKill <- flip runEventM env $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1674+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1675 toReconnect <- readIORef toReconnectRef
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1676 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1677 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1678 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1679+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1680 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1681 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1682 wi' <- mkWeakPtrWithDebug i "wi'"
2378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
1683 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1684 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1685+ writeIORef holdInitRef [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1686+ 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
1687+ 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
1688 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1689 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
1690+ 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)
1692 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1693+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1694 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1695 EventNever -> "EventNever"
2391 _ -> "something else"
1696 _ -> "something else"
@@ -2400,7 +1705,7 @@ runFrame a = SpiderHost $ do
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1705 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1706 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1707 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1708+ 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
1709 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
1710 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1711 unsubscribe subscription
@@ -2441,7 +1746,7 @@ invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1746 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1747 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1748 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1749+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1751updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
1752updateSwitchHeight new subscribed = do
@@ -2449,7 +1754,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1754 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
1755 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1756 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1757+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1759recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1760recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1763,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
1763 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1764 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1765 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1766+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1768calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1769calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,170 +1802,183 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1802-- Reflex integration
2498--------------------------------------------------------------------------------
1803--------------------------------------------------------------------------------
1805+-- | The default, global Spider environment
1806+type Spider = SpiderTimeline Global
2500-- | Designates the default, global Spider timeline
1808-- | Designates the default, global Spider timeline
1811+{-# NOINLINE globalSpiderTimeline #-}
1812+globalSpiderTimeline :: SpiderTimeline Global
1813+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
1815+-- | Stores all global data relevant to a particular Spider timeline; only one
1816+-- value should exist for each type @x@
2501−data SpiderTimeline x
1817+data SpiderTimeline x = SpiderTimeline
1818+ { _spiderTimeline_toUnsubscribe :: !(IORef [EventSubscription x])
1819+ , _spiderTimeline_lock :: !(MVar ())
1820+ , _spiderTimeline_cleanups :: !(IORef [IO ()])
1822+ , _spiderTimeline_depth :: !(IORef Int)
2502type role SpiderTimeline nominal
1825type role SpiderTimeline nominal
2504−-- | The default, global Spider environment
1827+instance GEq SpiderTimeline where
2505−type Spider = SpiderTimeline Global
1828+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1829+ 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
1832+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
2508− {-# INLINABLE sample #-}
1833+unsafeNewSpiderTimeline = do
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
1834+ toUnsubscribe <- newIORef []
1836+ cleanups <- newIORef []
1838+ depthRef <- newIORef 0
1840+ return $ SpiderTimeline
1841+ { _spiderTimeline_toUnsubscribe = toUnsubscribe
1842+ , _spiderTimeline_lock = lock
1843+ , _spiderTimeline_cleanups = cleanups
1845+ , _spiderTimeline_depth = depthRef
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
1849+-- | Create a new SpiderTimeline
2512− {-# INLINABLE hold #-}
1850+newSpiderTimeline :: IO (Some SpiderTimeline)
2513− hold = holdSpiderEventM
1851+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
1853+-- | Pass a new timeline to the given function.
2531− {-# INLINABLE sample #-}
1854+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1855+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1857+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2535− {-# INLINABLE hold #-}
1858+
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
1859+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
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
1861+instance Functor (R.Dynamic (SpiderTimeline x)) where
1862+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
1864+instance Applicative (R.Dynamic (SpiderTimeline x)) where
1865+ pure = SpiderDynamic . dynamicConst
1866+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
1870+instance Monad (R.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
1871 {-# INLINE return #-}
2552 return = pure
1872 return = pure
2553 {-# INLINE (>>=) #-}
1873 {-# INLINE (>>=) #-}
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1874 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555 {-# INLINE (>>) #-}
1875 {-# INLINE (>>) #-}
2556− (>>) = (*>)
1876+ _ >> y = y
2557−#if !MIN_VERSION_base(4,13,0)
2558 {-# INLINE fail #-}
1877 {-# INLINE fail #-}
2559 fail _ = error "Dynamic does not support 'fail'"
1878 fail _ = error "Dynamic does not support 'fail'"
2562−{-# INLINABLE newJoinDyn #-}
1880+instance R.Reflex (SpiderTimeline x) where
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
1881+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2564−newJoinDyn d =
1882+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1883+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1884+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
1885+ type PullM (SpiderTimeline x) = SpiderPullM x
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1886+ type PushM (SpiderTimeline x) = SpiderPushM x
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1887+ {-# INLINABLE never #-}
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
1888+ never = SpiderEvent eventNever
2571−
1889+ {-# INLINABLE constant #-}
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
1890+ constant = SpiderBehavior . behaviorConst
2573− fmap = mapDynamicSpider
1891+ {-# INLINABLE push #-}
1892+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
1893+ {-# INLINABLE pull #-}
1894+ pull = SpiderBehavior . pull . coerce
1895+ {-# INLINABLE merge #-}
1896+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
1897+ {-# INLINABLE fan #-}
1898+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
1899+ {-# INLINABLE switch #-}
1900+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
1901+ {-# INLINABLE coincidence #-}
1902+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
1903+ {-# INLINABLE current #-}
1904+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
1905+ {-# INLINABLE updated #-}
1906+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
1907+ {-# INLINABLE unsafeBuildDynamic #-}
2575−
1908+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
1909+ {-# INLINABLE unsafeBuildIncremental #-}
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
1910+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2578−{-# INLINE [1] mapDynamicSpider #-}
1911+ {-# INLINABLE mergeIncremental #-}
1912+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
1913+ {-# INLINABLE currentIncremental #-}
1914+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
1915+ {-# INLINABLE updatedIncremental #-}
1916+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
1917+ {-# INLINABLE incrementalToDynamic #-}
1918+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
1919+ c <- readBehaviorUntracked $ dynamicCurrent i
1920+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
1921+ eventCoercion Coercion = Coercion
1922+ behaviorCoercion Coercion = Coercion
1923+ 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
1925+instance R.MonadSample (SpiderTimeline x) (EventM x) where
2581− pure = SpiderDynamic . dynamicConst
1926+ {-# INLINABLE sample #-}
2582−#if MIN_VERSION_base(4,10,0)
1927+ 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)
1929+instance R.MonadHold (SpiderTimeline x) (EventM x) where
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
1930+ {-# INLINABLE hold #-}
1931+ hold = holdSpiderEventM
1932+ {-# INLINABLE holdDyn #-}
1933+ holdDyn = holdDynSpiderEventM
1934+ {-# INLINABLE holdIncremental #-}
1935+ holdIncremental = holdIncrementalSpiderEventM
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
1937+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
1938+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)
1940+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
1941+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)
1943+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
1944+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
1946+instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602 {-# INLINABLE hold #-}
1947 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
1948+ hold v0 e = R.runHostFrame $ R.hold v0 e
2604 {-# INLINABLE holdDyn #-}
1949 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
1950+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2606 {-# INLINABLE holdIncremental #-}
1951 {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
1952+ 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
1954+instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
1955 {-# INLINABLE sample #-}
2636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
1956 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
1958+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
1959+ {-# INLINABLE sample #-}
1960+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
1962+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2639 {-# INLINABLE sample #-}
1963 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
1964+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
1966+instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2643 {-# INLINABLE hold #-}
1967 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
1968+ hold v0 e = R.current <$> R.holdDyn v0 e
2645 {-# INLINABLE holdDyn #-}
1969 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
1970+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
2647 {-# INLINABLE holdIncremental #-}
1971 {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
1972+ 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−--------------------------------------------------------------------------------
1974+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'
1976+data SpiderEventHandle x a = SpiderEventHandle
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
1977+ { spiderEventHandleSubscription :: EventSubscription x
2662−type SpiderEnv = SpiderTimeline
1978+ , spiderEventHandleValue :: IORef (Maybe a)
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
1981+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664 {-# INLINABLE subscribeEvent #-}
1982 {-# INLINABLE subscribeEvent #-}
2665 subscribeEvent e = SpiderHostFrame $ do
1983 subscribeEvent e = SpiderHostFrame $ do
2666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
1984 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2677,149 +1995,18 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTim
2677 , spiderEventHandleValue = val
1995 , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
1998+instance R.ReflexHost (SpiderTimeline x) where
2681 type EventTrigger (SpiderTimeline x) = RootTrigger x
1999 type EventTrigger (SpiderTimeline x) = RootTrigger x
2682 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2000 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2001 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2003+instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2686 {-# NOINLINE readEvent #-}
2004 {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2005+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2688 result <- readIORef $ spiderEventHandleValue h
2006 result <- readIORef $ spiderEventHandleValue h
2690 return result
2008 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
2010instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2011 type Ref (EventM x) = Ref IO
2825 {-# INLINABLE newRef #-}
2012 {-# INLINABLE newRef #-}
@@ -2834,7 +2021,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2021 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2023-- | 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)
2024+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2026instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2027 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2030,20 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2030 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2031 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2032 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847 {-# INLINABLE fail #-}
2033 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2034+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2036-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2037-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2038runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2039+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2860-- | Run an action affecting a given Spider timeline; this will be guarded by a
2041-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861-- mutex for that timeline
2042-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2043+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2044+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2046+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2048instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2049 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2052,26 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2052 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2053 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2054 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2055 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2056 fail s = SpiderHostFrame $ fail s
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2058+instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2059+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2882− notReady = pure ()
2060+
2061+instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2062+ {-# INLINABLE hold #-}
2063+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2064+ {-# INLINABLE holdDyn #-}
2065+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2066+ {-# INLINABLE holdIncremental #-}
2067+ 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)
2069+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2070newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2071 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2072 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2074+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2075newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2076 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2077 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2082,41 @@ newFanEventWithTriggerIO f = do
2898 return $ EventSelector $ \k -> eventRoot k r
2083 return $ EventSelector $ \k -> eventRoot k r
2085+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2086+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2087+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2088+ es <- newFanEventWithTriggerIO f
2089+ return $ R.EventSelector $ SpiderEvent . select es
2091+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2092+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2093+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2094+ es <- newFanEventWithTriggerIO f
2095+ return $ R.EventSelector $ SpiderEvent . select es
2097+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2098+ {-# INLINABLE subscribeEvent #-}
2099+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2101newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2103+instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2104+ {-# INLINABLE sample #-}
2105+ sample = ReadPhase . R.sample
2107+instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2108+ {-# INLINABLE hold #-}
2109+ hold v0 e = ReadPhase $ R.hold v0 e
2110+ {-# INLINABLE holdDyn #-}
2111+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2112+ {-# INLINABLE holdIncremental #-}
2113+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2115+instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2116+ type ReadPhase (SpiderHost x) = ReadPhase x
2117+ fireEventsAndRead es (ReadPhase a) = run es a
2118+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2120instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2121 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2122 newRef = SpiderHost . newRef
@@ -2921,10 +2139,9 @@ instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2139 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2140 primitive = SpiderHostFrame . EventM . primitive
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2142+--------------------------------------------------------------------------------
2925− notReadyUntil _ = return ()
2143+-- Deprecated items
2926− notReady = return ()
2144+--------------------------------------------------------------------------------
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2146+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2929− notReadyUntil _ = return ()
2147+type SpiderEnv = SpiderTimeline
2930− notReady = return ()