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