@@ -9,125 +9,67 @@
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 where
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
25+import Control.Applicative
35import Control.Concurrent
26import Control.Concurrent
36import Control.Exception
27import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
28+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
38import Control.Monad.Exception
29import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
30+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
40import Control.Monad.Primitive
31import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
32+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
33import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
34+import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
35import Data.Align
48import Data.Coerce
36import Data.Coerce
49−import Data.Dependent.Map (DMap)
37+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
38import 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_)
39import Data.Foldable hiding (concat, elem, sequence_)
55−import Data.Functor.Constant
40+import Data.Function
56−import Data.Functor.Misc
41+import Data.Functor.Compose
57−import Data.Functor.Product
58import Data.GADT.Compare
42import Data.GADT.Compare
59import Data.IntMap.Strict (IntMap)
43import Data.IntMap.Strict (IntMap)
60import qualified Data.IntMap.Strict as IntMap
44import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
45import Data.IORef
62−import Data.Kind (Type)
46+import Data.List hiding (foldl')
63−import Data.Maybe hiding (mapMaybe)
47+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
48+import qualified Data.List.NonEmpty as NonEmpty
64import Data.Monoid (mempty, (<>))
50import Data.Monoid (mempty, (<>))
65−import Data.Proxy
51+import Data.Some (Some)
52+import qualified Data.Some as Some
66import Data.These
53import Data.These
67import Data.Traversable
54import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
55+import Data.Tree (Forest, Tree (..), drawForest)
69−import Data.Witherable (Filterable, mapMaybe)
56+import Data.Word
70−import GHC.Exts hiding (toList)
71import GHC.IORef (IORef (..))
57import GHC.IORef (IORef (..))
72import GHC.Stack
58import GHC.Stack
73−import Reflex.FastWeak
74import System.IO.Unsafe
59import System.IO.Unsafe
75import System.Mem.Weak
60import System.Mem.Weak
76import Unsafe.Coerce
61import 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)
63+import Data.WeakBag (WeakBag, WeakBagTicket)
104import qualified Data.WeakBag as WeakBag
64import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
106import qualified Reflex.Class as R
65import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
66+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
68+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
124−withStackOneLine :: (BS8.ByteString -> a) -> a
69+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
71+type SubscriberList a = WeakBag (Subscriber a)
72+type SubscriberListTicket a = WeakBagTicket (Subscriber a)
132debugPropagate :: Bool
74debugPropagate :: Bool
@@ -136,65 +78,79 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
78debugInvalidate :: Bool
138#ifdef DEBUG
80#ifdef DEBUG
139#define DEBUG_NODEIDS
82#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
84debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
86debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
88debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
90class HasNodeId a where
160 getNodeId :: a -> Int
91 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
93+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
94 getNodeId = holdNodeId
96+instance HasNodeId (PushSubscribed a b) where
97+ getNodeId = pushSubscribedNodeId
171−instance HasNodeId (SwitchSubscribed x a) where
99+instance HasNodeId (SwitchSubscribed a) where
172 getNodeId = switchSubscribedNodeId
100 getNodeId = switchSubscribedNodeId
102+instance HasNodeId (MergeSubscribed a) where
103+ getNodeId = mergeSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
105+instance HasNodeId (FanSubscribed a) where
175 getNodeId = fanSubscribedNodeId
106 getNodeId = fanSubscribedNodeId
177−instance HasNodeId (CoincidenceSubscribed x a) where
108+instance HasNodeId (CoincidenceSubscribed a) where
178 getNodeId = coincidenceSubscribedNodeId
109 getNodeId = coincidenceSubscribedNodeId
180−instance HasNodeId (RootSubscribed x a) where
111+instance HasNodeId (RootSubscribed a) where
181 getNodeId = rootSubscribedNodeId
112 getNodeId = rootSubscribedNodeId
183−instance HasNodeId (Pull x a) where
114+instance HasNodeId (Pull a) where
184 getNodeId = pullNodeId
115 getNodeId = pullNodeId
186{-# INLINE showNodeId #-}
117{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
118showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
119+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
121+showSubscriberType :: Subscriber a -> String
191−showNodeId' = ("#"<>) . show
122+showSubscriberType = \case
192−
123+ SubscriberPush _ _ -> "SubscriberPush"
124+ SubscriberMerge _ _ -> "SubscriberMerge"
125+ SubscriberFan _ -> "SubscriberFan"
126+ SubscriberMergeChange _ -> "SubscriberMergeChange"
127+ SubscriberHold _ -> "SubscriberHold"
128+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
129+ SubscriberSwitch _ -> "SubscriberSwitch"
130+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
131+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
132+ SubscriberHandle -> "SubscriberHandle"
134+showEventType :: Event a -> String
135+showEventType = \case
136+ EventRoot _ _ -> "EventRoot"
137+ EventNever -> "EventNever"
138+ EventPush _ -> "EventPush"
139+ EventMerge _ -> "EventMerge"
140+ EventFan _ _ -> "EventFan"
141+ EventSwitch _ -> "EventSwitch"
142+ EventCoincidence _ -> "EventCoincidence"
143+ EventHold _ -> "EventHold"
144+ EventDyn _ -> "EventDyn"
145+ EventHoldIdentity _ -> "EventHoldIdentity"
146+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
150debugPropagate = False
197debugInvalidateHeight = False
152debugInvalidateHeight = False
198debugInvalidate = False
154debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
156-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +158,6 @@ debugInvalidate = False
202showNodeId :: a -> String
158showNodeId :: a -> String
203showNodeId _ = ""
159showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
163#ifdef DEBUG_NODEIDS
@@ -215,637 +167,220 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
168newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
169newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
220−--------------------------------------------------------------------------------
222−--------------------------------------------------------------------------------
224−--NB: Once you subscribe to an Event, you must always hold on the the WHOLE EventSubscription you get back
225−-- If you do not retain the subscription, you may be prematurely unsubscribed from the parent event.
226−data EventSubscription x = EventSubscription
227− { _eventSubscription_unsubscribe :: !(IO ())
228− , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
231−unsubscribe :: EventSubscription x -> IO ()
171+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
172+unsafeNodeId :: a -> Int
173+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
178--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
180--------------------------------------------------------------------------------
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
182+data Event a
239−
183+ = forall k. GCompare k => EventRoot !(k a) !(Root k)
240−{-# INLINE subscribeAndRead #-}
184+ | EventNever
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
185+ | forall b. EventPush !(Push b a)
242−subscribeAndRead = unEvent
186+ | forall k. (GCompare k, a ~ DMap k Identity) => EventMerge !(Merge k)
243−
187+ | forall k. GCompare k => EventFan !(k a) !(Fan k)
244−{-# RULES
188+ | EventSwitch !(Switch a)
245−"cacheEvent/cacheEvent" forall e. cacheEvent (cacheEvent e) = cacheEvent e
189+ | EventCoincidence !(Coincidence a)
246−"cacheEvent/pushCheap" forall f e. pushCheap f (cacheEvent e) = cacheEvent (pushCheap f e)
190+ | 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
191+ | forall p b. (a ~ p b, R.Patch p) => EventDyn !(Dyn p b)
248− #-}
192+ | forall b. (a ~ Identity b) => EventHoldIdentity !(Hold Identity b)
249−
193+ | forall b. (a ~ Identity b) => EventDynIdentity !(Dyn Identity b)
250−-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
194+
251−-- caching; if the computation function is very cheap, this is (much) more
195+{-# SPECIALIZE subscribe :: Event a -> Subscriber a -> EventM x (EventSubscription a) #-}
252−-- efficient than 'push'
196+subscribe :: forall x m a. CanSubscribe x m => Event a -> Subscriber a -> m (EventSubscription a)
253−{-# INLINE [1] pushCheap #-}
197+subscribe e sub = case e of
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
198+ EventRoot k r -> wrap EventSubscribedRoot $ liftIO . getRootSubscribed k r
255−pushCheap !f e = Event $ \sub -> do
199+ EventNever -> return $ EventSubscription Nothing EventSubscribedNever
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
200+ 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
201+ EventFan k f -> wrap (EventSubscribedFan k) $ getFanSubscribed k f
434−
202+ EventMerge m -> wrap EventSubscribedMerge $ getMergeSubscribed m
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
436−eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
203+ EventSwitch s -> wrap EventSubscribedSwitch $ getSwitchSubscribed s
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439−eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
204+ EventCoincidence c -> wrap EventSubscribedCoincidence $ getCoincidenceSubscribed c
440−
205+ EventHold h -> subscribeHoldEvent h sub
441−eventHold :: Hold x p -> Event x p
206+ EventDyn j -> getDynHold j >>= \h -> subscribeHoldEvent h sub
207+ EventHoldIdentity h -> subscribeHoldEvent h sub
442−eventHold !h = Event $ subscribeHoldEvent h
208+ EventDynIdentity j -> getDynHold j >>= \h -> subscribeHoldEvent h sub
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
210+ wrap :: (t -> EventSubscribed a) -> (Subscriber a -> m (SubscriberListTicket a, t)) -> m (EventSubscription a)
445−eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
211+ wrap tag getSpecificSubscribed = do
212+ (sln, subd) <- getSpecificSubscribed sub
213+ return $ EventSubscription (Just sln) $ tag subd
447{-# INLINE subscribeCoincidenceInner #-}
215{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
216+subscribeCoincidenceInner :: CanSubscribe x m => Event a -> Height -> CoincidenceSubscribed a -> m (Maybe a, Height, EventSubscribed a)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
217subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
218 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451− (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
219+ subscription@(EventSubscription _ innerSubd) <- subscribe inner subInner
220+ innerOcc <- liftIO $ readEventSubscribed innerSubd
452 innerHeight <- liftIO $ getEventSubscribedHeight innerSubd
221 innerHeight <- liftIO $ getEventSubscribedHeight innerSubd
453 let height = max innerHeight outerHeight
222 let height = max innerHeight outerHeight
454 defer $ SomeResetCoincidence subscription $ if height > outerHeight then Just subscribedUnsafe else Nothing
223 defer $ SomeResetCoincidence subscription $ if height > outerHeight then Just subscribedUnsafe else Nothing
455 return (innerOcc, height, innerSubd)
224 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--------------------------------------------------------------------------------
226--------------------------------------------------------------------------------
568-- EventSubscribed
227-- EventSubscribed
569--------------------------------------------------------------------------------
228--------------------------------------------------------------------------------
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
230+data EventSubscribed a
580− { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
231+ = EventSubscribedRoot {-# NOUNPACK #-} (RootSubscribed a)
581− , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
232+ | EventSubscribedNever
582−#ifdef DEBUG_CYCLES
233+ | forall b. EventSubscribedPush !(PushSubscribed b a)
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
234+ | forall k. (GCompare k, a ~ DMap k Identity) => EventSubscribedMerge !(MergeSubscribed k)
584− , eventSubscribedHasOwnHeightRef :: !Bool
235+ | forall k. GCompare k => EventSubscribedFan !(k a) !(FanSubscribed k)
585− , eventSubscribedWhoCreated :: !(IO [String])
236+ | EventSubscribedSwitch !(SwitchSubscribed a)
586−#endif
237+ | EventSubscribedCoincidence !(CoincidenceSubscribed a)
588−
239+readEventSubscribed :: EventSubscribed a -> IO (Maybe a)
589−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
240+readEventSubscribed = \case
590−eventSubscribedRoot !r = EventSubscribed
241+ EventSubscribedRoot rs -> readRootSubscribed rs
591− { eventSubscribedHeightRef = zeroRef
242+ EventSubscribedNever -> return Nothing
592− , eventSubscribedRetained = toAny r
243+ EventSubscribedPush ps -> readPushSubscribed ps
593−#ifdef DEBUG_CYCLES
244+ EventSubscribedMerge ms -> readMergeSubscribed ms
594− , eventSubscribedGetParents = return []
245+ EventSubscribedFan k fs -> readFanSubscribed k fs
595− , eventSubscribedHasOwnHeightRef = False
246+ EventSubscribedSwitch ss -> readSwitchSubscribed ss
596− , eventSubscribedWhoCreated = return ["root"]
247+ EventSubscribedCoincidence cs -> readCoincidenceSubscribed cs
598− }
249+{-# INLINE subscribeEventSubscribed #-}
599−
250+subscribeEventSubscribed :: EventSubscribed a -> Subscriber a -> IO (Maybe (SubscriberListTicket a))
600−eventSubscribedNever :: EventSubscribed x
251+subscribeEventSubscribed es sub = case es of
601−eventSubscribedNever = EventSubscribed
252+ EventSubscribedRoot r -> do
602− { eventSubscribedHeightRef = zeroRef
253+ traceSubscribe $ "subscribeEventSubscribed Root"
603− , eventSubscribedRetained = toAny ()
254+ Just <$> subscribeRootSubscribed r sub
604−#ifdef DEBUG_CYCLES
255+ EventSubscribedNever -> do
605− , eventSubscribedGetParents = return []
256+ traceSubscribe $ "subscribeEventSubscribed Never"
606− , eventSubscribedHasOwnHeightRef = False
257+ return Nothing
607− , eventSubscribedWhoCreated = return ["never"]
258+ EventSubscribedPush subscribed -> do
608−#endif
259+ traceSubscribe $ "subscribeEventSubscribed Push"
609− }
260+ Just <$> subscribePushSubscribed subscribed sub
610−eventSubscribedNow :: EventSubscribed x
261+ EventSubscribedFan k subscribed -> do
611−eventSubscribedNow = EventSubscribed
262+ traceSubscribe $ "subscribeEventSubscribed Fan"
612− { eventSubscribedHeightRef = zeroRef
263+ Just <$> subscribeFanSubscribed k subscribed sub
613− , eventSubscribedRetained = toAny ()
264+ EventSubscribedMerge subscribed -> do
614−#ifdef DEBUG_CYCLES
265+ traceSubscribe $ "subscribeEventSubscribed Merge"
615− , eventSubscribedGetParents = return []
266+ Just <$> subscribeMergeSubscribed subscribed sub
616− , eventSubscribedHasOwnHeightRef = False
267+ EventSubscribedSwitch subscribed -> do
617− , eventSubscribedWhoCreated = return ["now"]
268+ traceSubscribe $ "subscribeEventSubscribed Switch"
618−#endif
269+ Just <$> subscribeSwitchSubscribed subscribed sub
619− }
270+ EventSubscribedCoincidence subscribed -> do
620−
271+ traceSubscribe $ "subscribeEventSubscribed Coincidence"
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
272+ Just <$> subscribeCoincidenceSubscribed subscribed sub
622−eventSubscribedFan !subscribed = EventSubscribed
273+
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
274+{-# INLINE eventSubscribedGetParents #-}
275+eventSubscribedGetParents :: EventSubscribed a -> IO [Some EventSubscribed]
276+eventSubscribedGetParents = \case
277+ EventSubscribedRoot _ -> return []
278+ EventSubscribedNever -> return []
279+ EventSubscribedPush subscribed -> return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
280+ EventSubscribedFan _ subscribed -> return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
281+ EventSubscribedMerge subscribed -> do
282+ ps <- readIORef $ mergeSubscribedParents subscribed
283+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
284+ EventSubscribedSwitch subscribed -> do
638− s <- readIORef $ switchSubscribedCurrentParent subscribed
285+ s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
286+ return [Some.This $ _eventSubscription_subscribed s]
640− , eventSubscribedHasOwnHeightRef = True
287+ 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
288+ innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
289+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
290+ innerParents = maybeToList $ fmap Some.This innerSubscription
654− return $ outerParent : innerParents
291+ return $ outerParent : innerParents
655− , eventSubscribedHasOwnHeightRef = True
292+
656− , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
660−getEventSubscribedHeight :: EventSubscribed x -> IO Height
293+getEventSubscribedHeight :: EventSubscribed a -> IO Height
661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
294getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
663−#ifdef DEBUG_CYCLES
296+{-# INLINE eventSubscribedHeightRef #-}
297+eventSubscribedHeightRef :: EventSubscribed a -> IORef Height
298+eventSubscribedHeightRef = \case
299+ EventSubscribedRoot _ -> zeroRef
300+ EventSubscribedNever -> zeroRef
301+ EventSubscribedPush subscribed -> pushSubscribedHeight subscribed
302+ EventSubscribedFan _ subscribed -> eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
303+ EventSubscribedMerge subscribed -> mergeSubscribedHeight subscribed
304+ EventSubscribedSwitch subscribed -> switchSubscribedHeight subscribed
305+ EventSubscribedCoincidence subscribed -> coincidenceSubscribedHeight subscribed
664−whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
307+whoCreatedEventSubscribed :: EventSubscribed a -> IO [String]
665−whoCreatedEventSubscribed = eventSubscribedWhoCreated
308+whoCreatedEventSubscribed = \case
666−
309+ EventSubscribedRoot _ -> return ["root"]
310+ EventSubscribedNever -> return ["never"]
311+ EventSubscribedPush subscribed -> whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
312+ EventSubscribedFan _ subscribed -> whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
313+ EventSubscribedMerge subscribed -> whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
314+ EventSubscribedSwitch subscribed -> whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
315+ EventSubscribedCoincidence subscribed -> whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
317+{-# INLINE eventSubscribedHasOwnHeightRef #-}
318+eventSubscribedHasOwnHeightRef :: EventSubscribed a -> Bool
319+eventSubscribedHasOwnHeightRef = \case
320+ EventSubscribedRoot _ -> False
321+ EventSubscribedNever -> False
322+ EventSubscribedPush _ -> False
323+ EventSubscribedFan _ _ -> False
324+ EventSubscribedMerge _ -> True
325+ EventSubscribedSwitch _ -> True
326+ EventSubscribedCoincidence _ -> True
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
328+walkInvalidHeightParents :: EventSubscribed a -> IO [Some EventSubscribed]
668walkInvalidHeightParents s0 = do
329walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
330+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
331 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
332 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
333 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
334+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
335 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
336+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
337 return subscribers
679−{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681−subscribeHoldEvent = subscribeAndRead . holdEvent
683−--------------------------------------------------------------------------------
685--------------------------------------------------------------------------------
339--------------------------------------------------------------------------------
686−
340+-- EventSubscription
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--------------------------------------------------------------------------------
341--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
343+data EventSubscription a = EventSubscription
748−
344+ { _eventSubscription_ticket :: !(Maybe (SubscriberListTicket a))
749−data Dynamic x target p = Dynamic
345+ , _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)
348+unsubscribe :: EventSubscription a -> IO ()
755−
349+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--------------------------------------------------------------------------------
351--------------------------------------------------------------------------------
784-- Combinators
352-- Combinators
785--------------------------------------------------------------------------------
353--------------------------------------------------------------------------------
355+--TODO: Figure out why certain things are not 'representational', then make them
356+--representational so we can use coerce
787--type role Hold representational
358--type role Hold representational
788−data Hold x p
359+data Hold p a
789− = Hold { holdValue :: !(IORef (PatchTarget p))
360+ = Hold { holdValue :: !(IORef a)
790− , holdInvalidators :: !(IORef [Weak (Invalidator x)])
361+ , 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
362+ , 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
363#ifdef DEBUG_NODEIDS
794 , holdNodeId :: Int
364 , 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
368data EventEnv x
369+ = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
370+ , eventEnvAssignments :: !(IORef [SomeAssignment]) -- Needed for Subscribe
831− , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
371+ , eventEnvHoldInits :: !(IORef [SomeHoldInit]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833− , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
372+ , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate])
834− , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
373+ , eventEnvMergeInits :: !(IORef [SomeMergeInit]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
374+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
375+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
376 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839− , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
377+ , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
378+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge]))
843{-# INLINE runEventM #-}
381{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
382+runEventM :: EventM x a -> EventEnv x -> IO a
845−runEventM = unEventM
383+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
385class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
386 getDeferralQueue :: m (IORef [a])
@@ -856,98 +391,91 @@ defer a = do
856 q <- getDeferralQueue
391 q <- getDeferralQueue
857 liftIO $ modifyIORef' q (a:)
392 liftIO $ modifyIORef' q (a:)
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
394+instance Defer SomeAssignment (EventM x) where
860 {-# INLINE getDeferralQueue #-}
395 {-# INLINE getDeferralQueue #-}
861− getDeferralQueue = asksEventEnv eventEnvAssignments
396+ getDeferralQueue = EventM $ asks eventEnvAssignments
863−instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
398+instance Defer SomeHoldInit (EventM x) where
864 {-# INLINE getDeferralQueue #-}
399 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
400+ getDeferralQueue = EventM $ asks eventEnvHoldInits
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
871−instance Defer (SomeHoldInit x) (BehaviorM x) where
402+instance Defer SomeHoldInit BehaviorM where
872 {-# INLINE getDeferralQueue #-}
403 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
404 getDeferralQueue = BehaviorM $ asks snd
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
406+instance Defer SomeMergeUpdate (EventM x) where
876 {-# INLINE getDeferralQueue #-}
407 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
408+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
410+instance Defer SomeMergeInit (EventM x) where
880 {-# INLINE getDeferralQueue #-}
411 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
412+ getDeferralQueue = EventM $ asks eventEnvMergeInits
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
414+class HasCurrentHeight m where
884 getCurrentHeight :: m Height
415 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
416+ scheduleMerge :: Height -> MergeSubscribed a -> m ()
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
418+instance HasCurrentHeight (EventM x) where
888 {-# INLINE getCurrentHeight #-}
419 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
420+ getCurrentHeight = EventM $ do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
421+ heightRef <- asks eventEnvCurrentHeight
891 liftIO $ readIORef heightRef
422 liftIO $ readIORef heightRef
892 {-# INLINE scheduleMerge #-}
423 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
424+ scheduleMerge height subscribed = EventM $ do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
425+ delayedRef <- asks eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
426+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
428+class HasSpiderTimeline x m | m -> x where
429+ -- | Retrieve the current SpiderTimeline
430+ askSpiderTimeline :: m (SpiderTimeline x)
897−class HasSpiderTimeline x where
432+instance HasSpiderTimeline x (EventM x) where
898− -- | Retrieve the current SpiderTimelineEnv
433+ {-# INLINE askSpiderTimeline #-}
899− spiderTimeline :: SpiderTimelineEnv x
434+ askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
901−instance HasSpiderTimeline Global where
436+instance HasSpiderTimeline x (SpiderHost x) where
902− spiderTimeline = globalSpiderTimelineEnv
437+ {-# INLINE askSpiderTimeline #-}
438+ askSpiderTimeline = SpiderHost ask
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
440+putCurrentHeight :: Height -> EventM x ()
905−putCurrentHeight h = do
441+putCurrentHeight h = EventM $ do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
442+ heightRef <- asks eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
443 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
445+instance Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
446 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
447+ getDeferralQueue = EventM $ asks eventEnvClears
913{-# INLINE scheduleClear #-}
449{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
450+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
451+scheduleClear r = defer $ SomeClear r
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
453+instance Defer SomeRootClear (EventM x) where
918 {-# INLINE getDeferralQueue #-}
454 {-# INLINE getDeferralQueue #-}
919− getDeferralQueue = asksEventEnv eventEnvIntClears
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
926− {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
455+ getDeferralQueue = EventM $ asks eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
457{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
458+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
459+scheduleRootClear r = defer $ SomeRootClear r
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
461+instance Defer SomeResetCoincidence (EventM x) where
934 {-# INLINE getDeferralQueue #-}
462 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
463+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
465-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
466+{-# SPECIALIZE hold :: R.Patch p => a -> Event (p a) -> EventM x (Hold p a) #-}
467+{-# 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)
468+hold :: (R.Patch p, Defer SomeHoldInit m) => a -> Event (p a) -> m (Hold p a)
940hold v0 e = do
469hold v0 e = do
941 valRef <- liftIO $ newIORef v0
470 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
471 invsRef <- liftIO $ newIORef []
943− parentRef <- liftIO $ newIORef Nothing
472+ parentRef <- liftIO $ newIORef $ Left e
944#ifdef DEBUG_NODEIDS
473#ifdef DEBUG_NODEIDS
945 nodeId <- liftIO newNodeId
474 nodeId <- liftIO newNodeId
947 let h = Hold
476 let h = Hold
948 { holdValue = valRef
477 { holdValue = valRef
949 , holdInvalidators = invsRef
478 , holdInvalidators = invsRef
951 , holdParent = parentRef
479 , holdParent = parentRef
952#ifdef DEBUG_NODEIDS
480#ifdef DEBUG_NODEIDS
953 , holdNodeId = nodeId
481 , holdNodeId = nodeId
@@ -957,114 +485,134 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
487{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
488+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, HasSpiderTimeline x m) => Hold p a -> m (EventSubscription (p a))
961getHoldEventSubscription h = do
489getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
490 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
491 case ep of
964− Just subd -> return subd
492+ Right subd -> return subd
965− Nothing -> do
493+ Left e -> do
967 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
494 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
968− (subscription@(EventSubscription _ _), occ) <- subscribeAndRead e =<< liftIO (newSubscriberHold h)
495+ subscription@(EventSubscription _ subd) <- subscribe e =<< liftIO (newSubscriberHold h)
969 liftIO $ writeIORef subscriptionRef $! subscription
496 liftIO $ writeIORef subscriptionRef $! subscription
497+ occ <- liftIO $ readEventSubscribed subd
970 case occ of
498 case occ of
971 Nothing -> return ()
499 Nothing -> return ()
972 Just o -> do
500 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
501 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
502+ case R.apply o old of
975 Nothing -> return ()
503 Nothing -> return ()
976 Just new -> do
504 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
505 -- Need to evaluate these so that we don't retain the Hold itself
978 v <- liftIO $ evaluate $ holdValue h
506 v <- liftIO $ evaluate $ holdValue h
979 i <- liftIO $ evaluate $ holdInvalidators h
507 i <- liftIO $ evaluate $ holdInvalidators h
980 defer $ SomeAssignment v i new
508 defer $ SomeAssignment v i new
981− liftIO $ writeIORef (holdParent h) $ Just subscription
509+ liftIO $ writeIORef (holdParent h) $ Right subscription
982 return subscription
510 return subscription
984−type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
512+type BehaviorEnv = (Maybe (Weak Invalidator, IORef [SomeBehaviorSubscribed]), IORef [SomeHoldInit])
514+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
515-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
516+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
518+instance Monad BehaviorM where
991 {-# INLINE (>>=) #-}
519 {-# INLINE (>>=) #-}
992 BehaviorM x >>= f = BehaviorM $ x >>= unBehaviorM . f
520 BehaviorM x >>= f = BehaviorM $ x >>= unBehaviorM . f
993 {-# INLINE (>>) #-}
521 {-# INLINE (>>) #-}
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
522 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
523 {-# INLINE return #-}
996 return x = BehaviorM $ return x
524 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
525 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
526 fail s = BehaviorM $ fail s
1002−data BehaviorSubscribed x a
528+data BehaviorSubscribed a
1003− = forall p. BehaviorSubscribedHold (Hold x p)
529+ = forall p. BehaviorSubscribedHold (Hold p a)
1004− | BehaviorSubscribedPull (PullSubscribed x a)
530+ | BehaviorSubscribedPull (PullSubscribed a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
532+data SomeBehaviorSubscribed = forall a. SomeBehaviorSubscribed (BehaviorSubscribed a)
1008--type role PullSubscribed representational
534--type role PullSubscribed representational
1009−data PullSubscribed x a
535+data PullSubscribed a
1010 = PullSubscribed { pullSubscribedValue :: !a
536 = PullSubscribed { pullSubscribedValue :: !a
1011− , pullSubscribedInvalidators :: !(IORef [Weak (Invalidator x)])
537+ , pullSubscribedInvalidators :: !(IORef [Weak Invalidator])
1012− , pullSubscribedOwnInvalidator :: !(Invalidator x)
538+ , pullSubscribedOwnInvalidator :: !Invalidator
1013− , pullSubscribedParents :: ![SomeBehaviorSubscribed x] -- Need to keep parent behaviors alive, or they won't let us know when they're invalidated
539+ , pullSubscribedParents :: ![SomeBehaviorSubscribed] -- Need to keep parent behaviors alive, or they won't let us know when they're invalidated
1016--type role Pull representational
542--type role Pull representational
1017−data Pull x a
543+data Pull a
1018− = Pull { pullValue :: !(IORef (Maybe (PullSubscribed x a)))
544+ = Pull { pullValue :: !(IORef (Maybe (PullSubscribed a)))
1019− , pullCompute :: !(BehaviorM x a)
545+ , pullCompute :: !(BehaviorM a)
1020#ifdef DEBUG_NODEIDS
546#ifdef DEBUG_NODEIDS
1021 , pullNodeId :: Int
547 , pullNodeId :: Int
1025−data Invalidator x
551+data Invalidator
1026− = forall a. InvalidatorPull (Pull x a)
552+ = forall a. InvalidatorPull (Pull a)
1027− | forall a. InvalidatorSwitch (SwitchSubscribed x a)
553+ | forall a. InvalidatorSwitch (SwitchSubscribed a)
1029−data RootSubscribed x a = forall k. GCompare k => RootSubscribed
555+data RootSubscribed a = forall k. GCompare k => RootSubscribed
1030 { rootSubscribedKey :: !(k a)
556 { rootSubscribedKey :: !(k a)
1031− , rootSubscribedCachedSubscribed :: !(IORef (DMap k (RootSubscribed x))) -- From the original Root
557+ , rootSubscribedCachedSubscribed :: !(IORef (DMap k RootSubscribed)) -- From the original Root
1032− , rootSubscribedSubscribers :: !(WeakBag (Subscriber x a))
558+ , rootSubscribedSubscribers :: !(SubscriberList a)
1033 , rootSubscribedOccurrence :: !(IO (Maybe a)) -- Lookup from rootOccurrence
559 , rootSubscribedOccurrence :: !(IO (Maybe a)) -- Lookup from rootOccurrence
1034 , rootSubscribedUninit :: IO ()
560 , 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?
561+ , 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
562#ifdef DEBUG_NODEIDS
1037 , rootSubscribedNodeId :: Int
563 , rootSubscribedNodeId :: Int
1041−data Root x k
567+data Root (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
568 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043− , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
569+ , rootSubscribed :: !(IORef (DMap k RootSubscribed))
1044− , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
570+ , rootInit :: !(forall a. k a -> RootTrigger a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
573+data SomeHoldInit = forall p a. R.Patch p => SomeHoldInit !(Hold p a)
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
575+data SomeMergeUpdate = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap (DMap k Event)) (MergeSubscribed k)
1051−data SomeMergeUpdate x = SomeMergeUpdate
577+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 () }
579+data SomeEventSubscription = forall a. SomeEventSubscription (EventSubscription a)
1059-- EventM can do everything BehaviorM can, plus create holds
581-- 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)
582+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
584+data PushSubscribed a b
585+ = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed a b)))
586+ , 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)
587+ , pushSubscribedHeight :: !(IORef Height)
588+ , pushSubscribedSubscribers :: !(SubscriberList b)
589+ , pushSubscribedSelf :: !(Subscriber a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
590+ , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed a b)))
591+ , pushSubscribedParent :: !(EventSubscription a)
593+ , pushSubscribedNodeId :: Int
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
597+newtype ComputeM a = ComputeM (ReaderT (IORef [SomeHoldInit]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
599+instance Defer SomeHoldInit ComputeM where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
600+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
601+
602+{-# SPECIALIZE runComputeM :: ComputeM a -> EventM x a #-}
603+runComputeM :: Defer SomeHoldInit m => ComputeM a -> m a
604+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
607+ = 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?)
608+ , pushParent :: !(Event a)
609+ , pushSubscribed :: !(IORef (Maybe (PushSubscribed a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
612+data MergeSubscribedParent k a = MergeSubscribedParent !(EventSubscription a) !(Subscriber a)
614+mergeSubscribedParentSubscription :: MergeSubscribedParent k a -> EventSubscription a
615+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1069data HeightBag = HeightBag
617data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
618 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +630,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
630heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
632heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
633+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
635heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
636heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +639,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
639 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
640 _ -> 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
642heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
643heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
644 Just ((h, _), _) -> Height h
@@ -1116,183 +656,307 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
656heightBagVerify = id
659+data MergeSubscribed k
660+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed k))) -- From the original merge
661+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
662+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
663+ , mergeSubscribedHeight :: !(IORef Height)
664+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
665+ , mergeSubscribedSubscribers :: !(SubscriberList (DMap k Identity))
666+ , mergeSubscribedChange :: !(IORef (Subscriber (R.PatchDMap (DMap k Event)), EventSubscribed (R.PatchDMap (DMap k Event))))
667+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent k)))
668+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed k)))
670+ , mergeSubscribedNodeId :: Int
674+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
676+ = Merge { mergeParents :: !(Dynamic R.PatchDMap (DMap k Event))
677+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed k)))
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
680+data FanSubscribedChildren k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
681+ { _fanSubscribedChildren_list :: !(SubscriberList a)
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
682+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
683+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed k)))
1125−data FanSubscribed x k v
686+data FanSubscribed k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
687+ = 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
688+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren k))) -- This DMap should never be empty
1129− , fanSubscribedParent :: !(EventSubscription x)
689+ , fanSubscribedParent :: !(EventSubscription (DMap k Identity))
1130#ifdef DEBUG_NODEIDS
690#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
691 , fanSubscribedNodeId :: Int
1135−data Fan x k v
695+data Fan k
1136− = Fan { fanParent :: !(Event x (DMap k v))
696+ = Fan { fanParent :: !(Event (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
697+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed k)))
1140−data SwitchSubscribed x a
700+data SwitchSubscribed a
1141− = SwitchSubscribed { switchSubscribedCachedSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
701+ = SwitchSubscribed { switchSubscribedCachedSubscribed :: !(IORef (Maybe (SwitchSubscribed a)))
1142 , switchSubscribedOccurrence :: !(IORef (Maybe a))
702 , switchSubscribedOccurrence :: !(IORef (Maybe a))
1143 , switchSubscribedHeight :: !(IORef Height)
703 , switchSubscribedHeight :: !(IORef Height)
1144− , switchSubscribedSubscribers :: !(WeakBag (Subscriber x a))
704+ , switchSubscribedSubscribers :: !(SubscriberList a)
1145− , switchSubscribedOwnInvalidator :: {-# NOUNPACK #-} !(Invalidator x)
705+ , switchSubscribedOwnInvalidator :: {-# NOUNPACK #-} !Invalidator
1146− , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
706+ , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak Invalidator))
1147− , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
707+ , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed])
1148− , switchSubscribedParent :: !(Behavior x (Event x a))
708+ , switchSubscribedParent :: !(Behavior (Event a))
1149− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
709+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription a))
1150− , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
710+ , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed a)))
1151#ifdef DEBUG_NODEIDS
711#ifdef DEBUG_NODEIDS
1152 , switchSubscribedNodeId :: Int
712 , switchSubscribedNodeId :: Int
1156−data Switch x a
716+data Switch a
1157− = Switch { switchParent :: !(Behavior x (Event x a))
717+ = Switch { switchParent :: !(Behavior (Event a))
1158− , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
718+ , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
721{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164−data CoincidenceSubscribed x a
722+data CoincidenceSubscribed a
1165− = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
723+ = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
724 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1167− , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
725+ , coincidenceSubscribedSubscribers :: !(SubscriberList a)
1168 , coincidenceSubscribedHeight :: !(IORef Height)
726 , coincidenceSubscribedHeight :: !(IORef Height)
1169− , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
727+ , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber (Event a))
1170− , coincidenceSubscribedOuterParent :: !(EventSubscription x)
728+ , coincidenceSubscribedOuterParent :: !(EventSubscription (Event a))
1171− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
729+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed a)))
1172− , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
730+ , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed a)))
1173#ifdef DEBUG_NODEIDS
731#ifdef DEBUG_NODEIDS
1174 , coincidenceSubscribedNodeId :: Int
732 , coincidenceSubscribedNodeId :: Int
1178−data Coincidence x a
736+data Coincidence a
1179− = Coincidence { coincidenceParent :: !(Event x (Event x a))
737+ = Coincidence { coincidenceParent :: !(Event (Event a))
1180− , coincidenceSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
738+ , coincidenceSubscribed :: !(IORef (Maybe (CoincidenceSubscribed a)))
1183−{-# NOINLINE newInvalidatorSwitch #-}
741+data Subscriber a
1184−newInvalidatorSwitch :: SwitchSubscribed x a -> IO (Invalidator x)
742+ = 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
743+ | forall k. GCompare k => SubscriberMerge !(k a) (MergeSubscribed k) --TODO: Can we inline the GCompare?
744+ | forall k. (a ~ R.PatchDMap (DMap k Event), GCompare k) => SubscriberMergeChange (MergeSubscribed k)
745+ | forall k. (GCompare k, a ~ DMap k Identity) => SubscriberFan (FanSubscribed k)
746+ | forall p b. (a ~ p b, R.Patch p) => SubscriberHold !(Hold p b)
747+ | forall b. (a ~ Identity b) => SubscriberHoldIdentity !(Hold Identity b)
748+ | SubscriberSwitch (SwitchSubscribed a)
749+ | forall b. a ~ Event b => SubscriberCoincidenceOuter (CoincidenceSubscribed b)
750+ | SubscriberCoincidenceInner (CoincidenceSubscribed a)
753+-- These function are constructor functions that are marked NOINLINE so they are
754+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
755+-- so any weak references that are attached to the constructors will have their
756+-- finalizer run. Using the opaque constructor, does not see the
757+-- constructor application, so it behaves like an IORef and cannot be fused away.
759+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
760+-- the weak pointer to it in some cases.
1187−{-# NOINLINE newInvalidatorPull #-}
762+--TODO: I think all of these noinlines are now unnecessary
1188−newInvalidatorPull :: Pull x a -> IO (Invalidator x)
763+{-# NOINLINE newSubscriberPush #-}
1189−newInvalidatorPull p = return $! InvalidatorPull p
764+newSubscriberPush :: (a -> ComputeM (Maybe b)) -> PushSubscribed a b -> IO (Subscriber a)
765+newSubscriberPush compute subd = return $! SubscriberPush compute subd
1191−instance HasSpiderTimeline x => Filterable (Event x) where
767+{-# RULES
1192− mapMaybe f = push $ return . f
768+ "newSubscriberHold/Identity" forall h. newSubscriberHold h = newSubscriberHoldIdentity h
770+{-# NOINLINE newSubscriberHold #-}
771+newSubscriberHold :: R.Patch p => Hold p a -> IO (Subscriber (p a))
772+newSubscriberHold h = return $! SubscriberHold h
1194−instance HasSpiderTimeline x => Align (Event x) where
774+{-# NOINLINE newSubscriberHoldIdentity #-}
1195− nil = eventNever
775+newSubscriberHoldIdentity :: Hold Identity a -> IO (Subscriber (Identity a))
1196−#if MIN_VERSION_these(0, 8, 0)
776+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
778+{-# NOINLINE newSubscriberMerge #-}
1203−#if MIN_VERSION_semialign(1,1,0)
779+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed k -> IO (Subscriber a)
1204−instance HasSpiderTimeline x => Zip (Event x) where
780+newSubscriberMerge k subd = return $! SubscriberMerge k subd
1206− zip x y = mapMaybe justThese $ align x y
782+{-# NOINLINE newSubscriberMergeChange #-}
1207−#endif
783+newSubscriberMergeChange :: GCompare k => MergeSubscribed k -> IO (Subscriber (R.PatchDMap (DMap k Event)))
784+newSubscriberMergeChange subd = return $! SubscriberMergeChange subd
786+{-# NOINLINE newSubscriberFan #-}
787+newSubscriberFan :: GCompare k => FanSubscribed k -> IO (Subscriber (DMap k Identity))
788+newSubscriberFan subd = return $! SubscriberFan subd
1209−data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
790+{-# NOINLINE newSubscriberSwitch #-}
1210− | BuildDyn !(EventM x (PatchTarget p), Event x p)
791+newSubscriberSwitch :: SwitchSubscribed a -> IO (Subscriber a)
1211− | HoldDyn !(Hold x p)
792+newSubscriberSwitch subd = return $! SubscriberSwitch subd
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
794+{-# NOINLINE newSubscriberCoincidenceOuter #-}
795+newSubscriberCoincidenceOuter :: CoincidenceSubscribed b -> IO (Subscriber (Event b))
796+newSubscriberCoincidenceOuter subd = return $! SubscriberCoincidenceOuter subd
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
798+{-# NOINLINE newSubscriberCoincidenceInner #-}
799+newSubscriberCoincidenceInner :: CoincidenceSubscribed a -> IO (Subscriber a)
800+newSubscriberCoincidenceInner subd = return $! SubscriberCoincidenceInner subd
802+{-# NOINLINE newInvalidatorSwitch #-}
803+newInvalidatorSwitch :: SwitchSubscribed a -> IO Invalidator
804+newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
806+{-# NOINLINE newInvalidatorPull #-}
807+newInvalidatorPull :: Pull a -> IO Invalidator
808+newInvalidatorPull p = return $! InvalidatorPull p
811+ = DynamicHold !(Hold p a)
812+ | p ~ Identity => DynamicHoldIdentity !(Hold Identity a)
814+ | DynamicDyn !(Dyn p a)
815+ | p ~ Identity => DynamicDynIdentity !(Dyn Identity a)
817+{-# INLINE current #-}
818+current :: R.Patch p => Dynamic p a -> Behavior a
820+ DynamicHold h -> BehaviorHold h
821+ DynamicHoldIdentity h -> BehaviorHoldIdentity h
822+ DynamicConst a -> BehaviorConst a
823+ DynamicDyn d -> BehaviorDyn d
824+ DynamicDynIdentity d -> BehaviorDynIdentity d
826+--TODO: If you only need updated, not current, can we avoid actually constructing the Hold?
827+{-# INLINE updated #-}
828+updated :: R.Patch p => Dynamic p a -> Event (p a)
830+ DynamicHold h -> EventHold h
831+ DynamicHoldIdentity h -> EventHoldIdentity h
832+ DynamicConst _ -> EventNever
833+ DynamicDyn d -> EventDyn d
834+ DynamicDynIdentity d -> EventDynIdentity d
836+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)
837+newMapDyn f d = DynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ current d) (Identity . f . runIdentity <$> updated d)
839+instance Functor (Dynamic Identity) where
842+instance Applicative (Dynamic Identity) where
844+ (<*>) = zipDynWith ($)
848+instance R.FunctorMaybe Event where
849+ fmapMaybe f = push $ return . f
851+instance Align Event where
853+ 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
855--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)
856+zipDynWith :: (a -> b -> c) -> Dynamic Identity a -> Dynamic Identity b -> Dynamic Identity c
1220zipDynWith f da db =
857zipDynWith f da db =
1221− let eab = align (dynamicUpdated da) (dynamicUpdated db)
858+ let eab = align (updated da) (updated db)
1222 ec = flip push eab $ \o -> do
859 ec = flip push eab $ \o -> do
1223 (a, b) <- case o of
860 (a, b) <- case o of
1224 This (Identity a) -> do
861 This (Identity a) -> do
1225− b <- readBehaviorUntracked $ dynamicCurrent db
862+ b <- readBehaviorUntracked $ current db
1226 return (a, b)
863 return (a, b)
1227 That (Identity b) -> do
864 That (Identity b) -> do
1228− a <- readBehaviorUntracked $ dynamicCurrent da
865+ a <- readBehaviorUntracked $ current da
1229 return (a, b)
866 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
867 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
868 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
869+ 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)
871+instance Monad (Dynamic Identity) where
1235−buildDynamic readV0 v' = do
872+ {-# INLINE return #-}
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
873+ return = pure
1237− let !d = Dyn result
874+ {-# INLINE (>>=) #-}
1238− defer $ SomeDynInit d
875+ x >>= f = DynamicDynIdentity $ newJoinDyn $ newMapDyn f x --TODO: (>>), fail
1239− return d
876+ {-# INLINE (>>) #-}
879+ fail _ = error "Dynamic does not support 'fail'"
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
881+newtype Dyn p a = Dyn { unDyn :: IORef (Either (BehaviorM a, Event (p a)) (Hold p a)) }
1242−unsafeBuildDynamic readV0 v' =
882+
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
883+unsafeDyn :: BehaviorM a -> Event (p a) -> Dyn p a
884+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
885+ where x = (readV0, v')
887+newJoinDyn :: Dynamic Identity (Dynamic Identity a) -> Dyn Identity a
889+ let readV0 = readBehaviorTracked . current =<< readBehaviorTracked (current d)
890+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . current . runIdentity) $ updated d
891+ eInner = switch $ updated <$> current d
892+ eBoth = coincidence $ updated . runIdentity <$> updated d
893+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
894+ in unsafeDyn readV0 v'
896+--type role Behavior representational
898+ = forall p. BehaviorHold !(Hold p a)
899+ | BehaviorHoldIdentity !(Hold Identity a)
901+ | BehaviorPull !(Pull a)
902+ | BehaviorDynIdentity !(Dyn Identity a)
903+ | forall p. R.Patch p => BehaviorDyn !(Dyn p a)
1245-- ResultM can read behaviors and events
905-- ResultM can read behaviors and events
1246type ResultM = EventM
906type ResultM = EventM
908+{-# NOINLINE unsafeNewIORef #-}
909+unsafeNewIORef :: a -> b -> IORef b
910+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248−instance HasSpiderTimeline x => Functor (Event x) where
912+instance Functor Event where
1249 fmap f = push $ return . Just . f
913 fmap f = push $ return . Just . f
1251−instance Functor (Behavior x) where
915+instance Functor Behavior where
1252 fmap f = pull . fmap f . readBehaviorTracked
916 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
918+{-# 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
919+push :: forall a b. (a -> ComputeM (Maybe b)) -> Event a -> Event b
1256−push f e = cacheEvent (pushCheap f e)
920+push f e = EventPush $ Push
923+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
925+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258−{-# INLINABLE pull #-}
927+{-# NOINLINE pull #-}
1259−pull :: BehaviorM x a -> Behavior x a
928+pull :: BehaviorM a -> Behavior a
1260−pull a = unsafePerformIO $ do
929+pull a = BehaviorPull $ Pull
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
930+ { pullCompute = a
1267− , pullValue = ref
931+ , pullValue = unsafeNewIORef a Nothing
1268#ifdef DEBUG_NODEIDS
932#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
933+ , pullNodeId = unsafeNodeId a
1273−{-# INLINABLE switch #-}
937+{-# NOINLINE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
938+switch :: Behavior (Event a) -> Event a
1275−switch a = unsafePerformIO $ do
939+switch a = EventSwitch $ Switch
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
940+ { switchParent = a
1279− , switchSubscribed = ref
941+ , switchSubscribed = unsafeNewIORef a Nothing
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
944+coincidence :: Event (Event a) -> Event a
1283−coincidence a = unsafePerformIO $ do
945+coincidence a = EventCoincidence $ Coincidence
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
946+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
947+ , coincidenceSubscribed = unsafeNewIORef a Nothing
950+propagateAndUpdateSubscribersRef :: SubscriberList a -> a -> EventM x ()
951+propagateAndUpdateSubscribersRef subscribersRef a = do
952+ 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
954-- 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
955+run :: [DSum RootTrigger Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
956run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
957+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
958+ spiderEnv <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
959+ result <- SpiderHost $ lift $ withMVar (_spiderEnv_lock spiderEnv) $ \_ -> flip runReaderT spiderEnv $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
960 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
961 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
962 occBefore <- readIORef occRef
@@ -1303,40 +967,43 @@ run roots after = do
1303 return $ Just r
967 return $ Just r
1304 else return Nothing
968 else return Nothing
1305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
969 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306− propagate a subscribersRef
970+ propagateAndUpdateSubscribersRef subscribersRef a
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
971+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308 let go = do
972 let go = do
1309 delayed <- liftIO $ readIORef delayedRef
973 delayed <- liftIO $ readIORef delayedRef
1310 case IntMap.minViewWithKey delayed of
974 case IntMap.minViewWithKey delayed of
1311 Nothing -> return ()
975 Nothing -> return ()
1312 Just ((currentHeight, cur), future) -> do
976 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
977+ tracePropagate $ "Running height " ++ show currentHeight
1314 putCurrentHeight $ Height currentHeight
978 putCurrentHeight $ Height currentHeight
1315 liftIO $ writeIORef delayedRef $! future
979 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
980+ forM_ cur $ \d -> case d of
981+ DelayedMerge subscribed -> do
982+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
983+ case height `compare` Height currentHeight of
984+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
985+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
987+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
988+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
989+ --TODO: Assert that m is not empty
990+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
991+ scheduleClear $ mergeSubscribedOccurrence subscribed
992+ propagateAndUpdateSubscribersRef (mergeSubscribedSubscribers subscribed) m
1319 putCurrentHeight maxBound
995 putCurrentHeight maxBound
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
997+ tracePropagate "Done running an event frame"
1322 return result
998 return result
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1000+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))
1002+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1004+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
1006+data DelayedMerge = forall k. DelayedMerge (MergeSubscribed k)
1341debugFinalize :: Bool
1008debugFinalize :: Bool
1342debugFinalize = False
1009debugFinalize = False
@@ -1346,106 +1013,54 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1013 x' <- evaluate x
1347 mkWeakPtr x' $
1014 mkWeakPtr x' $
1348 if debugFinalize
1015 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1016+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1017 else Nothing
1352type WeakList a = [Weak a]
1019type 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 #-}
1021{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1023+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1024+withIncreasedDepth a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1025+ spiderEnv <- askSpiderTimeline
1026+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) succ
1385 result <- a
1027 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1028+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
1387 return result
1029 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
1031+withIncreasedDepth :: m a -> m a
1032+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1035+type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1037{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1038+tracePropagate :: (CanTrace x m) => String -> m ()
1420−tracePropagate _ _ = return ()
1039+tracePropagate = traceWhen debugPropagate
1041+{-# INLINE traceSubscribe #-}
1042+traceSubscribe :: String -> IO ()
1043+traceSubscribe = when debugSubscribe . liftIO . putStrLn
1422{-# INLINE traceInvalidate #-}
1045{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1046traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1047+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1049+{-# INLINE traceWhen #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1050+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1442−trace _ _ = return ()
1051+traceWhen b message = traceMWhen b $ return message
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1053+{-# INLINE traceMWhen #-}
1054+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1055+traceMWhen b getMessage = when b $ do
1056+ message <- getMessage
1058+ spiderEnv <- askSpiderTimeline
1059+ d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
1063+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1065whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1066whoCreatedIORef (IORef a) = whoCreated $! a
@@ -1460,278 +1075,431 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1075 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1077listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1078+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"
1080+-- | Propagate everything at the current height
1081+propagate :: a -> SubscriberList a -> EventM x ()
1082+propagate a subscribers = withIncreasedDepth $ do
1083+ -- 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
1084+ --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
1085+ WeakBag.traverse subscribers $ \s -> case s of
1086+ SubscriberPush compute subscribed -> {-# SCC "traversePush" #-} do
1087+ tracePropagate $ "SubscriberPush" <> showNodeId subscribed
1088+ occ <- runComputeM $ compute a
1090+ Nothing -> return () -- No need to write a Nothing back into the Ref
1092+ liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
1093+ scheduleClear $ pushSubscribedOccurrence subscribed
1094+ propagate o $ pushSubscribedSubscribers subscribed
1095+ SubscriberMerge k subscribed -> {-# SCC "traverseMerge" #-} do
1096+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
1097+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1098+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
1099+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1100+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
1101+ when (DMap.null oldM) $ do -- Only schedule the firing once
1102+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1103+ --TODO: assertions about height
1104+ currentHeight <- getCurrentHeight
1105+ when (height <= currentHeight) $ do
1106+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
1107+ if height /= invalidHeight
1108+ then error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1110+ nodesInvolvedInCycle <- walkInvalidHeightParents $ EventSubscribedMerge subscribed
1111+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1112+ error $ "Causality loop found:\n" <> drawForest (listsToForest stacks)
1113+ scheduleMerge height subscribed
1114+ SubscriberMergeChange subscribed -> {-# SCC "traverseMergeChange" #-} do
1115+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
1116+ defer $ SomeMergeUpdate a subscribed
1117+ SubscriberFan subscribed -> {-# SCC "traverseFan" #-} do
1118+ subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
1119+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
1120+ --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
1121+ forM_ (DMap.toList a) $ \(k :=> Identity v) -> {-# SCC "SubscriberFan" #-} case DMap.lookup k subs of
1123+ tracePropagate "No subscriber for key"
1126+ propagate v $ _fanSubscribedChildren_list subsubs
1128+ SubscriberHold h -> {-# SCC "traverseHold" #-} propagateSubscriberHold h a
1129+ SubscriberHoldIdentity h -> {-# SCC "traverseHoldIdentity" #-} propagateSubscriberHold h a
1130+ SubscriberSwitch subscribed -> {-# SCC "traverseSwitch" #-} do
1131+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
1132+ liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
1133+ scheduleClear $ switchSubscribedOccurrence subscribed
1134+ propagate a $ switchSubscribedSubscribers subscribed
1135+ SubscriberCoincidenceOuter subscribed -> {-# SCC "traverseCoincidenceOuter" #-} do
1136+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
1137+ outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
1138+ tracePropagate $ " outerHeight = " <> show outerHeight
1139+ (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
1140+ tracePropagate $ " isJust occ = " <> show (isJust occ)
1141+ tracePropagate $ " innerHeight = " <> show innerHeight
1142+ liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
1143+ scheduleClear $ coincidenceSubscribedInnerParent subscribed
1146+ when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
1147+ writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
1148+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
1149+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
1150+ Just o -> do -- Since it's already firing, no need to adjust height
1151+ liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
1152+ scheduleClear $ coincidenceSubscribedOccurrence subscribed
1153+ propagate o $ coincidenceSubscribedSubscribers subscribed
1154+ SubscriberCoincidenceInner subscribed -> {-# SCC "traverseCoincidenceInner" #-} do
1155+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
1156+ occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
1158+ Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
1160+ liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
1161+ scheduleClear $ coincidenceSubscribedOccurrence subscribed
1162+ propagate a $ coincidenceSubscribedSubscribers subscribed
1163+ SubscriberHandle -> {-# SCC "traverseHandle" #-} tracePropagate "SubscriberHandle"
1498{-# INLINE propagateSubscriberHold #-}
1165{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1166+propagateSubscriberHold :: R.Patch p => Hold p a -> p a -> EventM x ()
1500propagateSubscriberHold h a = do
1167propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1168+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1169 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1170 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1171 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1172+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1173 Nothing -> return ()
1508 Just v' -> do
1174 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1175+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1176 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1177 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1178 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
1180+data SomeResetCoincidence = forall a. SomeResetCoincidence !(EventSubscription a) !(Maybe (CoincidenceSubscribed a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1182+{-# SPECIALIZE readBehaviorUntracked :: Behavior a -> BehaviorM a #-}
1183+{-# SPECIALIZE readBehaviorUntracked :: Behavior a -> EventM x a #-}
1184+readBehaviorUntracked :: Defer SomeHoldInit m => Behavior a -> m a
1185+readBehaviorUntracked b = do
1186+ holdInits <- getDeferralQueue
1187+ 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
1189+runBehaviorM :: BehaviorM a -> Maybe (Weak Invalidator, IORef [SomeBehaviorSubscribed]) -> IORef [SomeHoldInit] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1190+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520−askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1192+askInvalidator :: BehaviorM (Maybe (Weak Invalidator))
1521askInvalidator = do
1193askInvalidator = do
1522− (!m, _) <- ask
1194+ (!m, _) <- BehaviorM ask
1523 case m of
1195 case m of
1524 Nothing -> return Nothing
1196 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1197 Just (!wi, _) -> return $ Just wi
1527−askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1199+askParentsRef :: BehaviorM (Maybe (IORef [SomeBehaviorSubscribed]))
1528askParentsRef = do
1200askParentsRef = do
1529− (!m, _) <- ask
1201+ (!m, _) <- BehaviorM ask
1530 case m of
1202 case m of
1531 Nothing -> return Nothing
1203 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1204 Just (_, !p) -> return $ Just p
1534−askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1206+askBehaviorHoldInits :: BehaviorM (IORef [SomeHoldInit])
1535askBehaviorHoldInits = do
1207askBehaviorHoldInits = do
1536− (_, !his) <- ask
1208+ (_, !his) <- BehaviorM ask
1537 return his
1209 return his
1211+readBehaviorTracked :: Behavior a -> BehaviorM a
1212+readBehaviorTracked b = case b of
1213+ BehaviorHold h -> readHoldTracked h
1214+ BehaviorHoldIdentity h -> readHoldTracked h
1215+ BehaviorConst a -> return a
1216+ BehaviorPull p -> do
1217+ val <- liftIO $ readIORef $ pullValue p
1219+ Just subscribed -> do
1220+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1221+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
1222+ liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
1223+ return $ pullSubscribedValue subscribed
1225+ i <- liftIO $ newInvalidatorPull p
1226+ wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
1227+ parentsRef <- liftIO $ newIORef []
1228+ holdInits <- askBehaviorHoldInits
1229+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
1230+ invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
1231+ parents <- liftIO $ readIORef parentsRef
1232+ let subscribed = PullSubscribed
1233+ { pullSubscribedValue = a
1234+ , pullSubscribedInvalidators = invsRef
1235+ , pullSubscribedOwnInvalidator = i
1236+ , pullSubscribedParents = parents
1238+ liftIO $ writeIORef (pullValue p) $ Just subscribed
1239+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1241+ BehaviorDyn d -> readHoldTracked =<< getDynHold d
1242+ BehaviorDynIdentity d -> readHoldTracked =<< getDynHold d
1244+{-# INLINE readHoldTracked #-}
1245+readHoldTracked :: Hold p a -> BehaviorM a
1246+readHoldTracked h = do
1247+ result <- liftIO $ readIORef $ holdValue h
1248+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
1249+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
1539{-# INLINE getDynHold #-}
1252{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1253+getDynHold :: (Defer SomeHoldInit m, R.Patch p) => Dyn p a -> m (Hold p a)
1541getDynHold d = do
1254getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1255 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1256 case mh of
1544− HoldDyn h -> return h
1257+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1258+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1259 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1260 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1261 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1262+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1263 return h
1265+readRootSubscribed :: RootSubscribed a -> IO (Maybe a)
1266+readRootSubscribed = rootSubscribedOccurrence
1268+readPushSubscribed :: PushSubscribed b a -> IO (Maybe a)
1269+readPushSubscribed subscribed = do
1270+ result <- readIORef $ pushSubscribedOccurrence subscribed -- Since ResultM is always called after the final height is reached, this will always be valid
1271+ touch $ pushSubscribedSelf subscribed
1274+readMergeSubscribed :: MergeSubscribed k -> IO (Maybe (DMap k Identity))
1275+readMergeSubscribed subscribed = do
1276+ result <- readIORef $ mergeSubscribedOccurrence subscribed
1277+ touch $ mergeSubscribedParents subscribed
1280+readFanSubscribed :: GCompare k => k a -> FanSubscribed k -> IO (Maybe a)
1281+readFanSubscribed k fs = do
1282+ parentOcc <- readEventSubscribed $ _eventSubscription_subscribed $ fanSubscribedParent fs
1283+ return $ coerce $ DMap.lookup k =<< parentOcc
1285+readSwitchSubscribed :: SwitchSubscribed a -> IO (Maybe a)
1286+readSwitchSubscribed subscribed = do
1287+ result <- readIORef $ switchSubscribedOccurrence subscribed
1288+ touch $ switchSubscribedOwnInvalidator subscribed
1291+readCoincidenceSubscribed :: CoincidenceSubscribed a -> IO (Maybe a)
1292+readCoincidenceSubscribed subscribed = do
1293+ result <- readIORef $ coincidenceSubscribedOccurrence subscribed
1294+ touch $ coincidenceSubscribedOuter subscribed
1295+ --TODO: do we need to touch the inner subscriber?
1559-- Always refers to 0
1298-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1299{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1300zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1301zeroRef = unsafePerformIO $ newIORef zeroHeight
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)
1303+{-# INLINE subscribeHoldEvent #-}
1304+subscribeHoldEvent :: (CanSubscribe x m, R.Patch p) => Hold p a -> Subscriber (p a) -> m (EventSubscription (p a))
1305+subscribeHoldEvent h sub = do
1306+ EventSubscription _ subd <- getHoldEventSubscription h
1307+ sln <- liftIO $ subscribeEventSubscribed subd sub
1308+ return $ EventSubscription sln subd
1310+{-# INLINE debugSubscribe #-}
1311+debugSubscribe :: Bool
1312+debugSubscribe = False
1315+type CanSubscribe x m =
1316+ ( HasSpiderTimeline x m
1317+ , HasCurrentHeight m
1318+ , Defer SomeHoldInit m, Defer SomeMergeInit m -- The things we need to lazily initialize state
1319+ , Defer SomeClear m -- Wiping out event firings
1320+ , Defer SomeAssignment m -- Updating state
1321+ , Defer SomeResetCoincidence m
1324+getRootSubscribed :: GCompare k => k a -> Root k -> Subscriber a -> IO (SubscriberListTicket a, RootSubscribed a)
1565getRootSubscribed k r sub = do
1325getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1326 mSubscribed <- readIORef $ rootSubscribed r
1567− let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1568 case DMap.lookup k mSubscribed of
1327 case DMap.lookup k mSubscribed of
1569 Just subscribed -> {-# SCC "hitRoot" #-} do
1328 Just subscribed -> {-# SCC "hitRoot" #-} do
1570 sln <- subscribeRootSubscribed subscribed sub
1329 sln <- subscribeRootSubscribed subscribed sub
1572− return (sln, subscribed, occ)
1330+ return (sln, subscribed)
1573 Nothing -> {-# SCC "missRoot" #-} do
1331 Nothing -> {-# SCC "missRoot" #-} do
1574 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
1332 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
1575 let !cached = rootSubscribed r
1333 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1334 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1335 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1336+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1337 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1338 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1339+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1340 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1341 , rootSubscribedCachedSubscribed = cached
1589− , rootSubscribedOccurrence = getOcc
1342+ , rootSubscribedOccurrence = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1590 , rootSubscribedSubscribers = subs
1343 , rootSubscribedSubscribers = subs
1591 , rootSubscribedUninit = uninit
1344 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1345 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1346#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1347+ , 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)
1350+ 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
1351 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)
1352+ return (sln, subscribed)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1354{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615−cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1355+cleanupRootSubscribed :: RootSubscribed a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1356+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1357 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1358 modifyIORef' cached $ DMap.delete k
1620{-# INLINE subscribeRootSubscribed #-}
1360{-# INLINE subscribeRootSubscribed #-}
1621−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1361+subscribeRootSubscribed :: RootSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1362subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1364+-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1625−
1365+{-# SPECIALIZE getPushSubscribed :: Push a b -> Subscriber b -> EventM x (SubscriberListTicket b, PushSubscribed a b) #-}
1626−data FanInt x a = FanInt
1366+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
1367+getPushSubscribed p sub = do
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1368+ mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1369+ case mSubscribed of
1630−#ifdef DEBUG_NODEIDS
1370+ Just subscribed -> {-# SCC "hitPush" #-} do
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1371+ sln <- liftIO $ subscribePushSubscribed subscribed sub
1632−#endif
1372+ return (sln, subscribed)
1633− }
1373+ Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1634−
1374+ subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1635−newFanInt :: IO (FanInt x a)
1375+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1636−newFanInt = do
1376+ 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
1377+ subscription@(EventSubscription _ subd) <- subscribe (pushParent p) s
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1378+ parentOcc <- liftIO $ readEventSubscribed subd
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1379+ occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1380+ occRef <- liftIO $ newIORef occ
1381+ when (isJust occ) $ scheduleClear occRef
1382+ weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1383+ let !cached = pushSubscribed p
1384+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1385+ let subscribed = PushSubscribed
1386+ { pushSubscribedCachedSubscribed = cached
1387+ , pushSubscribedOccurrence = occRef
1388+ , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1389+ , pushSubscribedSubscribers = subs
1390+ , pushSubscribedSelf = s
1391+ , pushSubscribedWeakSelf = weakSelf
1392+ , pushSubscribedParent = subscription
1640#ifdef DEBUG_NODEIDS
1393#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1394+ , pushSubscribedNodeId = unsafeNodeId p
1643− return $ FanInt
1396+ }
1644− { _fanInt_subscribers = subscribers
1397+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1645− , _fanInt_subscriptionRef = subscriptionRef
1398+ liftIO $ writeIORef subscribedRef $! subscribed
1646− , _fanInt_occRef = occRef
1399+ liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1400+ return (sln, subscribed)
1402+cleanupPushSubscribed :: PushSubscribed a b -> IO ()
1403+cleanupPushSubscribed self = do
1404+ unsubscribe $ pushSubscribedParent self
1405+ writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1407+{-# INLINE subscribePushSubscribed #-}
1408+subscribePushSubscribed :: PushSubscribed a b -> Subscriber b -> IO (SubscriberListTicket b)
1409+subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1411+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge k -> Subscriber (DMap k Identity) -> EventM x (SubscriberListTicket (DMap k Identity), MergeSubscribed k) #-}
1412+getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge k -> Subscriber (DMap k Identity) -> m (SubscriberListTicket (DMap k Identity), MergeSubscribed k)
1413+getMergeSubscribed m sub = do
1414+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1415+ case mSubscribed of
1416+ Just subscribed -> {-# SCC "hitMerge" #-} do
1417+ sln <- liftIO $ subscribeMergeSubscribed subscribed sub
1418+ return (sln, subscribed)
1419+ Nothing -> {-# SCC "missMerge" #-} do
1420+ subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1421+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1422+ initialParents <- readBehaviorUntracked $ current $ mergeParents m
1423+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent k))] <- forM (DMap.toList initialParents) $ {-# SCC "getMergeSubscribed.a" #-} \(k :=> e) -> do
1424+ s <- {-# SCC "getMergeSubscribed.a.1" #-} liftIO $ newSubscriberMerge k subscribedUnsafe
1425+ subscription@(EventSubscription _ parentSubd) <- {-# SCC "getMergeSubscribed.a.2" #-} subscribe e s
1426+ parentOcc <- {-# SCC "getMergeSubscribed.a.3" #-} liftIO $ readEventSubscribed parentSubd
1427+ height <- {-# SCC "getMergeSubscribed.a.4" #-} liftIO $ getEventSubscribedHeight parentSubd
1428+ {-# SCC "getMergeSubscribed.a.5" #-} return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1429+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1430+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1431+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1432+ myHeight = if invalidHeight `elem` heights
1434+ else succHeight $ heightBagMax myHeightBag
1435+ currentHeight <- getCurrentHeight
1436+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1437+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1439+ unless (DMap.null accum) $ do
1440+ scheduleMerge myHeight subscribedUnsafe
1441+ occRef <- liftIO $ newIORef occ
1442+ when (isJust occ) $ scheduleClear occRef
1443+ accumRef <- liftIO $ newIORef accum
1444+ heightRef <- liftIO $ newIORef myHeight
1445+ heightMapRef <- liftIO $ newIORef myHeightBag
1446+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1447+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1448+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1449+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1450+ let !subscribed = MergeSubscribed
1451+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1452+ , mergeSubscribedOccurrence = occRef
1453+ , mergeSubscribedAccum = accumRef
1454+ , mergeSubscribedHeight = heightRef
1455+ , mergeSubscribedHeightBag = heightMapRef
1456+ , mergeSubscribedSubscribers = subs
1457+ , mergeSubscribedChange = changeSubdRef
1458+ , mergeSubscribedParents = parentsRef
1459+ , mergeSubscribedWeakSelf = weakSelf
1647#ifdef DEBUG_NODEIDS
1460#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1461+ , 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−
1464+ defer $ SomeMergeInit subscribed $ updated $ mergeParents m
1705−
1465+ liftIO $ writeIORef subscribedRef $! subscribed
1706−{-# INLINABLE getFanSubscribed #-}
1466+ 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))
1467+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1468+ return (sln, subscribed)
1470+cleanupMergeSubscribed :: MergeSubscribed k -> IO ()
1471+cleanupMergeSubscribed subscribed = do
1472+ parents <- readIORef $ mergeSubscribedParents subscribed
1473+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1474+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1475+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1477+{-# INLINE subscribeMergeSubscribed #-}
1478+subscribeMergeSubscribed :: MergeSubscribed k -> Subscriber (DMap k Identity) -> IO (SubscriberListTicket (DMap k Identity))
1479+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1481+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan k -> Subscriber a -> EventM x (SubscriberListTicket a, FanSubscribed k) #-}
1482+getFanSubscribed :: (Defer SomeAssignment m, Defer SomeHoldInit m, Defer SomeMergeInit m, Defer SomeClear m, HasCurrentHeight m, Defer SomeResetCoincidence m, HasSpiderTimeline x m, GCompare k) => k a -> Fan k -> Subscriber a -> m (SubscriberListTicket a, FanSubscribed k)
1708getFanSubscribed k f sub = do
1483getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1484 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1485 case mSubscribed of
1711− Just subscribed -> {-# SCC "hitFan" #-} liftIO $ do
1486+ Just subscribed -> {-# SCC "hitFan" #-} do
1712− sln <- subscribeFanSubscribed k subscribed sub
1487+ sln <- liftIO $ subscribeFanSubscribed k subscribed sub
1713− occ <- readIORef $ fanSubscribedOccurrence subscribed
1714− return (sln, subscribed, coerce $ DMap.lookup k =<< occ)
1488+ return (sln, subscribed)
1715 Nothing -> {-# SCC "missFan" #-} do
1489 Nothing -> {-# SCC "missFan" #-} do
1716 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
1490 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
1717 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1491 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1718 s <- liftIO $ newSubscriberFan subscribedUnsafe
1492 s <- liftIO $ newSubscriberFan subscribedUnsafe
1719− (subscription, parentOcc) <- subscribeAndRead (fanParent f) s
1493+ subscription <- subscribe (fanParent f) s
1720 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
1494 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
1721 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
1495 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1496 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
1497 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1498 { fanSubscribedCachedSubscribed = fanSubscribed f
1730− , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1499 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1500 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1501#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1502+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1505 let !self = (k, subscribed)
@@ -1739,9 +1507,9 @@ getFanSubscribed k f sub = do
1739 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
1507 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
1740 liftIO $ writeIORef subscribedRef $! subscribed
1508 liftIO $ writeIORef subscribedRef $! subscribed
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1509 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742− return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1510+ return (slnForSub, subscribed)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1512+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1513cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1514 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1515 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1521,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1521 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1523{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1524+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed k -> Subscriber a -> IO (SubscriberListTicket a)
1757subscribeFanSubscribed k subscribed sub = do
1525subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1526 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1527 case DMap.lookup k subscribers of
@@ -1761,19 +1529,18 @@ subscribeFanSubscribed k subscribed sub = do
1761 let !self = (k, subscribed)
1529 let !self = (k, subscribed)
1762 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
1530 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
1763 (list, sln) <- WeakBag.singleton sub weakSelf cleanupFanSubscribed
1531 (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
1532+ 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
1533 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1534 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1536+{-# 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)
1537+getSwitchSubscribed :: (Defer SomeHoldInit m, Defer SomeAssignment m, Defer SomeMergeInit m, Defer SomeClear m, Defer SomeResetCoincidence m, HasCurrentHeight m, HasSpiderTimeline x m) => Switch a -> Subscriber a -> m (SubscriberListTicket a, SwitchSubscribed a)
1770getSwitchSubscribed s sub = do
1538getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1539 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1540 case mSubscribed of
1773− Just subscribed -> {-# SCC "hitSwitch" #-} liftIO $ do
1541+ Just subscribed -> {-# SCC "hitSwitch" #-} do
1774− sln <- subscribeSwitchSubscribed subscribed sub
1542+ sln <- liftIO $ subscribeSwitchSubscribed subscribed sub
1775− occ <- readIORef $ switchSubscribedOccurrence subscribed
1776− return (sln, subscribed, occ)
1543+ return (sln, subscribed)
1777 Nothing -> {-# SCC "missSwitch" #-} do
1544 Nothing -> {-# SCC "missSwitch" #-} do
1778 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
1545 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
1779 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1546 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
@@ -1784,16 +1551,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
1551 parentsRef <- liftIO $ newIORef [] --TODO: This should be unnecessary, because it will always be filled with just the single parent behavior
1785 holdInits <- getDeferralQueue
1552 holdInits <- getDeferralQueue
1786 e <- liftIO $ runBehaviorM (readBehaviorTracked (switchParent s)) (Just (wi, parentsRef)) holdInits
1553 e <- liftIO $ runBehaviorM (readBehaviorTracked (switchParent s)) (Just (wi, parentsRef)) holdInits
1787− (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead e mySub
1554+ subscription@(EventSubscription _ subd) <- subscribe e mySub
1788− heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
1789 subscriptionRef <- liftIO $ newIORef subscription
1555 subscriptionRef <- liftIO $ newIORef subscription
1556+ parentOcc <- liftIO $ readEventSubscribed subd
1790 occRef <- liftIO $ newIORef parentOcc
1557 occRef <- liftIO $ newIORef parentOcc
1791 when (isJust parentOcc) $ scheduleClear occRef
1558 when (isJust parentOcc) $ scheduleClear occRef
1559+ heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1560 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1561 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1562 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1563 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1564 , switchSubscribedOccurrence = occRef
@@ -1806,38 +1571,38 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1571 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1572 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1573#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1574+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1577 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1813 liftIO $ writeIORef subscribedRef $! subscribed
1578 liftIO $ writeIORef subscribedRef $! subscribed
1814 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1579 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1815− return (slnForSub, subscribed, parentOcc)
1580+ return (slnForSub, subscribed)
1817−cleanupSwitchSubscribed :: SwitchSubscribed x a -> IO ()
1582+cleanupSwitchSubscribed :: SwitchSubscribed a -> IO ()
1818cleanupSwitchSubscribed subscribed = do
1583cleanupSwitchSubscribed subscribed = do
1819 unsubscribe =<< readIORef (switchSubscribedCurrentParent subscribed)
1584 unsubscribe =<< readIORef (switchSubscribedCurrentParent subscribed)
1820 finalize =<< readIORef (switchSubscribedOwnWeakInvalidator subscribed) -- We don't need to get invalidated if we're dead
1585 finalize =<< readIORef (switchSubscribedOwnWeakInvalidator subscribed) -- We don't need to get invalidated if we're dead
1821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1586 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1823{-# INLINE subscribeSwitchSubscribed #-}
1588{-# INLINE subscribeSwitchSubscribed #-}
1824−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1589+subscribeSwitchSubscribed :: SwitchSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1590subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1592+{-# 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)
1593+getCoincidenceSubscribed :: forall x a m. (Defer SomeAssignment m, Defer SomeHoldInit m, Defer SomeMergeInit m, Defer SomeClear m, HasCurrentHeight m, Defer SomeResetCoincidence m, HasSpiderTimeline x m) => Coincidence a -> Subscriber a -> m (SubscriberListTicket a, CoincidenceSubscribed a)
1829getCoincidenceSubscribed c sub = do
1594getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1595 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1596 case mSubscribed of
1832− Just subscribed -> {-# SCC "hitCoincidence" #-} liftIO $ do
1597+ Just subscribed -> {-# SCC "hitCoincidence" #-} do
1833− sln <- subscribeCoincidenceSubscribed subscribed sub
1598+ sln <- liftIO $ subscribeCoincidenceSubscribed subscribed sub
1834− occ <- readIORef $ coincidenceSubscribedOccurrence subscribed
1835− return (sln, subscribed, occ)
1599+ return (sln, subscribed)
1836 Nothing -> {-# SCC "missCoincidence" #-} do
1600 Nothing -> {-# SCC "missCoincidence" #-} do
1837 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
1601 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
1838 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1602 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1839 subOuter <- liftIO $ newSubscriberCoincidenceOuter subscribedUnsafe
1603 subOuter <- liftIO $ newSubscriberCoincidenceOuter subscribedUnsafe
1840− (outerSubscription@(EventSubscription _ outerSubd), outerOcc) <- subscribeAndRead (coincidenceParent c) subOuter
1604+ outerSubscription@(EventSubscription _ outerSubd) <- subscribe (coincidenceParent c) subOuter
1605+ outerOcc <- liftIO $ readEventSubscribed outerSubd
1841 outerHeight <- liftIO $ getEventSubscribedHeight outerSubd
1606 outerHeight <- liftIO $ getEventSubscribedHeight outerSubd
1842 (occ, height, mInnerSubd) <- case outerOcc of
1607 (occ, height, mInnerSubd) <- case outerOcc of
1843 Nothing -> return (Nothing, outerHeight, Nothing)
1608 Nothing -> return (Nothing, outerHeight, Nothing)
@@ -1851,9 +1616,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1616 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1617 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1618 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1619 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1620 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1621 , coincidenceSubscribedOccurrence = occRef
@@ -1864,549 +1626,160 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1626 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1627 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1628#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1629+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1632 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1871 liftIO $ writeIORef subscribedRef $! subscribed
1633 liftIO $ writeIORef subscribedRef $! subscribed
1872 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1634 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1873− return (slnForSub, subscribed, occ)
1635+ return (slnForSub, subscribed)
1875−cleanupCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO ()
1637+cleanupCoincidenceSubscribed :: CoincidenceSubscribed a -> IO ()
1876cleanupCoincidenceSubscribed subscribed = do
1638cleanupCoincidenceSubscribed subscribed = do
1877 unsubscribe $ coincidenceSubscribedOuterParent subscribed
1639 unsubscribe $ coincidenceSubscribedOuterParent subscribed
1878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1640 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1880{-# INLINE subscribeCoincidenceSubscribed #-}
1642{-# INLINE subscribeCoincidenceSubscribed #-}
1881−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1643+subscribeCoincidenceSubscribed :: CoincidenceSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1644subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1646+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1647+merge :: GCompare k => Dynamic R.PatchDMap (DMap k Event) -> Event (DMap k Identity)
1886− => (forall a. q a -> Event x (v a))
1648+merge m = EventMerge $ Merge
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1649+ { mergeParents = m
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1650+ , 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
1653+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 }
1655+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) }
1656+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
1657 let f = Fan
2288 { fanParent = e
1658 { fanParent = e
2289− , fanSubscribed = ref
1659+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1661+ in EventSelector $ \k -> EventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1663+runHoldInits :: IORef [SomeHoldInit] -> IORef [SomeMergeInit] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1664+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1665 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1666 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1667+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1668 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1669 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1670 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
1671+ mapM_ initMerge mergeInits
2304− mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1672+ runHoldInits holdInitRef mergeInitRef
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1674+initHold :: SomeHoldInit -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1675initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
1677+initMerge :: SomeMergeInit -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1678+initMerge (SomeMergeInit subscribed changed) = do
1679+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1680+ EventSubscription _ changeSubd <- subscribe changed changeSub
1681+ change <- liftIO $ readEventSubscribed changeSubd
1682+ forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1683+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2313−newEventEnv :: IO (EventEnv x)
1685+-- | Run an event action outside of a frame
2314−newEventEnv = do
1686+runFrame :: EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1687+runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1688+ -- 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
1689+ pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1690+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1691 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1692 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1693 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1694 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1695 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1696 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1697 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1698 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
1699+ delayedRef <- liftIO $ newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1700+ 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
1701 let go = do
2347 result <- a
1702 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
1703+ 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
1704 return result
2350− result <- runEventM go
1705+ result <- runEventM go env
2351− toClear <- readIORef $ eventEnvClears env
1706+ toClear <- readIORef toClearRef
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1707+ 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
1708+ toClearRoot <- readIORef toClearRootRef
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1709+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1710+ toAssign <- readIORef toAssignRef
2358 toReconnectRef <- newIORef []
1711 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1712+ coincidenceInfos <- readIORef coincidenceInfosRef
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1713 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1714 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1715+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1716 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1717+ mergeUpdates <- readIORef mergeUpdateRef
2365− writeIORef (eventEnvMergeUpdates env) []
1718+ writeIORef mergeUpdateRef []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1719+ let updateMerge :: SomeMergeUpdate -> IO [SomeEventSubscription]
1720+ updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k Event)) m) = do
1721+ oldParents <- readIORef $ mergeSubscribedParents m
1722+ let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1723+ (mOldSubd, newPs) <- case me of
1724+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1726+ s <- liftIO $ newSubscriberMerge k m
1727+ subscription@(EventSubscription _ subd) <- subscribe e s
1728+ let newParent = MergeSubscribedParent subscription s
1729+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1730+ liftIO $ addMergeHeight newParentHeight m
1731+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1732+ forM_ mOldSubd $ \oldSubd -> do
1733+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1734+ liftIO $ removeMergeHeight oldHeight m
1735+ return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1736+ (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
1737+ writeIORef (mergeSubscribedParents m) $! newParents
1738+ return subscriptionsToKill
1739+ when debugPropagate $ putStrLn "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1740+ mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1741+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1742 toReconnect <- readIORef toReconnectRef
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1743 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1744 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1745 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1746+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1747 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1748 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1749 wi' <- mkWeakPtrWithDebug i "wi'"
2378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
1750 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1751 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1752+ writeIORef holdInitRef [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1753+ 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
1754+ 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
1755 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1756 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
1757+ 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)
1759 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1760+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1761 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1762 EventNever -> "EventNever"
2391 _ -> "something else"
1763 _ -> "something else"
2393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1765 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
2394− return oldSubscription
1766+ return $ SomeEventSubscription oldSubscription
2395− liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
1767+ forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2396− liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
1768+ forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1769 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
1770 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
2399 parentHeight <- getEventSubscribedHeight subd'
1771 parentHeight <- getEventSubscribedHeight subd'
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1772 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1773 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1774 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1775+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1776+ 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
1777+ 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
1778 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1779 unsubscribe subscription
2407 mapM_ invalidateCoincidenceHeight mcs
1780 mapM_ invalidateCoincidenceHeight mcs
2408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1781 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
2409− mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
1782+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
1783 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
2411 height <- calculateSwitchHeight subscribed
1784 height <- calculateSwitchHeight subscribed
2412 updateSwitchHeight height subscribed
1785 updateSwitchHeight height subscribed
@@ -2422,12 +1795,10 @@ zeroHeight = Height 0
2422invalidHeight :: Height
1795invalidHeight :: Height
2423invalidHeight = Height (-1000)
1796invalidHeight = Height (-1000)
2426-- | An invalid height that is currently being traversed, e.g. by walkInvalidHeightParents
1798-- | An invalid height that is currently being traversed, e.g. by walkInvalidHeightParents
2427{-# INLINE invalidHeightBeingTraversed #-}
1799{-# INLINE invalidHeightBeingTraversed #-}
2428invalidHeightBeingTraversed :: Height
1800invalidHeightBeingTraversed :: Height
2429invalidHeightBeingTraversed = Height (-1001)
1801invalidHeightBeingTraversed = Height (-1001)
2432{-# INLINE succHeight #-}
1803{-# INLINE succHeight #-}
2433succHeight :: Height -> Height
1804succHeight :: Height -> Height
@@ -2436,42 +1807,149 @@ succHeight h@(Height a) =
2436 then invalidHeight
1807 then invalidHeight
2437 else Height $ succ a
1808 else Height $ succ a
1810+invalidateSubscriberHeight :: Height -> Subscriber a -> IO ()
1811+invalidateSubscriberHeight old s = case s of
1812+ SubscriberPush _ subscribed -> do
1813+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
1814+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
1815+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
1816+ SubscriberMerge _ subscribed -> do
1817+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
1818+ removeMergeHeight old subscribed
1819+ invalidateMergeHeight subscribed
1820+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
1821+ SubscriberMergeChange _ -> return () -- Doesn't affect the height of the merge, because its changes are delayed
1822+ SubscriberFan subscribed -> do
1823+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
1824+ subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1825+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
1826+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
1827+ SubscriberHold _ -> return ()
1828+ SubscriberHoldIdentity _ -> return ()
1829+ SubscriberSwitch subscribed -> do
1830+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
1831+ oldHeight <- readIORef $ switchSubscribedHeight subscribed
1832+ when (oldHeight /= invalidHeight) $ do
1833+ writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1834+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1835+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
1836+ SubscriberCoincidenceOuter subscribed -> do
1837+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
1838+ invalidateCoincidenceHeight subscribed
1839+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
1840+ SubscriberCoincidenceInner subscribed -> do
1841+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
1842+ invalidateCoincidenceHeight subscribed
1843+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
1844+ SubscriberHandle -> return ()
1846+removeMergeHeight :: Height -> MergeSubscribed k -> IO ()
1847+removeMergeHeight oldParentHeight subscribed = do
1848+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1849+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1850+ let newHeights = heightBagRemove oldParentHeight oldHeights
1851+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1853+invalidateMergeHeight :: MergeSubscribed k -> IO ()
1854+invalidateMergeHeight subscribed = do
1855+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1856+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1857+ when (oldHeight /= invalidHeight) $ do
1858+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1859+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1861+addMergeHeight :: Height -> MergeSubscribed k -> IO ()
1862+addMergeHeight newParentHeight subscribed = do
1863+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1864+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1865+ let newHeights = heightBagAdd newParentHeight oldHeights
1866+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1868+revalidateMergeHeight :: MergeSubscribed k -> IO ()
1869+revalidateMergeHeight subscribed = do
1870+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1871+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1872+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1873+ parents <- readIORef $ mergeSubscribedParents subscribed
1874+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1875+ case heightBagSize heights `compare` DMap.size parents of
1878+ let height = succHeight $ heightBagMax heights
1879+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1880+ writeIORef (mergeSubscribedHeight subscribed) $! height
1881+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1882+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
2439−invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1884+invalidateCoincidenceHeight :: CoincidenceSubscribed a -> IO ()
2440invalidateCoincidenceHeight subscribed = do
1885invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1886 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1887 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1888 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1889+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1891+recalculateSubscriberHeight :: Height -> Subscriber a -> IO ()
1892+recalculateSubscriberHeight new s = case s of
1893+ SubscriberPush _ subscribed -> do
1894+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
1895+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1896+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
1897+ SubscriberMerge _ subscribed -> do
1898+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
1899+ addMergeHeight new subscribed
1900+ revalidateMergeHeight subscribed
1901+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
1902+ SubscriberMergeChange _ -> return ()
1903+ SubscriberFan subscribed -> do
1904+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
1905+ subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1906+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
1907+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
1908+ SubscriberHold _ -> return ()
1909+ SubscriberHoldIdentity _ -> return ()
1910+ SubscriberSwitch subscribed -> do
1911+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
1912+ updateSwitchHeight new subscribed
1913+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
1914+ SubscriberCoincidenceOuter subscribed -> do
1915+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
1916+ recalculateCoincidenceHeight subscribed
1917+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
1918+ SubscriberCoincidenceInner subscribed -> do
1919+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
1920+ recalculateCoincidenceHeight subscribed
1921+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
1922+ SubscriberHandle -> return ()
2446−updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1924+updateSwitchHeight :: Height -> SwitchSubscribed a -> IO ()
2447updateSwitchHeight new subscribed = do
1925updateSwitchHeight new subscribed = do
2448 oldHeight <- readIORef $ switchSubscribedHeight subscribed
1926 oldHeight <- readIORef $ switchSubscribedHeight subscribed
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1927 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
1928 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1929 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1930+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454−recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1932+recalculateCoincidenceHeight :: CoincidenceSubscribed a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1933recalculateCoincidenceHeight subscribed = do
2456 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1934 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2457 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
2458 height <- calculateCoincidenceHeight subscribed
1936 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1937 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1938 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1939+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463−calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1941+calculateSwitchHeight :: SwitchSubscribed a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1942calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2466−calculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO Height
1944+calculateCoincidenceHeight :: CoincidenceSubscribed a -> IO Height
2467calculateCoincidenceHeight subscribed = do
1945calculateCoincidenceHeight subscribed = do
2468 outerHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
1946 outerHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
2469 innerHeight <- maybe (return zeroHeight) getEventSubscribedHeight =<< readIORef (coincidenceSubscribedInnerParent subscribed)
1947 innerHeight <- maybe (return zeroHeight) getEventSubscribedHeight =<< readIORef (coincidenceSubscribedInnerParent subscribed)
2470 return $ if outerHeight == invalidHeight || innerHeight == invalidHeight then invalidHeight else max outerHeight innerHeight
1948 return $ if outerHeight == invalidHeight || innerHeight == invalidHeight then invalidHeight else max outerHeight innerHeight
2472−data SomeSwitchSubscribed x = forall a. SomeSwitchSubscribed {-# NOUNPACK #-} (SwitchSubscribed x a)
1950+data SomeSwitchSubscribed = forall a. SomeSwitchSubscribed {-# NOUNPACK #-} (SwitchSubscribed a)
2474−invalidate :: IORef [SomeSwitchSubscribed x] -> WeakList (Invalidator x) -> IO (WeakList (Invalidator x))
1952+invalidate :: IORef [SomeSwitchSubscribed] -> WeakList Invalidator -> IO (WeakList Invalidator)
2475invalidate toReconnectRef wis = do
1953invalidate toReconnectRef wis = do
2476 forM_ wis $ \wi -> do
1954 forM_ wis $ \wi -> do
2477 mi <- deRefWeak wi
1955 mi <- deRefWeak wi
@@ -2497,329 +1975,171 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1975-- Reflex integration
2498--------------------------------------------------------------------------------
1976--------------------------------------------------------------------------------
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2504-- | The default, global Spider environment
1978-- | The default, global Spider environment
2505type Spider = SpiderTimeline Global
1979type Spider = SpiderTimeline Global
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
1981+-- | Designates the default, global Spider timeline
2508− {-# INLINABLE sample #-}
1982+data Global
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
1984+{-# NOINLINE globalSpiderTimeline #-}
2531− {-# INLINABLE sample #-}
1985+globalSpiderTimeline :: SpiderTimeline Global
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1986+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1988+-- | Stores all global data relevant to a particular Spider timeline; only one
2535− {-# INLINABLE hold #-}
1989+-- value should exist for each type @x@
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
1990+data SpiderTimeline x = SpiderTimeline
2537− {-# INLINABLE holdDyn #-}
1991+ { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription])
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
1992+ , _spiderEnv_lock :: !(MVar ())
2539− {-# INLINABLE holdIncremental #-}
1993+ , _spiderEnv_cleanups :: !(IORef [IO ()])
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
1994+#ifdef DEBUG
2541− {-# INLINABLE buildDynamic #-}
1995+ , _spiderEnv_depth :: !(IORef Int)
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
1996+#endif
2543− {-# INLINABLE headE #-}
1997+ }
2544− headE = R.slowHeadE
1998+type role SpiderTimeline nominal
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2000+instance GEq SpiderTimeline where
2001+ a `geq` b = if _spiderEnv_toUnsubscribe a == _spiderEnv_toUnsubscribe b
2002+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2005+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
2551− {-# INLINE return #-}
2006+unsafeNewSpiderTimeline = do
2552− return = pure
2007+ toUnsubscribe <- newIORef []
2553− {-# INLINE (>>=) #-}
2008+ lock <- newMVar ()
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2009+ cleanups <- newIORef []
2555− {-# INLINE (>>) #-}
2010+#ifdef DEBUG
2556− (>>) = (*>)
2011+ depthRef <- newIORef 0
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2561−
2013+ return $ SpiderTimeline
2562−{-# INLINABLE newJoinDyn #-}
2014+ { _spiderEnv_toUnsubscribe = toUnsubscribe
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2015+ , _spiderEnv_lock = lock
2564−newJoinDyn d =
2016+ , _spiderEnv_cleanups = cleanups
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2017+#ifdef DEBUG
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2018+ , _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
2020+ }
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)
2022+-- | Create a new SpiderTimeline
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2023+newSpiderTimeline :: IO (Some SpiderTimeline)
2024+newSpiderTimeline = Some.This <$> unsafeNewSpiderTimeline
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2026+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)
2028+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
2029+
2030+instance R.Reflex (SpiderTimeline x) where
2031+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior a }
2032+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event a }
2033+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic Identity a } deriving (Functor, Applicative, Monad)
2034+ newtype Incremental (SpiderTimeline x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic p a }
2035+ type PullM (SpiderTimeline x) = SpiderPullM x
2036+ type PushM (SpiderTimeline x) = SpiderPushM x
2037+ {-# INLINABLE never #-}
2038+ never = SpiderEvent EventNever
2039+ {-# INLINABLE constant #-}
2040+ constant = SpiderBehavior . BehaviorConst
2041+ {-# INLINABLE push #-}
2042+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2043+ {-# INLINABLE pull #-}
2044+ pull = SpiderBehavior . pull . coerce
2045+ {-# INLINABLE merge #-}
2046+ merge = SpiderEvent . merge . DynamicConst . (unsafeCoerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k Event)
2047+ {-# INLINABLE fan #-}
2048+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2049+ {-# INLINABLE switch #-}
2050+ switch = SpiderEvent . switch . (unsafeCoerce :: Behavior (R.Event (SpiderTimeline x) a) -> Behavior (Event a)) . unSpiderBehavior
2051+ {-# INLINABLE coincidence #-}
2052+ coincidence = SpiderEvent . coincidence . (unsafeCoerce :: Event (R.Event (SpiderTimeline x) a) -> Event (Event a)) . unSpiderEvent
2053+ {-# INLINABLE current #-}
2054+ current = SpiderBehavior . current . unSpiderDynamic
2055+ {-# INLINABLE updated #-}
2056+ updated = SpiderEvent . fmap runIdentity . updated . unSpiderDynamic
2057+ {-# INLINABLE unsafeBuildDynamic #-}
2058+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (coerce readV0) $ addIdentity $ unSpiderEvent v'
2059+ {-# INLINABLE unsafeBuildIncremental #-}
2060+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ DynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2061+ {-# INLINABLE mergeIncremental #-}
2062+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic R.PatchDMap (DMap k (R.Event (SpiderTimeline x))) -> Dynamic R.PatchDMap (DMap k Event)) . unSpiderIncremental
2063+ {-# INLINABLE currentIncremental #-}
2064+ currentIncremental = SpiderBehavior . current . unSpiderIncremental
2065+ {-# INLINABLE updatedIncremental #-}
2066+ updatedIncremental = SpiderEvent . updated . unSpiderIncremental
2067+ {-# INLINABLE incrementalToDynamic #-}
2068+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ current i) $ flip push (updated i) $ \p -> do
2069+ c <- readBehaviorUntracked $ current i
2070+ 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)
2072+instance R.MonadSample (SpiderTimeline x) (EventM x) where
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2073+ {-# INLINABLE sample #-}
2074+ sample (SpiderBehavior b) = readBehaviorUntracked b
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2076+instance R.MonadHold (SpiderTimeline x) (EventM x) where
2602 {-# INLINABLE hold #-}
2077 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2078+ hold = holdSpiderEventM
2604 {-# INLINABLE holdDyn #-}
2079 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2080+ holdDyn = holdDynSpiderEventM
2606 {-# INLINABLE holdIncremental #-}
2081 {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2082+ holdIncremental = holdIncrementalSpiderEventM
2608− {-# INLINABLE buildDynamic #-}
2083+
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2084+holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2610− {-# INLINABLE headE #-}
2085+holdSpiderEventM v0 e = fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2087+holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2088+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2090+holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderTimeline x) (p a) -> EventM x (R.Incremental (SpiderTimeline x) p a)
2091+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2093+instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
2620 {-# INLINABLE hold #-}
2094 {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2095+ hold v0 e = R.runHostFrame $ R.hold v0 e
2622 {-# INLINABLE holdDyn #-}
2096 {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2097+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2624 {-# INLINABLE holdIncremental #-}
2098 {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2099+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2626− {-# INLINABLE buildDynamic #-}
2100+
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
2101+instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2102 {-# INLINABLE sample #-}
2636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2103 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2105+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2106+ {-# INLINABLE sample #-}
2107+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2109+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2639 {-# INLINABLE sample #-}
2110 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2111+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2113+instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2643 {-# INLINABLE hold #-}
2114 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2115+ hold v0 e = R.current <$> R.holdDyn v0 e
2645 {-# INLINABLE holdDyn #-}
2116 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2117+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity e
2647 {-# INLINABLE holdIncremental #-}
2118 {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2119+ 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−--------------------------------------------------------------------------------
2121+data RootTrigger a = forall k. GCompare k => RootTrigger (SubscriberList a, IORef (DMap k Identity), k a)
2657−-- Deprecated items
2122+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
2124+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664 {-# INLINABLE subscribeEvent #-}
2125 {-# INLINABLE subscribeEvent #-}
2665 subscribeEvent e = SpiderHostFrame $ do
2126 subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2127+ 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
2128+ return $ SpiderEventHandle subscription
2676− { spiderEventHandleSubscription = subscription
2129+
2677− , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2130+instance R.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2131+ type EventTrigger (SpiderTimeline x) = RootTrigger
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2132+ type EventHandle (SpiderTimeline x) = SpiderEventHandle
2683 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2133 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2135+instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2136+ {-# INLINABLE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2137+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2138+ let EventSubscription sln subscribed = unSpiderEventHandle h
2139+ result <- readEventSubscribed subscribed
2689− touch h
2140+ touch sln
2690 return result
2141 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
2143instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2144 type Ref (EventM x) = Ref IO
2825 {-# INLINABLE newRef #-}
2145 {-# INLINABLE newRef #-}
@@ -2834,7 +2154,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2154 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2156-- | 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)
2157+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2159instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2160 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2163,20 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2163 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2164 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2165 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847 {-# INLINABLE fail #-}
2166 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2167+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2169-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2170-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2171runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2172+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2860-- | Run an action affecting a given Spider timeline; this will be guarded by a
2174-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861-- mutex for that timeline
2175-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2176+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2177+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2179+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2181instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2182 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2185,30 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2185 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2186 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2187 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2188 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2189 fail s = SpiderHostFrame $ fail s
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2191+instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2192+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2882− notReady = pure ()
2193+
2194+addIdentity :: Event a -> Event (Identity a)
2195+--addIdentity = fmap Identity
2196+addIdentity = unsafeCoerce
2198+instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2199+ {-# INLINABLE hold #-}
2200+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2201+ {-# INLINABLE holdDyn #-}
2202+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2203+ {-# INLINABLE holdIncremental #-}
2204+ 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)
2206+newEventWithTriggerIO :: forall a. (RootTrigger a -> IO (IO ())) -> IO (Event a)
2885newEventWithTriggerIO f = do
2207newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2208 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2209 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2211+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger a -> IO (IO ())) -> IO (EventSelector k)
2890newFanEventWithTriggerIO f = do
2212newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2213 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2214 subscribedRef <- newIORef DMap.empty
@@ -2895,10 +2217,48 @@ newFanEventWithTriggerIO f = do
2895 , rootSubscribed = subscribedRef
2217 , rootSubscribed = subscribedRef
2896 , rootInit = f
2218 , rootInit = f
2898− return $ EventSelector $ \k -> eventRoot k r
2220+ return $ EventSelector $ \k -> EventRoot k r
2222+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2223+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2224+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2225+ es <- newFanEventWithTriggerIO f
2226+ return $ R.EventSelector $ SpiderEvent . select es
2228+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2229+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2230+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2231+ es <- newFanEventWithTriggerIO f
2232+ return $ R.EventSelector $ SpiderEvent . select es
2234+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2235+ {-# INLINABLE subscribeEvent #-}
2236+ subscribeEvent = subscribeEventSpiderHost
2238+subscribeEventSpiderHost :: R.Event (SpiderTimeline x) a -> SpiderHost x (R.EventHandle (SpiderTimeline x) a)
2239+subscribeEventSpiderHost e = do
2240+ subscription <- runFrame $ subscribe (unSpiderEvent e) SubscriberHandle --TODO: Unsubscribe eventually (manually and/or with weak ref)
2241+ return $ SpiderEventHandle subscription
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2243newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2245+instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2246+ {-# INLINABLE sample #-}
2247+ sample = ReadPhase . R.sample
2249+instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2250+ {-# INLINABLE hold #-}
2251+ hold v0 e = ReadPhase $ R.hold v0 e
2252+ {-# INLINABLE holdDyn #-}
2253+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2254+ {-# INLINABLE holdIncremental #-}
2255+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2257+instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2258+ type ReadPhase (SpiderHost x) = ReadPhase x
2259+ fireEventsAndRead es (ReadPhase a) = run es a
2260+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2262instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2263 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2264 newRef = SpiderHost . newRef
@@ -2917,14 +2277,9 @@ instance MonadRef (SpiderHostFrame x) where
2917instance MonadAtomicRef (SpiderHostFrame x) where
2277instance MonadAtomicRef (SpiderHostFrame x) where
2918 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2278 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2920−instance PrimMonad (SpiderHostFrame x) where
2280+--------------------------------------------------------------------------------
2921− type PrimState (SpiderHostFrame x) = PrimState IO
2281+-- Deprecated items
2922− primitive = SpiderHostFrame . EventM . primitive
2282+--------------------------------------------------------------------------------
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
2284+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2929− notReadyUntil _ = return ()
2285+type SpiderEnv = SpiderTimeline
2930− notReady = return ()