@@ -2,132 +2,78 @@
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)
46+import Data.Maybe
64−import Data.Monoid (mempty, (<>))
47+import Data.Monoid ((<>))
65import Data.Proxy
48import Data.Proxy
49+import Data.Some (Some)
50+import qualified Data.Some as Some
66import Data.These
51import Data.These
67import Data.Traversable
52import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
53+import Data.Type.Coercion
69−import Data.Witherable (Filterable, mapMaybe)
54+import Data.Word
70−import GHC.Exts hiding (toList)
55+import GHC.Exts
71import GHC.IORef (IORef (..))
56import GHC.IORef (IORef (..))
72import GHC.Stack
57import GHC.Stack
73−import Reflex.FastWeak
74import System.IO.Unsafe
58import System.IO.Unsafe
75import System.Mem.Weak
59import System.Mem.Weak
76import Unsafe.Coerce
60import 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
62#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
63import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
64import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
65import qualified Data.List.NonEmpty as NonEmpty
66+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
67import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
68+#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)
70+import Data.WeakBag (WeakBag, WeakBagTicket)
104import qualified Data.WeakBag as WeakBag
71import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
106import qualified Reflex.Class as R
72import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
73+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
75+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
120−debugStrLn :: String -> IO ()
76+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
78debugPropagate :: Bool
@@ -136,42 +82,28 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
82debugInvalidate :: Bool
138#ifdef DEBUG
84#ifdef DEBUG
139#define DEBUG_NODEIDS
86#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
88debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
90debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
92debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
94class HasNodeId a where
160 getNodeId :: a -> Int
95 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
97+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
98 getNodeId = holdNodeId
100+instance HasNodeId (PushSubscribed x a b) where
101+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
103instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
104 getNodeId = switchSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
106+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
107 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
109instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +117,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
118{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
119showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
120+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
122+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
123+showSubscriberType = \case
192−
124+ SubscriberPush _ _ -> "SubscriberPush"
125+ SubscriberMerge _ _ -> "SubscriberMerge"
126+ SubscriberFan _ -> "SubscriberFan"
127+ SubscriberMergeChange _ -> "SubscriberMergeChange"
128+ SubscriberHold _ -> "SubscriberHold"
129+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
130+ SubscriberSwitch _ -> "SubscriberSwitch"
131+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
132+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
133+ SubscriberHandle -> "SubscriberHandle"
135+showEventType :: Event x a -> String
136+showEventType = \case
137+ EventRoot _ _ -> "EventRoot"
138+ EventNever -> "EventNever"
139+ EventPush _ -> "EventPush"
140+ EventMerge _ -> "EventMerge"
141+ EventFan _ _ -> "EventFan"
142+ EventSwitch _ -> "EventSwitch"
143+ EventCoincidence _ -> "EventCoincidence"
144+ EventHold _ -> "EventHold"
145+ EventDyn _ -> "EventDyn"
146+ EventHoldIdentity _ -> "EventHoldIdentity"
147+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
151debugPropagate = False
197debugInvalidateHeight = False
153debugInvalidateHeight = False
198debugInvalidate = False
155debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
157-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +159,6 @@ debugInvalidate = False
202showNodeId :: a -> String
159showNodeId :: a -> String
203showNodeId _ = ""
160showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
164#ifdef DEBUG_NODEIDS
@@ -215,200 +168,93 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
169newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
170newNodeId = 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 ()
172+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
173+unsafeNodeId :: a -> Int
174+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
179--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
181--------------------------------------------------------------------------------
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)
183+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
185-- | 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
186-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
187-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
188+{-# INLINABLE pushCheap #-}
254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
189pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
190+pushCheap f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
191+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
192 { subscriberPropagate = \a -> do
258− mb <- f a
193+ mb <- runComputeM $ f a
259 mapM_ (subscriberPropagate sub) mb
194 mapM_ (subscriberPropagate sub) mb
261− occ' <- join <$> mapM f occ
196+ occ' <- join <$> mapM (runComputeM . f) occ
262 return (subscription, occ')
197 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
199data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
200+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
201+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
202 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
203+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
204 , _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
207-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
208-- repeatedly
328--TODO: Try a caching strategy where we subscribe directly to the parent when
210--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
211+--there's only one subscriber, and then build our own WeakBag only when a second
330--subscriber joins
212--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
213+{-# INLINABLE cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
214+cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
334−#ifdef DEBUG_TRACE_EVENTS
335− withStackOneLine $ \callSite -> Event $
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
215+cacheEvent e = Event $ \sub -> {-# SCC "cacheEvent" #-} do
343−#ifdef DEBUG_TRACE_EVENTS
216+ let !mSubscribedRef = unsafeNewIORef e Nothing
344− unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
346− subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
217+ mSubscribed <- liftIO $ readIORef mSubscribedRef
347− Just subscribedTicket -> return subscribedTicket
218+ case mSubscribed of
348− Nothing -> do
219+ Just subscribed -> liftIO $ do
349−#ifdef DEBUG_NODEIDS
220+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
350− nodeId <- liftIO newNodeId
221+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
351−#endif
222+ let es = EventSubscribed
352− subscribers <- liftIO FastWeakBag.empty
223+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
353− occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
224+ , eventSubscribedRetained = toAny subscribed
354−#ifdef DEBUG_NODEIDS
225+ }
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
226+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
356−#else
227+ Nothing -> do
228+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
229+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
230+ occRef <- liftIO $ newIORef undefined
357− (parentSub, occ) <- subscribeAndRead e $ Subscriber
231+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
232+ { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
233+ liftIO $ writeIORef occRef $ Just a
361− scheduleClear occRef
234+ scheduleClear occRef
362− propagateFast a subscribers
235+ propagate a subscribers
236+ , subscriberInvalidateHeight = \old -> do
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
237+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
238+ , subscriberRecalculateHeight = \new -> do
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
239+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
366− when (isJust occ) $ do
367− liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368− scheduleClear occRef
369− let !subscribed = CacheSubscribed
370− { _cacheSubscribed_subscribers = subscribers
371− , _cacheSubscribed_parent = parentSub
372− , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377− subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378− liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379− return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
410− return (es, occ)
241+ liftIO $ writeIORef occRef occ
242+ when (isJust occ) $ scheduleClear occRef
243+ let !subscribed = CacheSubscribed
244+ { _cacheSubscribed_subscribers = subscribers
245+ , _cacheSubscribed_weakSelf = weakSelf
246+ , _cacheSubscribed_parent = parentSub
247+ , _cacheSubscribed_cached = mSubscribedRef
248+ , _cacheSubscribed_occurrence = occRef
250+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
251+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
252+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
254+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
255+cleanupCacheSubscribed self = do
256+ unsubscribe $ _cacheSubscribed_parent self
257+ writeIORef (_cacheSubscribed_cached self) Nothing
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
259subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
260subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +266,13 @@ wrap tag getSpecificSubscribed sub = do
420 let es = tag subd
266 let es = tag subd
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
267 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
269+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
270eventRoot !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
272eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
273+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
275+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
276eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
278eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +281,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
281eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
282eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
441−eventHold :: Hold x p -> Event x p
284+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442eventHold !h = Event $ subscribeHoldEvent h
285eventHold !h = Event $ subscribeHoldEvent h
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
287+eventDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Event x p
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
288eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
447{-# INLINE subscribeCoincidenceInner #-}
290{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
291+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
292subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
293 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
294 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +307,102 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
307 , subscriberRecalculateHeight :: !(Height -> IO ())
310+--TODO: Move this comment to WeakBag
311+-- These function are constructor functions that are marked NOINLINE so they are
312+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
313+-- so any weak references that are attached to the constructors will have their
314+-- finalizer run. Using the opaque constructor, does not see the
315+-- constructor application, so it behaves like an IORef and cannot be fused away.
317+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
318+-- the weak pointer to it in some cases.
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
320+newSubscriberHold :: (HasSpiderTimeline x, R.Patch p) => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
321newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
322 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470 , subscriberInvalidateHeight = \_ -> return ()
323 , subscriberInvalidateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
324 , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
327+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
328+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
329 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
330 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
331+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
332 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
333 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
334+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
335 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
336 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
337 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
338 return ()
486 , subscriberInvalidateHeight = \old -> do
339 , subscriberInvalidateHeight = \old -> do
340+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
341 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
342+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
343+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
344 , subscriberRecalculateHeight = \new -> do
345+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
346 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
347+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
348+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
351newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
352+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
353 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
354+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
355 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
356 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
357 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
358 , subscriberInvalidateHeight = \_ -> do
359+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
360 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
361 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
362 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
363+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
364+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
365+ , subscriberRecalculateHeight = \new -> do
366+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
367+ updateSwitchHeight new subscribed
368+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
371newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
372+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
373 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
374+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
375 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
376 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
377 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
378 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
379 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
380 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
381 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
382 case occ of
520− Nothing ->
383+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
384 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
385 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
386+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
387+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
388 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
389 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
390 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
391 propagate o $ coincidenceSubscribedSubscribers subscribed
392+ , subscriberInvalidateHeight = \_ -> do
393+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
394+ invalidateCoincidenceHeight subscribed
395+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
396+ , subscriberRecalculateHeight = \_ -> do
397+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
398+ recalculateCoincidenceHeight subscribed
399+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
402newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
403+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
404 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
405+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
406 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
407 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
408 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +410,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
410 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
411 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
412 propagate a $ coincidenceSubscribedSubscribers subscribed
413+ , subscriberInvalidateHeight = \_ -> do
414+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
415+ invalidateCoincidenceHeight subscribed
416+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
417+ , subscriberRecalculateHeight = \_ -> do
418+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
419+ recalculateCoincidenceHeight subscribed
420+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
423invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +427,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
427recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
429-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
430+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
431+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
432 -- 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
433 --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
434+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
436--------------------------------------------------------------------------------
568-- EventSubscribed
437-- EventSubscribed
@@ -571,16 +440,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571toAny :: a -> Any
440toAny :: a -> Any
572toAny = unsafeCoerce
441toAny = 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
443data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
444 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
445 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
446#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
447+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
448 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
449 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +471,13 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
471 , 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
475+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
476eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
477 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
478 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
479#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
480+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
481 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
482 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +490,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
490#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
491 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
492 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
493+ return [Some.This $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
494 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
495 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +503,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
503#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
504 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
505 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
506+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
507+ innerParents = maybeToList $ fmap Some.This innerSubscription
654 return $ outerParent : innerParents
508 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
509 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
510 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,29 +518,41 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
518whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
519whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
521+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
522walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
523+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
524 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
525 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
526 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
527+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
528 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
529+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
530 return subscribers
679{-# INLINE subscribeHoldEvent #-}
533{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
534+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681subscribeHoldEvent = subscribeAndRead . holdEvent
535subscribeHoldEvent = subscribeAndRead . holdEvent
537+--------------------------------------------------------------------------------
539+--------------------------------------------------------------------------------
541+data EventSubscription x = EventSubscription
542+ { _eventSubscription_unsubscribe :: !(IO ())
543+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
546+unsubscribe :: EventSubscription x -> IO ()
547+unsubscribe (EventSubscription u _) = u
683--------------------------------------------------------------------------------
549--------------------------------------------------------------------------------
684-- Behavior
550-- Behavior
685--------------------------------------------------------------------------------
551--------------------------------------------------------------------------------
687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
553newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
555+behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
690behaviorHold !h = Behavior $ readHoldTracked h
556behaviorHold !h = Behavior $ readHoldTracked h
692behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
558behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -700,7 +566,7 @@ behaviorPull !p = Behavior $ do
700 val <- liftIO $ readIORef $ pullValue p
566 val <- liftIO $ readIORef $ pullValue p
701 case val of
567 case val of
702 Just subscribed -> do
568 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
569+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
570 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
571 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706 return $ pullSubscribedValue subscribed
572 return $ pullSubscribedValue subscribed
@@ -709,7 +575,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
575 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
576 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
577 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
578+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
579 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
580 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
581 let subscribed = PullSubscribed
@@ -719,22 +585,22 @@ behaviorPull !p = Behavior $ do
719 , pullSubscribedParents = parents
585 , pullSubscribedParents = parents
721 liftIO $ writeIORef (pullValue p) $ Just subscribed
587 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
588+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
591+behaviorDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Behavior x (R.PatchTarget p)
726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
592behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
728{-# INLINE readHoldTracked #-}
594{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
595+readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
730readHoldTracked h = do
596readHoldTracked h = do
731 result <- liftIO $ readIORef $ holdValue h
597 result <- liftIO $ readIORef $ holdValue h
732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
598 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
599+ 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
600 return result
602+{-# SPECIALIZE readBehaviorUntracked :: HasSpiderTimeline x => Behavior x a -> BehaviorM x a #-}
737−{-# INLINABLE readBehaviorUntracked #-}
603+{-# SPECIALIZE readBehaviorUntracked :: HasSpiderTimeline x => Behavior x a -> EventM x a #-}
738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
604readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739readBehaviorUntracked b = do
605readBehaviorUntracked b = do
740 holdInits <- getDeferralQueue
606 holdInits <- getDeferralQueue
@@ -744,49 +610,45 @@ readBehaviorUntracked b = do
744-- Dynamic
610-- Dynamic
745--------------------------------------------------------------------------------
611--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
613+data Dynamic x p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
614+ { 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`?
615+ , dynamicUpdated :: !(Event x p)
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
759−dynamicHold :: Hold x p -> DynamicS x p
618+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760dynamicHold !h = Dynamic
619dynamicHold !h = Dynamic
761 { dynamicCurrent = behaviorHold h
620 { dynamicCurrent = behaviorHold h
762 , dynamicUpdated = eventHold h
621 , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
624+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766dynamicHoldIdentity = dynamicHold
625dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
627+dynamicConst :: R.PatchTarget p -> Dynamic x p
769dynamicConst !a = Dynamic
628dynamicConst !a = Dynamic
770 { dynamicCurrent = behaviorConst a
629 { dynamicCurrent = behaviorConst a
771 , dynamicUpdated = eventNever
630 , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
633+dynamicDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Dynamic x p
775dynamicDyn !d = Dynamic
634dynamicDyn !d = Dynamic
776 { dynamicCurrent = behaviorDyn d
635 { dynamicCurrent = behaviorDyn d
777 , dynamicUpdated = eventDyn d
636 , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
639+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781dynamicDynIdentity = dynamicDyn
640dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
642--------------------------------------------------------------------------------
784-- Combinators
643-- Combinators
785--------------------------------------------------------------------------------
644--------------------------------------------------------------------------------
646+--TODO: Figure out why certain things are not 'representational', then make them
647+--representational so we can use coerce
787--type role Hold representational
649--type role Hold representational
788data Hold x p
650data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
651+ = Hold { holdValue :: !(IORef (R.PatchTarget p))
790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
652 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
653 , 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
654 , 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,46 +657,13 @@ 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
660data EventEnv x
830 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
661 = EventEnv { 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 ()]))
@@ -845,7 +674,7 @@ runEventM :: EventM x a -> IO a
845runEventM = unEventM
674runEventM = unEventM
847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
676asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
677+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
850class MonadIO m => Defer a m where
679class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
680 getDeferralQueue :: m (IORef [a])
@@ -864,11 +693,7 @@ instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
864 {-# INLINE getDeferralQueue #-}
693 {-# INLINE getDeferralQueue #-}
865 getDeferralQueue = asksEventEnv eventEnvHoldInits
694 getDeferralQueue = asksEventEnv eventEnvHoldInits
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
871−instance Defer (SomeHoldInit x) (BehaviorM x) where
696+instance HasSpiderTimeline x => Defer (SomeHoldInit x) (BehaviorM x) where
872 {-# INLINE getDeferralQueue #-}
697 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
698 getDeferralQueue = BehaviorM $ asks snd
@@ -895,48 +720,41 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
895 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
720 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
897class HasSpiderTimeline x where
722class HasSpiderTimeline x where
898− -- | Retrieve the current SpiderTimelineEnv
723+ -- | Retrieve the current SpiderTimeline
899− spiderTimeline :: SpiderTimelineEnv x
724+ spiderTimeline :: SpiderTimeline x
901instance HasSpiderTimeline Global where
726instance HasSpiderTimeline Global where
902− spiderTimeline = globalSpiderTimelineEnv
727+ spiderTimeline = globalSpiderTimeline
904putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
729putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905putCurrentHeight h = do
730putCurrentHeight h = do
906 heightRef <- asksEventEnv eventEnvCurrentHeight
731 heightRef <- asksEventEnv eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
732 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
734+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
735 {-# INLINE getDeferralQueue #-}
911 getDeferralQueue = asksEventEnv eventEnvClears
736 getDeferralQueue = asksEventEnv eventEnvClears
913{-# INLINE scheduleClear #-}
738{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
739+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
740+scheduleClear r = defer $ SomeClear r
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
742+instance HasSpiderTimeline x => Defer SomeRootClear (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
926 {-# INLINE getDeferralQueue #-}
743 {-# INLINE getDeferralQueue #-}
927 getDeferralQueue = asksEventEnv eventEnvRootClears
744 getDeferralQueue = asksEventEnv eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
746{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
747+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
748+scheduleRootClear r = defer $ SomeRootClear r
933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
750instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934 {-# INLINE getDeferralQueue #-}
751 {-# INLINE getDeferralQueue #-}
935 getDeferralQueue = asksEventEnv eventEnvResetCoincidences
752 getDeferralQueue = asksEventEnv eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
754-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
755+{-# SPECIALIZE hold :: (HasSpiderTimeline x, R.Patch p) => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
756+{- SPECIALIZE hold :: (HasSpiderTimeline x, 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)
757+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
940hold v0 e = do
758hold v0 e = do
941 valRef <- liftIO $ newIORef v0
759 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
760 invsRef <- liftIO $ newIORef []
@@ -957,7 +775,7 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
777{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
778+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 ~ EventM x) => Hold x p -> m (EventSubscription x)
961getHoldEventSubscription h = do
779getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
780 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
781 case ep of
@@ -971,7 +789,7 @@ getHoldEventSubscription h = do
971 Nothing -> return ()
789 Nothing -> return ()
972 Just o -> do
790 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
791 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
792+ case R.apply o old of
975 Nothing -> return ()
793 Nothing -> return ()
976 Just new -> do
794 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
795 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +801,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
802type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
804+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
805-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
806+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
808instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
809 {-# INLINE (>>=) #-}
@@ -994,16 +812,14 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
812 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
813 {-# INLINE return #-}
996 return x = BehaviorM $ return x
814 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
815 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
816 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
818data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
819 = forall p. BehaviorSubscribedHold (Hold x p)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
820 | BehaviorSubscribedPull (PullSubscribed x a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
822+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1008--type role PullSubscribed representational
824--type role PullSubscribed representational
1009data PullSubscribed x a
825data PullSubscribed x a
@@ -1038,15 +854,13 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
857+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
858 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
859 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
860 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
863+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
865data SomeMergeUpdate x = SomeMergeUpdate
1052 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
866 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
@@ -1057,14 +871,18 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
871newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
873-- 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)
874+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
876+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
878+instance Defer (SomeHoldInit x) (ComputeM x) where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
879+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
880+
1067− }
881+{-# SPECIALIZE runComputeM :: HasSpiderTimeline x => ComputeM x a -> EventM x a #-}
882+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
883+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
885+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1069data HeightBag = HeightBag
887data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
888 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +900,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
900heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
902heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
903+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
905heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
906heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +909,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
909 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
910 _ -> 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
912heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
913heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
914 Just ((h, _), _) -> Height h
@@ -1116,25 +926,25 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
926heightBagVerify = id
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
929+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
930+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
931+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
932+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
935+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
936+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
937+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
938+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129 , fanSubscribedParent :: !(EventSubscription x)
939 , fanSubscribedParent :: !(EventSubscription x)
1130#ifdef DEBUG_NODEIDS
940#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
941 , fanSubscribedNodeId :: Int
1135−data Fan x k v
945+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
946+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
947+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
950data SwitchSubscribed x a
@@ -1158,9 +968,7 @@ data Switch x a
1158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
968 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
971{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164data CoincidenceSubscribed x a
972data CoincidenceSubscribed x a
1165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
973 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
974 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +996,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
996newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189newInvalidatorPull p = return $! InvalidatorPull p
997newInvalidatorPull p = return $! InvalidatorPull p
1191−instance HasSpiderTimeline x => Filterable (Event x) where
999+instance HasSpiderTimeline x => R.FunctorMaybe (Event x) where
1192− mapMaybe f = push $ return . f
1000+ fmapMaybe f = push $ return . f
1194instance HasSpiderTimeline x => Align (Event x) where
1002instance HasSpiderTimeline x => Align (Event x) where
1195 nil = eventNever
1003 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 $
1004+ 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) }
1006+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)
1008+newMapDyn :: HasSpiderTimeline x => (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)
1009+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
1011--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)
1012+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1220zipDynWith f da db =
1013zipDynWith f da db =
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1014 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1222 ec = flip push eab $ \o -> do
1015 ec = flip push eab $ \o -> do
@@ -1229,70 +1022,75 @@ zipDynWith f da db =
1229 return (a, b)
1022 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1023 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
1024 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1025+ 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)
1027+unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1235−buildDynamic readV0 v' = do
1028+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1029+ 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
1031+newJoinDyn :: HasSpiderTimeline x => Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1242−unsafeBuildDynamic readV0 v' =
1032+newJoinDyn d =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1033+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1034+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1035+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1036+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1037+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1038+ in unsafeDyn readV0 v'
1245-- ResultM can read behaviors and events
1040-- ResultM can read behaviors and events
1246type ResultM = EventM
1041type ResultM = EventM
1043+{-# NOINLINE unsafeNewIORef #-}
1044+unsafeNewIORef :: a -> b -> IORef b
1045+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248instance HasSpiderTimeline x => Functor (Event x) where
1047instance HasSpiderTimeline x => Functor (Event x) where
1249 fmap f = push $ return . Just . f
1048 fmap f = push $ return . Just . f
1251instance Functor (Behavior x) where
1050instance Functor (Behavior x) where
1252 fmap f = pull . fmap f . readBehaviorTracked
1051 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
1053+{-# INLINABLE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1255push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1054push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256push f e = cacheEvent (pushCheap f e)
1055push f e = cacheEvent (pushCheap f e)
1057+push f e = eventPush $ Push
1060+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1062+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258{-# INLINABLE pull #-}
1065{-# INLINABLE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1066pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1067+pull a = behaviorPull $ Pull
1261− ref <- newIORef Nothing
1068+ { pullCompute = a
1069+ , pullValue = unsafeNewIORef a Nothing
1262#ifdef DEBUG_NODEIDS
1070#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1071+ , pullNodeId = unsafeNodeId a
1265− pure $ behaviorPull $ Pull
1268−#ifdef DEBUG_NODEIDS
1273{-# INLINABLE switch #-}
1075{-# INLINABLE switch #-}
1274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1076switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1077+switch a = eventSwitch $ Switch
1278− { switchParent = a
1078+ { switchParent = a
1279− , switchSubscribed = ref
1079+ , switchSubscribed = unsafeNewIORef a Nothing
1282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1082coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1083+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1084+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1085+ , 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
1088-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1089run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1090run roots after = do
1293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1091 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1092+ spiderTimeline <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1093+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1094 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1095 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1096 occBefore <- readIORef occRef
@@ -1330,11 +1128,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?)
1128 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))
1131+data SomeClear = forall a. SomeClear (IORef (Maybe a))
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1133+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
1135data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
@@ -1346,110 +1142,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1142 x' <- evaluate x
1347 mkWeakPtr x' $
1143 mkWeakPtr x' $
1348 if debugFinalize
1144 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1145+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1146 else Nothing
1352type WeakList a = [Weak a]
1148type 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 #-}
1150{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1152+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1153+withIncreasedDepth a = do
1154+ spiderTimeline <- askSpiderTimeline
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1155+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1385 result <- a
1156 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1157+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1387 return result
1158 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
1160+withIncreasedDepth :: m a -> m a
1161+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1164+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1166{-# INLINE tracePropagate #-}
1419tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1167tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1168+tracePropagate p = traceWhen p debugPropagate
1422{-# INLINE traceInvalidate #-}
1170{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1171traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1172+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
1174+{-# INLINE traceWhen #-}
1175+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1176+traceWhen p b message = traceMWhen p b $ return message
1440−{-# INLINE trace #-}
1178+{-# INLINE traceMWhen #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1179+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1442−trace _ _ = return ()
1180+traceMWhen _ b getMessage = when b $ do
1443−
1181+ message <- getMessage
1444−{-# INLINE traceM #-}
1182+#ifdef DEBUG
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1183+ spiderTimeline <- askSpiderTimeline
1446−traceM _ _ = return ()
1184+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1188+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1190whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1191whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1194groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1195groupByHead = \case
1455 [] -> []
1196 [] -> []
@@ -1460,54 +1201,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1201 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1203listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1204+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 #-}
1207{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1208+propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, R.Patch p) => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1209propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1210+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1211 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1212 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1213 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1214+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1215 Nothing -> return ()
1508 Just v' -> do
1216 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1217+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1218 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1219 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1220 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,53 +1222,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
1222data 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
1224runBehaviorM :: 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)
1225+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1227askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1228askInvalidator = do
1522− (!m, _) <- ask
1229+ (!m, _) <- BehaviorM ask
1523 case m of
1230 case m of
1524 Nothing -> return Nothing
1231 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1232 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1234askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1235askParentsRef = do
1529− (!m, _) <- ask
1236+ (!m, _) <- BehaviorM ask
1530 case m of
1237 case m of
1531 Nothing -> return Nothing
1238 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1239 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1241askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1242askBehaviorHoldInits = do
1536− (_, !his) <- ask
1243+ (_, !his) <- BehaviorM ask
1537 return his
1244 return his
1539{-# INLINE getDynHold #-}
1246{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1247+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
1541getDynHold d = do
1248getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1249 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1250 case mh of
1544− HoldDyn h -> return h
1251+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1252+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1253 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1254 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1255 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1256+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1257 return h
1559-- Always refers to 0
1259-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1260{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1261zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1262zeroRef = unsafePerformIO $ newIORef zeroHeight
1264+type CanSubscribe x m =
1265+ ( HasSpiderTimeline x
1266+ , HasCurrentHeight x m
1267+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1268+ , Defer SomeClear m -- Wiping out event firings
1269+ , Defer (SomeAssignment x) m -- Updating state
1270+ , 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)
1274+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1275getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1276 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1277 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1285,10 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1285 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1286 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1287 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1288+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1289 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1290 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1291+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1292 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1293 , rootSubscribedCachedSubscribed = cached
1589 , rootSubscribedOccurrence = getOcc
1294 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1296,17 @@ getRootSubscribed k r sub = do
1591 , rootSubscribedUninit = uninit
1296 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1297 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1298#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1299+ , 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)
1302+ 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
1303 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
1304 occ <- getOcc
1610 return (sln, subscribed, occ)
1305 return (sln, subscribed, occ)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1307{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1308cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1309+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1310 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1311 modifyIORef' cached $ DMap.delete k
@@ -1621,90 +1314,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
1621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1314subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1315subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1317+{-# SPECIALIZE getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1625−
1318+getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
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
1319getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1320 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1321 case mSubscribed of
@@ -1722,16 +1333,13 @@ getFanSubscribed k f sub = do
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1333 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723 occRef <- liftIO $ newIORef parentOcc
1334 occRef <- liftIO $ newIORef parentOcc
1724 when (isJust parentOcc) $ scheduleClear occRef
1335 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1336 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1337 { fanSubscribedCachedSubscribed = fanSubscribed f
1730 , fanSubscribedOccurrence = occRef
1338 , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1339 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1340 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1341#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1342+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1345 let !self = (k, subscribed)
@@ -1741,7 +1349,7 @@ getFanSubscribed k f sub = do
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1349 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1350 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1352+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1353cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1354 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1355 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1361,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1361 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1363{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1364+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1757subscribeFanSubscribed k subscribed sub = do
1365subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1366 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1367 case DMap.lookup k subscribers of
@@ -1765,8 +1373,8 @@ subscribeFanSubscribed k subscribed sub = do
1765 return sln
1373 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1374 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1376+{-# SPECIALIZE getSwitchSubscribed :: HasSpiderTimeline x => 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)
1377+getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1770getSwitchSubscribed s sub = do
1378getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1379 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1380 case mSubscribed of
@@ -1791,9 +1399,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1399 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1400 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1401 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1402 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1403 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1404 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1411,7 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1411 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1412 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1413#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1414+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1417 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1429,8 @@ cleanupSwitchSubscribed subscribed = do
1824subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1429subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1430subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1432+{-# SPECIALIZE getCoincidenceSubscribed :: HasSpiderTimeline x => 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)
1433+getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1829getCoincidenceSubscribed c sub = do
1434getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1435 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1436 case mSubscribed of
@@ -1851,9 +1456,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1456 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1457 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1458 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1459 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1460 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1461 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1466,7 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1466 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1467 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1468#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1469+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1472 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,497 +1483,212 @@ cleanupCoincidenceSubscribed subscribed = do
1881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1483subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1484subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1486+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1487+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1886− => (forall a. q a -> Event x (v a))
1488+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
1489 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1490 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1491 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1492 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114− parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1493+ parentsRef <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1494+ let scheduleSelf height = scheduleMerge' height heightRef $ do
2116−
1495+ m <- liftIO $ readIORef accumRef
2117− let subscribed = EventSubscribed
1496+ liftIO $ writeIORef accumRef $! DMap.empty
2118− { eventSubscribedHeightRef = heightRef
1497+ --TODO: Assert that m is not empty
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
1498+ subscriberPropagate sub m
2120−#ifdef DEBUG_CYCLES
1499+ invalidateMyHeight = do
2121− , eventSubscribedGetParents = do
1500+ oldHeight <- readIORef heightRef
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
1501+ 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
1502+ 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 ()
1503+ subscriberInvalidateHeight sub oldHeight
2156− , subscriberRecalculateHeight = \_ -> return ()
1504+ 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
1505 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?
1506+ 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
1507 heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
1508+ parents <- readIORef parentsRef
1509+ -- 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
1510+ case heightBagSize heights `compare` DMap.size parents of
2202 LT -> return ()
1511 LT -> return ()
2203 EQ -> do
1512 EQ -> do
2204 let height = succHeight $ heightBagMax heights
1513 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1514+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2206 writeIORef heightRef $! height
1515 writeIORef heightRef $! height
2207 subscriberRecalculateHeight sub height
1516 subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
1517+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge"
1518+ subscriber :: forall a. k a -> Subscriber x a
2209− mySubscriber k = Subscriber
1519+ subscriber k = Subscriber
2210 { subscriberPropagate = \a -> do
1520 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
1521+ oldM <- liftIO $ readIORef accumRef
2212−
1522+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
2213− wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
1523+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2214− liftIO $ FastMutableIntMap.insert accum k a
1524+ liftIO $ writeIORef accumRef $! newM
1525+ when (DMap.null oldM) $ do -- Only schedule the firing once
1526+ height <- liftIO $ readIORef heightRef
1527+ --TODO: assertions about height
1528+ currentHeight <- getCurrentHeight
1529+ when (height <= currentHeight) $ do
1530+ if height /= invalidHeight
1532+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1533+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1536+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1537+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1538+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1542+ error $ "Causality loop found" <> cycleInfo
2215− when wasEmpty scheduleSelf
1543+ scheduleSelf height
2216− , subscriberInvalidateHeight = \old -> do
1544+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2217 modifyIORef' heightBagRef $ heightBagRemove old
1545 modifyIORef' heightBagRef $ heightBagRemove old
2218 invalidateMyHeight
1546 invalidateMyHeight
2219 , subscriberRecalculateHeight = \new -> do
1547 , subscriberRecalculateHeight = \new -> do
2220 modifyIORef' heightBagRef $ heightBagAdd new
1548 modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
1549+ revalidateMyHeight
2223− forM_ (IntMap.toList initialParents) $ \(k, p) -> do
1551+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1552+ let s = subscriber k
2224− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
1553+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
2226− forM_ parentOcc $ FastMutableIntMap.insert accum k
2227− FastMutableIntMap.insert parents k subscription
2228− height <- getEventSubscribedHeight parentSubd
1554+ height <- liftIO $ getEventSubscribedHeight parentSubd
2229− if height == invalidHeight
1555+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
2230− then writeIORef heightRef invalidHeight
1556+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
2231− else do
1557+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
2232− modifyIORef' heightBagRef $ heightBagAdd height
1558+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2233− modifyIORef' heightRef $ \oldHeight ->
1559+ myHeight = if invalidHeight `elem` heights
2234− if oldHeight == invalidHeight
1560+ then invalidHeight
2235− then invalidHeight
1561+ else succHeight $ heightBagMax myHeightBag
2236− else max (succHeight height) oldHeight
2237− myHeight <- liftIO $ readIORef heightRef
2238 currentHeight <- getCurrentHeight
1562 currentHeight <- getCurrentHeight
2239− isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240− occ <- if currentHeight >= myHeight -- If we should have fired by now
1563+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2241− then if isEmpty
1564+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2242− then return Nothing
1565+ else (Nothing, dm)
2243− else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
1566+ unless (DMap.null accum) $ do
2244− else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
1567+ scheduleSelf myHeight
2245− return Nothing
1568+ occRef <- liftIO $ newIORef occ
1569+ when (isJust occ) $ scheduleClear occRef
1570+ liftIO $ writeIORef accumRef $! accum
1571+ liftIO $ writeIORef heightRef $! myHeight
1572+ liftIO $ writeIORef heightBagRef $! myHeightBag
1573+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1574+ liftIO $ writeIORef parentsRef $! DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1575+ let updateMe (R.PatchDMap p) = do
1576+ oldParents <- liftIO $ readIORef parentsRef
1577+ let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1578+ (mOldSubd, newPs) <- case me of
1579+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1581+ let s = subscriber k
1582+ subscription@(EventSubscription _ subd) <- subscribe e s
1583+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1584+ let newParent = MergeSubscribedParent subscription
1585+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1586+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1587+ forM_ mOldSubd $ \oldSubd -> do
1588+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1589+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1590+ return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1591+ (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
1592+ liftIO $ writeIORef parentsRef $! newParents
1593+ return subscriptionsToKill
2246 defer $ SomeMergeInit $ do
1594 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
1595+ let s = Subscriber
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1596 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
1597+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2266− defer $ updateMe a
1598+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
2267 , subscriberInvalidateHeight = \_ -> return ()
1599 , subscriberInvalidateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
1600 , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1602+ (EventSubscription _ changeSubd, change) <- subscribeAndRead (dynamicUpdated d) s
2271− forM_ change $ \c -> defer $ updateMe c
1603+ 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)
1604+ liftIO $ writeIORef changeSubdRef (s, changeSubd)
2276− let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
1605+ let unsubscribeAll = do
2277−
1606+ parents <- readIORef parentsRef
2278−
1607+ forM_ (DMap.toList parents) $ \(_ :=> MergeSubscribedParent s) -> unsubscribe s
2279− return (EventSubscription unsubscribeAll subscribed, occ)
1608+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
1612newtype 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
1614+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
1615+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
1616 let f = Fan
2288 { fanParent = e
1617 { fanParent = e
2289− , fanSubscribed = ref
1618+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1620+ in EventSelector $ \k -> eventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1622+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1623+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1624 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1625 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1626+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1627 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1628 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1629 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
2304 mapM_ unSomeMergeInit mergeInits
1630 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1631+ runHoldInits holdInitRef mergeInitRef
2307initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1633initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1634initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
2313newEventEnv :: IO (EventEnv x)
1636newEventEnv :: IO (EventEnv x)
2314newEventEnv = do
1637newEventEnv = do
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1638 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1639 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1640 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1641 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1642 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1643 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1644 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1645 coincidenceInfosRef <- newIORef []
2325 delayedRef <- newIORef IntMap.empty
1646 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1647+ return $ EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2328clearEventEnv :: EventEnv x -> IO ()
1649clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1650+clearEventEnv (EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2330 writeIORef toAssignRef []
1651 writeIORef toAssignRef []
2331 writeIORef holdInitRef []
1652 writeIORef holdInitRef []
2332− writeIORef dynInitRef []
2333 writeIORef mergeUpdateRef []
1653 writeIORef mergeUpdateRef []
2334 writeIORef mergeInitRef []
1654 writeIORef mergeInitRef []
2335 writeIORef heightRef zeroHeight
1655 writeIORef heightRef zeroHeight
2336 writeIORef toClearRef []
1656 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
2338 writeIORef toClearRootRef []
1657 writeIORef toClearRootRef []
2339 writeIORef coincidenceInfosRef []
1658 writeIORef coincidenceInfosRef []
2340 writeIORef delayedRef IntMap.empty
1659 writeIORef delayedRef IntMap.empty
2342-- | Run an event action outside of a frame
1661-- | Run an event action outside of a frame
2343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1662runFrame :: 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
1663+runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1664+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
2346 let go = do
1665 let go = do
2347 result <- a
1666 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
1667+ runHoldInits (eventEnvHoldInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
2349 return result
1668 return result
2350 result <- runEventM go
1669 result <- runEventM go
2351 toClear <- readIORef $ eventEnvClears env
1670 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1671+ 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
1672 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1673+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357 toAssign <- readIORef $ eventEnvAssignments env
1674 toAssign <- readIORef $ eventEnvAssignments env
2358 toReconnectRef <- newIORef []
1675 toReconnectRef <- newIORef []
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1676 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1677 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1678 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1679+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1680 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1681 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365 writeIORef (eventEnvMergeUpdates env) []
1682 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1683+ when debugPropagate $ putStrLn "Updating merges"
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1684 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1685+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1686 toReconnect <- readIORef toReconnectRef
2370 clearEventEnv env
1687 clearEventEnv env
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1688 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1689 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1690 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1691+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1692 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1693 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1694 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2379,13 +1696,13 @@ runFrame a = SpiderHost $ do
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1696 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1697 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
2381 e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1698 e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
2382− runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
1699+ runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
2383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
1700 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1701 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
1702+ 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)
1704 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1705+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1706 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1707 EventNever -> "EventNever"
2391 _ -> "something else"
1708 _ -> "something else"
@@ -2400,7 +1717,7 @@ runFrame a = SpiderHost $ do
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1717 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1718 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1719 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1720+ 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
1721 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
1722 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1723 unsubscribe subscription
@@ -2441,7 +1758,7 @@ invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1758 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1759 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1760 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1761+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1763updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
1764updateSwitchHeight new subscribed = do
@@ -2449,7 +1766,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1766 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
1767 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1768 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1769+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1771recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1772recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1775,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
1775 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1776 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1777 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1778+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1780calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1781calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,227 +1814,40 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1814-- Reflex integration
2498--------------------------------------------------------------------------------
1815--------------------------------------------------------------------------------
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2504-- | The default, global Spider environment
1817-- | The default, global Spider environment
2505type Spider = SpiderTimeline Global
1818type Spider = SpiderTimeline Global
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
1820+-- | Designates the default, global Spider timeline
2508− {-# INLINABLE sample #-}
1821+data Global
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535− {-# INLINABLE hold #-}
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551− {-# INLINE return #-}
2553− {-# INLINE (>>=) #-}
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555− {-# INLINE (>>) #-}
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
1823+{-# NOINLINE globalSpiderTimeline #-}
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
1824+globalSpiderTimeline :: SpiderTimeline Global
2578−{-# INLINE [1] mapDynamicSpider #-}
1825+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
1827+-- | Stores all global data relevant to a particular Spider timeline; only one
2581− pure = SpiderDynamic . dynamicConst
1828+-- value should exist for each type @x@
2582−#if MIN_VERSION_base(4,10,0)
1829+data SpiderTimeline x = SpiderTimeline
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
1830+ { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
1831+ , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
1833+ , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
1835+ }
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602− {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604− {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606− {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635− {-# INLINABLE sample #-}
2636− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639− {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643− {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645− {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647− {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2656−--------------------------------------------------------------------------------
2658−--------------------------------------------------------------------------------
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662−type SpiderEnv = SpiderTimeline
1836+type role SpiderTimeline nominal
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664− {-# INLINABLE subscribeEvent #-}
2665− subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667− val <- liftIO $ newIORef Nothing
2668− subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669− { subscriberPropagate = \a -> do
2670− liftIO $ writeIORef val $ Just a
2672− , subscriberInvalidateHeight = \_ -> return ()
2673− , subscriberRecalculateHeight = \_ -> return ()
2675− return $ SpiderEventHandle
2676− { spiderEventHandleSubscription = subscription
2677− , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2708−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
1838+instance GEq SpiderTimeline where
2709− type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
1839+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
2710− fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
1840+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
2711− runHostFrame = runFrame . runSpiderHostFrame
1841+ else Nothing
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
1843+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
2714−unsafeNewSpiderTimelineEnv = do
1844+unsafeNewSpiderTimeline = do
2715 lock <- newMVar ()
1845 lock <- newMVar ()
2716 env <- newEventEnv
1846 env <- newEventEnv
2717#ifdef DEBUG
1847#ifdef DEBUG
2718 depthRef <- newIORef 0
1848 depthRef <- newIORef 0
2720− return $ STE $ SpiderTimelineEnv
1850+ return $ SpiderTimeline
2721 { _spiderTimeline_lock = lock
1851 { _spiderTimeline_lock = lock
2722 , _spiderTimeline_eventEnv = env
1852 , _spiderTimeline_eventEnv = env
2723#ifdef DEBUG
1853#ifdef DEBUG
@@ -2725,61 +1855,56 @@ unsafeNewSpiderTimelineEnv = do
2728−-- | Create a new SpiderTimelineEnv
1858+-- | Create a new SpiderTimeline
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
1859+newSpiderTimeline :: IO (Some SpiderTimeline)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
1860+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2732−data LocalSpiderTimeline (x :: Type) s
1862+-- | Pass a new timeline to the given function.
1863+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
1864+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
2734−instance Reifies s (SpiderTimelineEnv x) =>
1866+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2738−localSpiderTimeline
1868+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2744−-- | Pass a new timeline to the given function.
1870+instance HasSpiderTimeline x => Functor (R.Dynamic (SpiderTimeline x)) where
2745−withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
1871+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
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)
1873+instance HasSpiderTimeline x => Applicative (R.Dynamic (SpiderTimeline x)) where
2751−
1874+ pure = SpiderDynamic . dynamicConst
2752−type ComputeM = EventM
1875+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1879+instance HasSpiderTimeline x => Monad (R.Dynamic (SpiderTimeline x)) where
1880+ {-# INLINE return #-}
1882+ {-# INLINE (>>=) #-}
1883+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1884+ {-# INLINE (>>) #-}
1886+ {-# INLINE fail #-}
1887+ fail _ = error "Dynamic does not support 'fail'"
2756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
1889instance 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 }
1890 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
1891 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)
1892+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
1893+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
2762 type PullM (SpiderTimeline x) = SpiderPullM x
1894 type PullM (SpiderTimeline x) = SpiderPullM x
2763 type PushM (SpiderTimeline x) = SpiderPushM x
1895 type PushM (SpiderTimeline x) = SpiderPushM x
2764 {-# INLINABLE never #-}
1896 {-# INLINABLE never #-}
2765 never = SpiderEvent eventNever
1897 never = SpiderEvent eventNever
2766 {-# INLINABLE constant #-}
1898 {-# INLINABLE constant #-}
2767 constant = SpiderBehavior . behaviorConst
1899 constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
1900+ {-# INLINABLE push #-}
2769 push f = SpiderEvent . push (coerce f) . unSpiderEvent
1901 push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772 {-# INLINABLE pull #-}
1902 {-# INLINABLE pull #-}
2773 pull = SpiderBehavior . pull . coerce
1903 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
1904+ {-# INLINABLE merge #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
1905+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2776− {-# INLINABLE mergeG #-}
1906+ {-# INLINABLE fan #-}
2777− mergeG
1907+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783 {-# INLINABLE switch #-}
1908 {-# INLINABLE switch #-}
2784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
1909 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785 {-# INLINABLE coincidence #-}
1910 {-# INLINABLE coincidence #-}
@@ -2787,31 +1912,73 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2787 {-# INLINABLE current #-}
1912 {-# INLINABLE current #-}
2788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
1913 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789 {-# INLINABLE updated #-}
1914 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
1915+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2791 {-# INLINABLE unsafeBuildDynamic #-}
1916 {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
1917+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2793 {-# INLINABLE unsafeBuildIncremental #-}
1918 {-# INLINABLE unsafeBuildIncremental #-}
2794− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
1919+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
1920+ {-# INLINABLE mergeIncremental #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
1921+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799 {-# INLINABLE currentIncremental #-}
1922 {-# INLINABLE currentIncremental #-}
2800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
1923 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801 {-# INLINABLE updatedIncremental #-}
1924 {-# INLINABLE updatedIncremental #-}
2802 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
1925 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803 {-# INLINABLE incrementalToDynamic #-}
1926 {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
1927+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805 c <- readBehaviorUntracked $ dynamicCurrent i
1928 c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
1929+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2807 eventCoercion Coercion = Coercion
1930 eventCoercion Coercion = Coercion
2808 behaviorCoercion Coercion = Coercion
1931 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
1932+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2810− incrementalCoercion Coercion Coercion = Coercion
1933+
1934+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (EventM x) where
1935+ {-# INLINABLE sample #-}
1936+ sample (SpiderBehavior b) = readBehaviorUntracked b
1938+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (EventM x) where
1939+ {-# INLINABLE hold #-}
1940+ hold = holdSpiderEventM
1941+ {-# INLINABLE holdDyn #-}
1942+ holdDyn = holdDynSpiderEventM
1943+ {-# INLINABLE holdIncremental #-}
1944+ holdIncremental = holdIncrementalSpiderEventM
1946+holdSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
1947+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1949+holdDynSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
1950+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1952+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, R.Patch p) => R.PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
1953+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
1955+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHost x) where
1956+ {-# INLINABLE hold #-}
1957+ hold v0 e = R.runHostFrame $ R.hold v0 e
1958+ {-# INLINABLE holdDyn #-}
1959+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
1960+ {-# INLINABLE holdIncremental #-}
1961+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
1963+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHost x) where
1964+ {-# INLINABLE sample #-}
1965+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
1967+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
1968+ {-# INLINABLE sample #-}
1969+ sample = coerce . readBehaviorTracked . unSpiderBehavior
1971+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2811− {-# INLINABLE mergeIntIncremental #-}
1972+ {-# INLINABLE sample #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
1973+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1975+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2813− {-# INLINABLE fanInt #-}
1976+ {-# INLINABLE hold #-}
2814− fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
1977+ hold v0 e = R.current <$> R.holdDyn v0 e
1978+ {-# INLINABLE holdDyn #-}
1979+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
1980+ {-# INLINABLE holdIncremental #-}
1981+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
2816data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
1983data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
@@ -2820,6 +1987,35 @@ data SpiderEventHandle x a = SpiderEventHandle
2820 , spiderEventHandleValue :: IORef (Maybe a)
1987 , spiderEventHandleValue :: IORef (Maybe a)
1990+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
1991+ {-# INLINABLE subscribeEvent #-}
1992+ subscribeEvent e = SpiderHostFrame $ do
1993+ --TODO: Unsubscribe eventually (manually and/or with weak ref)
1994+ val <- liftIO $ newIORef Nothing
1995+ subscription <- subscribe (unSpiderEvent e) $ Subscriber
1996+ { subscriberPropagate = \a -> do
1997+ liftIO $ writeIORef val $ Just a
1999+ , subscriberInvalidateHeight = \_ -> return ()
2000+ , subscriberRecalculateHeight = \_ -> return ()
2002+ return $ SpiderEventHandle
2003+ { spiderEventHandleSubscription = subscription
2004+ , spiderEventHandleValue = val
2007+instance HasSpiderTimeline x => R.ReflexHost (SpiderTimeline x) where
2008+ type EventTrigger (SpiderTimeline x) = RootTrigger x
2009+ type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2010+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2012+instance HasSpiderTimeline x => R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2013+ {-# NOINLINE readEvent #-}
2014+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2015+ result <- readIORef $ spiderEventHandleValue h
2823instance MonadRef (EventM x) where
2019instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2020 type Ref (EventM x) = Ref IO
2825 {-# INLINABLE newRef #-}
2021 {-# INLINABLE newRef #-}
@@ -2834,7 +2030,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2030 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2032-- | 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)
2033+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2035instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2036 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2039,20 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2039 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2040 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2041 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847− {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852 {-# INLINABLE fail #-}
2042 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2043+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2045-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2046-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2047runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2048+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2860-- | Run an action affecting a given Spider timeline; this will be guarded by a
2050-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861-- mutex for that timeline
2051-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2052+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2053+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2055+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2057instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2058 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2061,26 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2061 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2062 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2063 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2064 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2065 fail s = SpiderHostFrame $ fail s
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2067+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2068+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2070+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2071+ {-# INLINABLE hold #-}
2072+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2073+ {-# INLINABLE holdDyn #-}
2074+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2075+ {-# INLINABLE holdIncremental #-}
2076+ 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)
2078+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2079newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2080 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2081 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2083+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2084newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2085 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2086 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2091,41 @@ newFanEventWithTriggerIO f = do
2898 return $ EventSelector $ \k -> eventRoot k r
2092 return $ EventSelector $ \k -> eventRoot k r
2094+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2095+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2096+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2097+ es <- newFanEventWithTriggerIO f
2098+ return $ R.EventSelector $ SpiderEvent . select es
2100+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2101+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2102+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2103+ es <- newFanEventWithTriggerIO f
2104+ return $ R.EventSelector $ SpiderEvent . select es
2106+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2107+ {-# INLINABLE subscribeEvent #-}
2108+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2110newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2112+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2113+ {-# INLINABLE sample #-}
2114+ sample = ReadPhase . R.sample
2116+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2117+ {-# INLINABLE hold #-}
2118+ hold v0 e = ReadPhase $ R.hold v0 e
2119+ {-# INLINABLE holdDyn #-}
2120+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2121+ {-# INLINABLE holdIncremental #-}
2122+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2124+instance HasSpiderTimeline x => R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2125+ type ReadPhase (SpiderHost x) = ReadPhase x
2126+ fireEventsAndRead es (ReadPhase a) = run es a
2127+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2129instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2130 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2131 newRef = SpiderHost . newRef
@@ -2921,10 +2148,9 @@ instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2148 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2149 primitive = SpiderHostFrame . EventM . primitive
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2151+--------------------------------------------------------------------------------
2925− notReadyUntil _ = return ()
2152+-- Deprecated items
2926− notReady = return ()
2153+--------------------------------------------------------------------------------
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2155+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2929− notReadyUntil _ = return ()
2156+type SpiderEnv = SpiderTimeline
2930− notReady = return ()