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