@@ -9,125 +9,79 @@
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)
34+import Control.Applicative
35import Control.Concurrent
35import Control.Concurrent
36import Control.Exception
36import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
38import Control.Monad.Exception
38import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
40import Control.Monad.Primitive
40import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
41+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
42import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
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)
64−import Data.Monoid (mempty, (<>))
57+import Data.Maybe
58+import Data.Monoid ((<>))
65−import Data.Proxy
59+import Data.Some (Some)
60+import qualified Data.Some as Some
66import Data.These
61import Data.These
67import Data.Traversable
62import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
63+import Data.Word
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
71import GHC.IORef (IORef (..))
64import GHC.IORef (IORef (..))
72import GHC.Stack
65import GHC.Stack
73−import Reflex.FastWeak
74import System.IO.Unsafe
66import System.IO.Unsafe
75import System.Mem.Weak
67import System.Mem.Weak
76import Unsafe.Coerce
68import Unsafe.Coerce
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
87#ifdef DEBUG_CYCLES
70#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
71import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
72import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
73import qualified Data.List.NonEmpty as NonEmpty
74+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
75import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
76+#endif
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
103−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
78+import Data.WeakBag (WeakBag, WeakBagTicket)
104import qualified Data.WeakBag as WeakBag
79import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
106import qualified Reflex.Class as R
80import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
81+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
83+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
124−withStackOneLine :: (BS8.ByteString -> a) -> a
84+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
86debugPropagate :: Bool
@@ -136,42 +90,31 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
90debugInvalidate :: Bool
138#ifdef DEBUG
92#ifdef DEBUG
139#define DEBUG_NODEIDS
94#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
96debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
98debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
100debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
102class HasNodeId a where
160 getNodeId :: a -> Int
103 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
105+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
106 getNodeId = holdNodeId
108+instance HasNodeId (PushSubscribed x a b) where
109+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
111instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
112 getNodeId = switchSubscribedNodeId
114+instance HasNodeId (MergeSubscribed x a) where
115+ getNodeId = mergeSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
117+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
118 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
120instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +128,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
129{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
130showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
131+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
133+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
134+showSubscriberType = \case
192−
135+ SubscriberPush _ _ -> "SubscriberPush"
136+ SubscriberMerge _ _ -> "SubscriberMerge"
137+ SubscriberFan _ -> "SubscriberFan"
138+ SubscriberMergeChange _ -> "SubscriberMergeChange"
139+ SubscriberHold _ -> "SubscriberHold"
140+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
141+ SubscriberSwitch _ -> "SubscriberSwitch"
142+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
143+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
144+ SubscriberHandle -> "SubscriberHandle"
146+showEventType :: Event x a -> String
147+showEventType = \case
148+ EventRoot _ _ -> "EventRoot"
149+ EventNever -> "EventNever"
150+ EventPush _ -> "EventPush"
151+ EventMerge _ -> "EventMerge"
152+ EventFan _ _ -> "EventFan"
153+ EventSwitch _ -> "EventSwitch"
154+ EventCoincidence _ -> "EventCoincidence"
155+ EventHold _ -> "EventHold"
156+ EventDyn _ -> "EventDyn"
157+ EventHoldIdentity _ -> "EventHoldIdentity"
158+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
162debugPropagate = False
197debugInvalidateHeight = False
164debugInvalidateHeight = False
198debugInvalidate = False
166debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
168-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +170,6 @@ debugInvalidate = False
202showNodeId :: a -> String
170showNodeId :: a -> String
203showNodeId _ = ""
171showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
175#ifdef DEBUG_NODEIDS
@@ -215,237 +179,65 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
180newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
181newNodeId = 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 ()
183+{-# NOINLINE unsafeNodeId #-}
232−unsubscribe (EventSubscription u _) = u
184+unsafeNodeId :: a -> Int
185+unsafeNodeId a = unsafePerformIO $ do
234--------------------------------------------------------------------------------
190--------------------------------------------------------------------------------
236--------------------------------------------------------------------------------
192--------------------------------------------------------------------------------
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
240−{-# INLINE subscribeAndRead #-}
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
194+newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x a, 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)
196+subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x a)
414subscribe e s = fst <$> subscribeAndRead e s
197subscribe e s = fst <$> subscribeAndRead e s
416{-# INLINE wrap #-}
199{-# INLINE wrap #-}
417−wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
200+wrap :: MonadIO m => (t -> EventSubscribed x a) -> (Subscriber x a -> m (WeakBagTicket (Subscriber x a), t, Maybe a)) -> Subscriber x a -> m (EventSubscription x a, Maybe a)
418wrap tag getSpecificSubscribed sub = do
201wrap tag getSpecificSubscribed sub = do
419 (sln, subd, occ) <- getSpecificSubscribed sub
202 (sln, subd, occ) <- getSpecificSubscribed sub
420 let es = tag subd
203 let es = tag subd
421− return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
204+ return (EventSubscription (Just sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
206+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
207eventRoot !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
209eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
210+eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
212+eventPush :: Push x b a -> Event x a
213+eventPush !p = Event $ wrap eventSubscribedPush $ getPushSubscribed p
215+eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
216+eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
218+eventFan :: GCompare k => k a -> Fan x k -> Event x a
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
219eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
221+eventSwitch :: Switch x a -> Event x a
436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
222eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
224+eventCoincidence :: Coincidence x a -> Event x a
439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
225eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
441−eventHold :: Hold x p -> Event x p
227+eventHold :: a ~ p b => Hold x p b -> Event x a
442eventHold !h = Event $ subscribeHoldEvent h
228eventHold !h = Event $ subscribeHoldEvent h
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
230+eventDyn :: (a ~ p b, R.Patch p) => Dyn x p b -> Event x a
445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
231eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
233+eventHoldIdentity :: (a ~ Identity b) => Hold x Identity b -> Event x a
234+eventHoldIdentity !h = Event $ subscribeHoldEvent h
236+eventDynIdentity :: (a ~ Identity b) => Dyn x Identity b -> Event x a
237+eventDynIdentity !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
447{-# INLINE subscribeCoincidenceInner #-}
239{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
240+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x a)
449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
241subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
242 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
243 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +256,171 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
256 , subscriberRecalculateHeight :: !(Height -> IO ())
259+--TODO: Move this comment to WeakBag
260+-- These function are constructor functions that are marked NOINLINE so they are
261+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
262+-- so any weak references that are attached to the constructors will have their
263+-- finalizer run. Using the opaque constructor, does not see the
264+-- constructor application, so it behaves like an IORef and cannot be fused away.
266+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
267+-- the weak pointer to it in some cases.
269+newSubscriberPush :: (a -> ComputeM x (Maybe b)) -> PushSubscribed x a b -> IO (Subscriber x a)
270+newSubscriberPush compute subscribed = return $ Subscriber
271+ { subscriberPropagate = \a -> {-# SCC "traversePush" #-} do
272+ tracePropagate $ "SubscriberPush" <> showNodeId subscribed
273+ occ <- runComputeM $ compute a
275+ Nothing -> return () -- No need to write a Nothing back into the Ref
277+ liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
278+ scheduleClear $ pushSubscribedOccurrence subscribed
279+ propagate o $ pushSubscribedSubscribers subscribed
280+ , subscriberInvalidateHeight = \old -> do
281+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
282+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
283+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
284+ , subscriberRecalculateHeight = \new -> do
285+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
286+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
287+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
290+newSubscriberHold :: R.Patch p => Hold x p a -> IO (Subscriber x (p a))
468newSubscriberHold h = return $ Subscriber
291newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
292 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470 , subscriberInvalidateHeight = \_ -> return ()
293 , subscriberInvalidateHeight = \_ -> return ()
471 , subscriberRecalculateHeight = \_ -> return ()
294 , subscriberRecalculateHeight = \_ -> return ()
297+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
298+newSubscriberMerge k subscribed = return $ Subscriber
299+ { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
300+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
301+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
302+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
303+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
304+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
305+ when (DMap.null oldM) $ do -- Only schedule the firing once
306+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
307+ --TODO: assertions about height
308+ currentHeight <- getCurrentHeight
309+ when (height <= currentHeight) $ do
310+ if height /= invalidHeight
312+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
313+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
316+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
317+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
318+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
322+ error $ "Causality loop found" <> cycleInfo
323+ scheduleMerge height subscribed
324+ , subscriberInvalidateHeight = \old -> do
325+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
326+ removeMergeHeight old subscribed
327+ invalidateMergeHeight subscribed
328+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
329+ , subscriberRecalculateHeight = \new -> do
330+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
331+ addMergeHeight new subscribed
332+ revalidateMergeHeight subscribed
333+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
336+newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap (DMap k (Event x))))
337+newSubscriberMergeChange subscribed = return $ Subscriber
338+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
339+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
340+ defer $ SomeMergeUpdate a subscribed
341+ , subscriberInvalidateHeight = \_ -> return ()
342+ , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
345+newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
346+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
347 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
348 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
349+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
350 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
351 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
352+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
353 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
354 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
355 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
356 return ()
486 , subscriberInvalidateHeight = \old -> do
357 , subscriberInvalidateHeight = \old -> do
358+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
359 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
360+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
361+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
362 , subscriberRecalculateHeight = \new -> do
363+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
364 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
365+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
366+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
369+newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
370+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
371 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
372+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
373 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
374 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
375 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
376 , subscriberInvalidateHeight = \_ -> do
377+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
378 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
379 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
380 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
381+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
382+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
383+ , subscriberRecalculateHeight = \new -> do
384+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
385+ updateSwitchHeight new subscribed
386+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
389+newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
390+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
391 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
392+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
393 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
394+ tracePropagate $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
395 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
396+ tracePropagate $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
397+ tracePropagate $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
398 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
399 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
400 case occ of
520− Nothing ->
401+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
402 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
403 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
404+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
405+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
406 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
407 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
408 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
409 propagate o $ coincidenceSubscribedSubscribers subscribed
410+ , subscriberInvalidateHeight = \_ -> do
411+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
412+ invalidateCoincidenceHeight subscribed
413+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
414+ , subscriberRecalculateHeight = \_ -> do
415+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
416+ recalculateCoincidenceHeight subscribed
417+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
420+newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
421+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
422 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
423+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
424 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
425 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
426 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +428,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
428 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
429 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
430 propagate a $ coincidenceSubscribedSubscribers subscribed
431+ , subscriberInvalidateHeight = \_ -> do
432+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
433+ invalidateCoincidenceHeight subscribed
434+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
435+ , subscriberRecalculateHeight = \_ -> do
436+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
437+ recalculateCoincidenceHeight subscribed
438+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
441invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,45 +445,30 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
445recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
447-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
448+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
449+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
450 -- 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
451 --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
452+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
454--------------------------------------------------------------------------------
568-- EventSubscribed
455-- EventSubscribed
569--------------------------------------------------------------------------------
456--------------------------------------------------------------------------------
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
458+data EventSubscribed x a = forall b. EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
459 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581− , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
460+ , eventSubscribedRetained :: {-# NOUNPACK #-} !b
582#ifdef DEBUG_CYCLES
461#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
462+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
463 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
464 , eventSubscribedWhoCreated :: !(IO [String])
589−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
468+eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x a
590eventSubscribedRoot !r = EventSubscribed
469eventSubscribedRoot !r = EventSubscribed
591 { eventSubscribedHeightRef = zeroRef
470 { eventSubscribedHeightRef = zeroRef
592− , eventSubscribedRetained = toAny r
471+ , eventSubscribedRetained = r
593#ifdef DEBUG_CYCLES
472#ifdef DEBUG_CYCLES
594 , eventSubscribedGetParents = return []
473 , eventSubscribedGetParents = return []
595 , eventSubscribedHasOwnHeightRef = False
474 , eventSubscribedHasOwnHeightRef = False
@@ -597,99 +476,125 @@ eventSubscribedRoot !r = EventSubscribed
600−eventSubscribedNever :: EventSubscribed x
479+eventSubscribedNever :: EventSubscribed x a
601eventSubscribedNever = EventSubscribed
480eventSubscribedNever = EventSubscribed
602 { eventSubscribedHeightRef = zeroRef
481 { eventSubscribedHeightRef = zeroRef
603− , eventSubscribedRetained = toAny ()
482+ , eventSubscribedRetained = ()
604#ifdef DEBUG_CYCLES
483#ifdef DEBUG_CYCLES
605 , eventSubscribedGetParents = return []
484 , eventSubscribedGetParents = return []
606 , eventSubscribedHasOwnHeightRef = False
485 , eventSubscribedHasOwnHeightRef = False
607 , eventSubscribedWhoCreated = return ["never"]
486 , eventSubscribedWhoCreated = return ["never"]
610−eventSubscribedNow :: EventSubscribed x
489+
611−eventSubscribedNow = EventSubscribed
490+eventSubscribedPush :: PushSubscribed x b a -> EventSubscribed x a
491+eventSubscribedPush !subscribed = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
492+ { eventSubscribedHeightRef = pushSubscribedHeight subscribed
613− , eventSubscribedRetained = toAny ()
493+ , eventSubscribedRetained = subscribed
614#ifdef DEBUG_CYCLES
494#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
495+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
616 , eventSubscribedHasOwnHeightRef = False
496 , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
497+ , eventSubscribedWhoCreated = whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
501+eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x a
502+eventSubscribedMerge !subscribed = EventSubscribed
503+ { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
504+ , eventSubscribedRetained = subscribed
506+ , eventSubscribedGetParents = do
507+ ps <- readIORef $ mergeSubscribedParents subscribed
508+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
509+ , eventSubscribedHasOwnHeightRef = True
510+ , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
514+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x a
622eventSubscribedFan !subscribed = EventSubscribed
515eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
516 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624− , eventSubscribedRetained = toAny subscribed
517+ , eventSubscribedRetained = subscribed
625#ifdef DEBUG_CYCLES
518#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
519+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
520 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
521 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
632−eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
525+eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x a
633eventSubscribedSwitch !subscribed = EventSubscribed
526eventSubscribedSwitch !subscribed = EventSubscribed
634 { eventSubscribedHeightRef = switchSubscribedHeight subscribed
527 { eventSubscribedHeightRef = switchSubscribedHeight subscribed
635− , eventSubscribedRetained = toAny subscribed
528+ , eventSubscribedRetained = subscribed
636#ifdef DEBUG_CYCLES
529#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
530 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
531 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
532+ return [Some.This $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
533 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
534 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
645−eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
538+eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x a
646eventSubscribedCoincidence !subscribed = EventSubscribed
539eventSubscribedCoincidence !subscribed = EventSubscribed
647 { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
540 { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
648− , eventSubscribedRetained = toAny subscribed
541+ , eventSubscribedRetained = subscribed
649#ifdef DEBUG_CYCLES
542#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
543 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
544 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
545+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
546+ innerParents = maybeToList $ fmap Some.This innerSubscription
654 return $ outerParent : innerParents
547 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
548 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
549 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
660−getEventSubscribedHeight :: EventSubscribed x -> IO Height
553+getEventSubscribedHeight :: EventSubscribed x a -> IO Height
661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
554getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
663#ifdef DEBUG_CYCLES
556#ifdef DEBUG_CYCLES
664−whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
557+whoCreatedEventSubscribed :: EventSubscribed x a -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
558whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
560+walkInvalidHeightParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
561walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
562+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
563 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
564 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
565 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
566+ modify (Some.This s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
567 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
568+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
569 return subscribers
679{-# INLINE subscribeHoldEvent #-}
572{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
573+subscribeHoldEvent :: CanSubscribe x m => Hold x p a -> Subscriber x (p a) -> m (EventSubscription x (p a), Maybe (p a))
681subscribeHoldEvent = subscribeAndRead . holdEvent
574subscribeHoldEvent = subscribeAndRead . holdEvent
576+--------------------------------------------------------------------------------
578+--------------------------------------------------------------------------------
580+data EventSubscription x a = EventSubscription
581+ { _eventSubscription_ticket :: !(Maybe (WeakBagTicket (Subscriber x a)))
582+ , _eventSubscription_subscribed :: !(EventSubscribed x a)
585+unsubscribe :: EventSubscription x a -> IO ()
586+unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
683--------------------------------------------------------------------------------
588--------------------------------------------------------------------------------
684-- Behavior
589-- Behavior
685--------------------------------------------------------------------------------
590--------------------------------------------------------------------------------
687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
592newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
594+behaviorHold :: Hold x p a -> Behavior x a
690behaviorHold !h = Behavior $ readHoldTracked h
595behaviorHold !h = Behavior $ readHoldTracked h
692−behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
597+behaviorHoldIdentity :: Hold x Identity a -> Behavior x a
693behaviorHoldIdentity = behaviorHold
598behaviorHoldIdentity = behaviorHold
695behaviorConst :: a -> Behavior x a
600behaviorConst :: a -> Behavior x a
@@ -700,7 +605,7 @@ behaviorPull !p = Behavior $ do
700 val <- liftIO $ readIORef $ pullValue p
605 val <- liftIO $ readIORef $ pullValue p
701 case val of
606 case val of
702 Just subscribed -> do
607 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
608+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
609 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
610 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706 return $ pullSubscribedValue subscribed
611 return $ pullSubscribedValue subscribed
@@ -709,7 +614,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
614 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
615 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
616 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
617+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
618 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
619 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
620 let subscribed = PullSubscribed
@@ -719,133 +624,64 @@ behaviorPull !p = Behavior $ do
719 , pullSubscribedParents = parents
624 , pullSubscribedParents = parents
721 liftIO $ writeIORef (pullValue p) $ Just subscribed
626 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
627+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
630+behaviorDyn :: R.Patch p => Dyn x p a -> Behavior x a
726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
631behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
633+behaviorDynIdentity :: Dyn x Identity a -> Behavior x a
634+behaviorDynIdentity = behaviorDyn
728{-# INLINE readHoldTracked #-}
636{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
637+readHoldTracked :: Hold x p a -> BehaviorM x a
730readHoldTracked h = do
638readHoldTracked h = do
731 result <- liftIO $ readIORef $ holdValue h
639 result <- liftIO $ readIORef $ holdValue h
732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
640 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
641+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734− liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735 return result
642 return result
644+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
737−{-# INLINABLE readBehaviorUntracked #-}
645+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
646readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739readBehaviorUntracked b = do
647readBehaviorUntracked b = do
740 holdInits <- getDeferralQueue
648 holdInits <- getDeferralQueue
741 liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
649 liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
743−--------------------------------------------------------------------------------
745−--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
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)
766−dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
769−dynamicConst !a = Dynamic
770− { dynamicCurrent = behaviorConst a
771− , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
775−dynamicDyn !d = Dynamic
776− { dynamicCurrent = behaviorDyn d
777− , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
781−dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
651--------------------------------------------------------------------------------
784-- Combinators
652-- Combinators
785--------------------------------------------------------------------------------
653--------------------------------------------------------------------------------
655+--TODO: Figure out why certain things are not 'representational', then make them
656+--representational so we can use coerce
787--type role Hold representational
658--type role Hold representational
788−data Hold x p
659+data Hold x p a
789− = Hold { holdValue :: !(IORef (PatchTarget p))
660+ = Hold { holdValue :: !(IORef a)
790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
661 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791− , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
662+ , holdEvent :: Event x (p a) -- 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
663+ , holdParent :: !(IORef (Maybe (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
664#ifdef DEBUG_NODEIDS
794 , holdNodeId :: Int
665 , 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
669data EventEnv x
670+ = EventEnv { eventEnvSpiderEnv :: !(SpiderEnv x)
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
671+ , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
672 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
673 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
674 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
675+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
676+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
677 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
678 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
679+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
843{-# INLINE runEventM #-}
682{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
683+runEventM :: EventM x a -> EventEnv x -> IO a
845−runEventM = unEventM
684+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
686class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
687 getDeferralQueue :: m (IORef [a])
@@ -856,87 +692,81 @@ defer a = do
856 q <- getDeferralQueue
692 q <- getDeferralQueue
857 liftIO $ modifyIORef' q (a:)
693 liftIO $ modifyIORef' q (a:)
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
695+instance Defer (SomeAssignment x) (EventM x) where
860 {-# INLINE getDeferralQueue #-}
696 {-# INLINE getDeferralQueue #-}
861− getDeferralQueue = asksEventEnv eventEnvAssignments
697+ getDeferralQueue = EventM $ asks eventEnvAssignments
863−instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
699+instance Defer (SomeHoldInit x) (EventM x) where
864 {-# INLINE getDeferralQueue #-}
700 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
701+ getDeferralQueue = EventM $ asks eventEnvHoldInits
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
871instance Defer (SomeHoldInit x) (BehaviorM x) where
703instance Defer (SomeHoldInit x) (BehaviorM x) where
872 {-# INLINE getDeferralQueue #-}
704 {-# INLINE getDeferralQueue #-}
873 getDeferralQueue = BehaviorM $ asks snd
705 getDeferralQueue = BehaviorM $ asks snd
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
707+instance Defer (SomeMergeUpdate x) (EventM x) where
876 {-# INLINE getDeferralQueue #-}
708 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
709+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
711+instance Defer (SomeMergeInit x) (EventM x) where
880 {-# INLINE getDeferralQueue #-}
712 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
713+ getDeferralQueue = EventM $ asks eventEnvMergeInits
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
715+class HasCurrentHeight x m | m -> x where
884 getCurrentHeight :: m Height
716 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
717+ scheduleMerge :: Height -> MergeSubscribed x a -> m ()
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
719+instance HasCurrentHeight x (EventM x) where
888 {-# INLINE getCurrentHeight #-}
720 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
721+ getCurrentHeight = EventM $ do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
722+ heightRef <- asks eventEnvCurrentHeight
891 liftIO $ readIORef heightRef
723 liftIO $ readIORef heightRef
892 {-# INLINE scheduleMerge #-}
724 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
725+ scheduleMerge height subscribed = EventM $ do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
726+ delayedRef <- asks eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
727+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
897−class HasSpiderTimeline x where
729+class HasSpiderEnv x m | m -> x where
898− -- | Retrieve the current SpiderTimelineEnv
730+ -- | Retrieve the current SpiderEnv
899− spiderTimeline :: SpiderTimelineEnv x
731+ askSpiderEnv :: m (SpiderEnv x)
901−instance HasSpiderTimeline Global where
733+instance HasSpiderEnv x (EventM x) where
902− spiderTimeline = globalSpiderTimelineEnv
734+ {-# INLINE askSpiderEnv #-}
735+ askSpiderEnv = EventM $ asks eventEnvSpiderEnv
737+instance HasSpiderEnv x (SpiderHost x) where
738+ {-# INLINE askSpiderEnv #-}
739+ askSpiderEnv = SpiderHost ask
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
741+putCurrentHeight :: Height -> EventM x ()
905−putCurrentHeight h = do
742+putCurrentHeight h = EventM $ do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
743+ heightRef <- asks eventEnvCurrentHeight
907 liftIO $ writeIORef heightRef $! h
744 liftIO $ writeIORef heightRef $! h
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
746+instance Defer SomeClear (EventM x) where
910 {-# INLINE getDeferralQueue #-}
747 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
748+ getDeferralQueue = EventM $ asks eventEnvClears
913{-# INLINE scheduleClear #-}
750{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
751+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
752+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
754+instance Defer SomeRootClear (EventM x) where
926 {-# INLINE getDeferralQueue #-}
755 {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
756+ getDeferralQueue = EventM $ asks eventEnvRootClears
929{-# INLINE scheduleRootClear #-}
758{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
759+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
760+scheduleRootClear r = defer $ SomeRootClear r
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
762+instance Defer (SomeResetCoincidence x) (EventM x) where
934 {-# INLINE getDeferralQueue #-}
763 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
764+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
937-- Note: hold cannot examine its event until after the phase is over
766-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
767+{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> EventM x (Hold x p a) #-}
768+{-# 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)
769+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => a -> Event x (p a) -> m (Hold x p a)
940hold v0 e = do
770hold v0 e = do
941 valRef <- liftIO $ newIORef v0
771 valRef <- liftIO $ newIORef v0
942 invsRef <- liftIO $ newIORef []
772 invsRef <- liftIO $ newIORef []
@@ -957,7 +787,7 @@ hold v0 e = do
959{-# INLINE getHoldEventSubscription #-}
789{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
790+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
791getHoldEventSubscription h = do
962 ep <- liftIO $ readIORef $ holdParent h
792 ep <- liftIO $ readIORef $ holdParent h
963 case ep of
793 case ep of
@@ -971,7 +801,7 @@ getHoldEventSubscription h = do
971 Nothing -> return ()
801 Nothing -> return ()
972 Just o -> do
802 Just o -> do
973 old <- liftIO $ readIORef $ holdValue h
803 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
804+ case R.apply o old of
975 Nothing -> return ()
805 Nothing -> return ()
976 Just new -> do
806 Just new -> do
977 -- Need to evaluate these so that we don't retain the Hold itself
807 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +813,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
814type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
816+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
817-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
818+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
820instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
821 {-# INLINE (>>=) #-}
@@ -994,16 +824,14 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
824 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
825 {-# INLINE return #-}
996 return x = BehaviorM $ return x
826 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
827 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
828 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
830data BehaviorSubscribed x a
1003− = forall p. BehaviorSubscribedHold (Hold x p)
831+ = forall p. BehaviorSubscribedHold (Hold x p a)
1004 | BehaviorSubscribedPull (PullSubscribed x a)
832 | BehaviorSubscribedPull (PullSubscribed x a)
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
834+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1008--type role PullSubscribed representational
836--type role PullSubscribed representational
1009data PullSubscribed x a
837data PullSubscribed x a
@@ -1038,33 +866,55 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
869+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
870 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
871 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
872 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
875+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)
877+data SomeMergeUpdate x = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap (DMap k (Event x))) (MergeSubscribed x k)
1051−data SomeMergeUpdate x = SomeMergeUpdate
879+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 () }
881+data SomeEventSubscription x = forall a. SomeEventSubscription (EventSubscription x a)
1059-- EventM can do everything BehaviorM can, plus create holds
883-- 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)
884+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
886+data PushSubscribed x a b
887+ = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed x a b)))
888+ , 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)
889+ , pushSubscribedHeight :: !(IORef Height)
890+ , pushSubscribedSubscribers :: !(WeakBag (Subscriber x b))
891+ , pushSubscribedSelf :: !(Subscriber x a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
892+ , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed x a b)))
893+ , pushSubscribedParent :: !(EventSubscription x a)
895+ , pushSubscribedNodeId :: Int
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
899+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
901+instance Defer (SomeHoldInit x) (ComputeM x) where
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
902+ getDeferralQueue = ComputeM ask
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
903+
904+{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
905+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
906+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
909+ = 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?)
910+ , pushParent :: !(Event x a)
911+ , pushSubscribed :: !(IORef (Maybe (PushSubscribed x a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
914+data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x a) !(Subscriber x a)
916+mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x a
917+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1069data HeightBag = HeightBag
919data HeightBag = HeightBag
1070 { _heightBag_size :: {-# UNPACK #-} !Int
920 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +932,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
932heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
934heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
935+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
937heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
938heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +941,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
941 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
942 _ -> 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
944heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
945heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
946 Just ((h, _), _) -> Height h
@@ -1116,25 +958,46 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
958heightBagVerify = id
961+data MergeSubscribed x k
962+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
963+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
964+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
965+ , mergeSubscribedHeight :: !(IORef Height)
966+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
967+ , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
968+ , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap (DMap k (Event x))), EventSubscribed x (R.PatchDMap (DMap k (Event x)))))
969+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
970+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
972+ , mergeSubscribedNodeId :: Int
976+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
978+ = Merge { mergeParents :: !(Dynamic x R.PatchDMap (DMap k (Event x)))
979+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
982+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
983+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
984+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
985+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
988+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
989+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
990+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
991+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129− , fanSubscribedParent :: !(EventSubscription x)
992+ , fanSubscribedParent :: !(EventSubscription x (DMap k Identity))
1130#ifdef DEBUG_NODEIDS
993#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
994 , fanSubscribedNodeId :: Int
1135−data Fan x k v
998+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
999+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1000+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
1003data SwitchSubscribed x a
@@ -1146,7 +1009,7 @@ data SwitchSubscribed x a
1146 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
1009 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
1147 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
1010 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
1148 , switchSubscribedParent :: !(Behavior x (Event x a))
1011 , switchSubscribedParent :: !(Behavior x (Event x a))
1149− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
1012+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription x a))
1150 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
1013 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
1151#ifdef DEBUG_NODEIDS
1014#ifdef DEBUG_NODEIDS
1152 , switchSubscribedNodeId :: Int
1015 , switchSubscribedNodeId :: Int
@@ -1158,17 +1021,15 @@ data Switch x a
1158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1021 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1161−#ifdef USE_TEMPLATE_HASKELL
1162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1024{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1164data CoincidenceSubscribed x a
1025data CoincidenceSubscribed x a
1165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1026 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1027 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1167 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
1028 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
1168 , coincidenceSubscribedHeight :: !(IORef Height)
1029 , coincidenceSubscribedHeight :: !(IORef Height)
1169 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1030 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1170− , coincidenceSubscribedOuterParent :: !(EventSubscription x)
1031+ , coincidenceSubscribedOuterParent :: !(EventSubscription x (Event x a))
1171− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
1032+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x a)))
1172 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
1033 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
1173#ifdef DEBUG_NODEIDS
1034#ifdef DEBUG_NODEIDS
1174 , coincidenceSubscribedNodeId :: Int
1035 , coincidenceSubscribedNodeId :: Int
@@ -1188,111 +1049,143 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1049newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189newInvalidatorPull p = return $! InvalidatorPull p
1050newInvalidatorPull p = return $! InvalidatorPull p
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1052+data Dynamic x p a
1053+ = DynamicHold !(Hold x p a)
1054+ | p ~ Identity => DynamicHoldIdentity !(Hold x Identity a)
1056+ | DynamicDyn !(Dyn x p a)
1057+ | p ~ Identity => DynamicDynIdentity !(Dyn x Identity a)
1059+{-# INLINE current #-}
1060+current :: R.Patch p => Dynamic x p a -> Behavior x a
1062+ DynamicHold h -> behaviorHold h
1063+ DynamicHoldIdentity h -> behaviorHoldIdentity h
1064+ DynamicConst a -> behaviorConst a
1065+ DynamicDyn d -> behaviorDyn d
1066+ DynamicDynIdentity d -> behaviorDynIdentity d
1068+--TODO: If you only need updated, not current, can we avoid actually constructing the Hold?
1069+{-# INLINE updated #-}
1070+updated :: R.Patch p => Dynamic x p a -> Event x (p a)
1072+ DynamicHold h -> eventHold h
1073+ DynamicHoldIdentity h -> eventHoldIdentity h
1074+ DynamicConst _ -> eventNever
1075+ DynamicDyn d -> eventDyn d
1076+ DynamicDynIdentity d -> eventDynIdentity d
1078+newMapDyn :: (a -> b) -> Dynamic x Identity a -> Dynamic x Identity b
1079+newMapDyn f d = DynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ current d) (Identity . f . runIdentity <$> updated d)
1081+instance Functor (Dynamic x Identity) where
1084+instance Applicative (Dynamic x Identity) where
1085+ pure = DynamicConst
1086+ (<*>) = zipDynWith ($)
1090+instance R.FunctorMaybe (Event x) where
1192− mapMaybe f = push $ return . f
1091+ fmapMaybe f = push $ return . f
1194−instance HasSpiderTimeline x => Align (Event x) where
1093+instance Align (Event x) where
1195 nil = eventNever
1094 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1095+ 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
1097--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)
1098+zipDynWith :: (a -> b -> c) -> Dynamic x Identity a -> Dynamic x Identity b -> Dynamic x Identity c
1220zipDynWith f da db =
1099zipDynWith f da db =
1221− let eab = align (dynamicUpdated da) (dynamicUpdated db)
1100+ let eab = align (updated da) (updated db)
1222 ec = flip push eab $ \o -> do
1101 ec = flip push eab $ \o -> do
1223 (a, b) <- case o of
1102 (a, b) <- case o of
1224 This (Identity a) -> do
1103 This (Identity a) -> do
1225− b <- readBehaviorUntracked $ dynamicCurrent db
1104+ b <- readBehaviorUntracked $ current db
1226 return (a, b)
1105 return (a, b)
1227 That (Identity b) -> do
1106 That (Identity b) -> do
1228− a <- readBehaviorUntracked $ dynamicCurrent da
1107+ a <- readBehaviorUntracked $ current da
1229 return (a, b)
1108 return (a, b)
1230 These (Identity a) (Identity b) -> return (a, b)
1109 These (Identity a) (Identity b) -> return (a, b)
1231 return $ Just $ Identity $ f a b
1110 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1111+ in DynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (current da) <*> readBehaviorUntracked (current db)) ec
1113+instance Monad (Dynamic x Identity) where
1114+ {-# INLINE return #-}
1116+ {-# INLINE (>>=) #-}
1117+ x >>= f = DynamicDynIdentity $ newJoinDyn $ newMapDyn f x
1118+ {-# INLINE (>>) #-}
1120+ {-# INLINE fail #-}
1121+ fail _ = error "Dynamic does not support 'fail'"
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1123+newtype Dyn x p a = Dyn { unDyn :: IORef (Either (BehaviorM x a, Event x (p a)) (Hold x p a)) }
1235−buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1237− let !d = Dyn result
1238− defer $ SomeDynInit d
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1125+unsafeDyn :: BehaviorM x a -> Event x (p a) -> Dyn x p a
1242−unsafeBuildDynamic readV0 v' =
1126+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1127+ where x = (readV0, v')
1129+newJoinDyn :: Dynamic x Identity (Dynamic x Identity a) -> Dyn x Identity a
1131+ let readV0 = readBehaviorTracked . current =<< readBehaviorTracked (current d)
1132+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . current . runIdentity) $ updated d
1133+ eInner = switch $ updated <$> current d
1134+ eBoth = coincidence $ updated . runIdentity <$> updated d
1135+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1136+ in unsafeDyn readV0 v'
1245-- ResultM can read behaviors and events
1138-- ResultM can read behaviors and events
1246type ResultM = EventM
1139type ResultM = EventM
1141+{-# NOINLINE unsafeNewIORef #-}
1142+unsafeNewIORef :: a -> b -> IORef b
1143+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1248−instance HasSpiderTimeline x => Functor (Event x) where
1145+instance Functor (Event x) where
1249 fmap f = push $ return . Just . f
1146 fmap f = push $ return . Just . f
1251instance Functor (Behavior x) where
1148instance Functor (Behavior x) where
1252 fmap f = pull . fmap f . readBehaviorTracked
1149 fmap f = pull . fmap f . readBehaviorTracked
1254−{-# INLINE push #-}
1151+{-# 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
1152+push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256−push f e = cacheEvent (pushCheap f e)
1153+push f e = eventPush $ Push
1156+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1158+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1258−{-# INLINABLE pull #-}
1160+{-# NOINLINE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1161pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1265− pure $ behaviorPull $ Pull
1162+pull a = behaviorPull $ Pull
1266− { pullCompute = a
1163+ { pullCompute = a
1267− , pullValue = ref
1164+ , pullValue = unsafeNewIORef a Nothing
1268#ifdef DEBUG_NODEIDS
1165#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1166+ , pullNodeId = unsafeNodeId a
1273−{-# INLINABLE switch #-}
1170+{-# NOINLINE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1171+switch :: Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1172+switch a = eventSwitch $ Switch
1278− { switchParent = a
1173+ { switchParent = a
1279− , switchSubscribed = ref
1174+ , switchSubscribed = unsafeNewIORef a Nothing
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1177+coincidence :: Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1178+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1179+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1180+ , 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
1183-- 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
1184+run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1185run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1186+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1187+ spiderEnv <- SpiderHost ask
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1188+ result <- SpiderHost $ lift $ withMVar (_spiderEnv_lock spiderEnv) $ \_ -> flip runReaderT spiderEnv $ unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1189 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1190 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1191 occBefore <- readIORef occRef
@@ -1304,40 +1197,43 @@ run roots after = do
1304 else return Nothing
1197 else return Nothing
1305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1198 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306 propagate a subscribersRef
1199 propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
1200+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308 let go = do
1201 let go = do
1309 delayed <- liftIO $ readIORef delayedRef
1202 delayed <- liftIO $ readIORef delayedRef
1310 case IntMap.minViewWithKey delayed of
1203 case IntMap.minViewWithKey delayed of
1311 Nothing -> return ()
1204 Nothing -> return ()
1312 Just ((currentHeight, cur), future) -> do
1205 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
1206+ tracePropagate $ "Running height " ++ show currentHeight
1314 putCurrentHeight $ Height currentHeight
1207 putCurrentHeight $ Height currentHeight
1315 liftIO $ writeIORef delayedRef $! future
1208 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
1209+ forM_ cur $ \d -> case d of
1210+ DelayedMerge subscribed -> do
1211+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1212+ case height `compare` Height currentHeight of
1213+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1214+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1216+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1217+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1218+ --TODO: Assert that m is not empty
1219+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1220+ scheduleClear $ mergeSubscribedOccurrence subscribed
1221+ propagate m $ mergeSubscribedSubscribers subscribed
1319 putCurrentHeight maxBound
1224 putCurrentHeight maxBound
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
1226+ tracePropagate "Done running an event frame"
1322 return result
1227 return result
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1229+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))
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1231+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1233data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1235+data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1341debugFinalize :: Bool
1237debugFinalize :: Bool
1342debugFinalize = False
1238debugFinalize = False
@@ -1346,110 +1242,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1242 x' <- evaluate x
1347 mkWeakPtr x' $
1243 mkWeakPtr x' $
1348 if debugFinalize
1244 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1245+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1246 else Nothing
1352type WeakList a = [Weak a]
1248type 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 #-}
1250{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1252+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1253+withIncreasedDepth a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1254+ spiderEnv <- askSpiderEnv
1255+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) succ
1385 result <- a
1256 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1257+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
1387 return result
1258 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
1260+withIncreasedDepth :: m a -> m a
1261+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1264+type CanTrace x m = (HasSpiderEnv x m, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1266{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1267+tracePropagate :: (CanTrace x m) => String -> m ()
1420−tracePropagate _ _ = return ()
1268+tracePropagate = traceWhen debugPropagate
1422{-# INLINE traceInvalidate #-}
1270{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1271traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1272+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1274+{-# INLINE traceWhen #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1275+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1442−trace _ _ = return ()
1276+traceWhen b message = traceMWhen b $ return message
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1278+{-# INLINE traceMWhen #-}
1279+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1280+traceMWhen b getMessage = when b $ do
1281+ message <- getMessage
1283+ spiderEnv <- askSpiderEnv
1284+ d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
1288+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1290whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1291whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1294groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1295groupByHead = \case
1455 [] -> []
1296 [] -> []
@@ -1460,108 +1301,77 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1301 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1303listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1304+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 #-}
1307{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1308+propagateSubscriberHold :: R.Patch p => Hold x p a -> p a -> EventM x ()
1500propagateSubscriberHold h a = do
1309propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1310+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1311 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1312 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1313 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1314+ case {-# SCC "apply" #-} R.apply a v of
1507 Nothing -> return ()
1315 Nothing -> return ()
1508 Just v' -> do
1316 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1317+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1318 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1319 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1320 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
1322+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
1517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1324runBehaviorM :: 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)
1325+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1327askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1328askInvalidator = do
1522− (!m, _) <- ask
1329+ (!m, _) <- BehaviorM ask
1523 case m of
1330 case m of
1524 Nothing -> return Nothing
1331 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1332 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1334askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1335askParentsRef = do
1529− (!m, _) <- ask
1336+ (!m, _) <- BehaviorM ask
1530 case m of
1337 case m of
1531 Nothing -> return Nothing
1338 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1339 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1341askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1342askBehaviorHoldInits = do
1536− (_, !his) <- ask
1343+ (_, !his) <- BehaviorM ask
1537 return his
1344 return his
1539{-# INLINE getDynHold #-}
1346{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1347+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p a -> m (Hold x p a)
1541getDynHold d = do
1348getDynHold d = do
1542 mh <- liftIO $ readIORef $ unDyn d
1349 mh <- liftIO $ readIORef $ unDyn d
1543 case mh of
1350 case mh of
1544− HoldDyn h -> return h
1351+ Right h -> return h
1545− UnsafeDyn (readV0, v') -> do
1352+ Left (readV0, v') -> do
1546 holdInits <- getDeferralQueue
1353 holdInits <- getDeferralQueue
1547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1354 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1554 h <- hold v0 v'
1355 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1356+ liftIO $ writeIORef (unDyn d) $ Right h
1556 return h
1357 return h
1559-- Always refers to 0
1359-- Always refers to 0
1560{-# NOINLINE zeroRef #-}
1360{-# NOINLINE zeroRef #-}
1561zeroRef :: IORef Height
1361zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1362zeroRef = unsafePerformIO $ newIORef zeroHeight
1364+type CanSubscribe x m =
1366+ , HasCurrentHeight x m
1367+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1368+ , Defer SomeClear m -- Wiping out event firings
1369+ , Defer (SomeAssignment x) m -- Updating state
1370+ , 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)
1374+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a), RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1375getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1376 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1377 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1385,10 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1385 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1386 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1387 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1388+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1389 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1390 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586− let !subscribed = RootSubscribed
1391+ let subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1392 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1393 , rootSubscribedCachedSubscribed = cached
1589 , rootSubscribedOccurrence = getOcc
1394 , rootSubscribedOccurrence = getOcc
@@ -1591,120 +1396,143 @@ getRootSubscribed k r sub = do
1591 , rootSubscribedUninit = uninit
1396 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1397 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1398#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1399+ , 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)
1402+ 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
1403 modifyIORef' (rootSubscribed r) $ DMap.insertWith (error $ "getRootSubscribed: duplicate key inserted into Root") k subscribed --TODO: I think we can just write back mSubscribed rather than re-reading it
1609 occ <- getOcc
1404 occ <- getOcc
1610 return (sln, subscribed, occ)
1405 return (sln, subscribed, occ)
1612−#ifdef USE_TEMPLATE_HASKELL
1613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1407{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1408cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1409+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1617 rootSubscribedUninit self
1410 rootSubscribedUninit self
1618 modifyIORef' cached $ DMap.delete k
1411 modifyIORef' cached $ DMap.delete k
1620{-# INLINE subscribeRootSubscribed #-}
1413{-# INLINE subscribeRootSubscribed #-}
1621−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1414+subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1415subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1417+-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1625−
1418+{-# SPECIALIZE getPushSubscribed :: Push x a b -> Subscriber x b -> EventM x (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe b) #-}
1626−data FanInt x a = FanInt
1419+getPushSubscribed :: CanSubscribe x m => Push x a b -> Subscriber x b -> m (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe 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
1420+getPushSubscribed p sub = do
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1421+ mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1422+ case mSubscribed of
1423+ Just subscribed -> {-# SCC "hitPush" #-} liftIO $ do
1424+ sln <- subscribePushSubscribed subscribed sub
1425+ occ <- readIORef $ pushSubscribedOccurrence subscribed
1426+ return (sln, subscribed, occ)
1427+ Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1428+ subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1429+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1430+ s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
1431+ (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead (pushParent p) s
1432+ occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1433+ occRef <- liftIO $ newIORef occ
1434+ when (isJust occ) $ scheduleClear occRef
1435+ weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1436+ let !cached = pushSubscribed p
1437+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1438+ let subscribed = PushSubscribed
1439+ { pushSubscribedCachedSubscribed = cached
1440+ , pushSubscribedOccurrence = occRef
1441+ , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1442+ , pushSubscribedSubscribers = subs
1443+ , pushSubscribedSelf = s
1444+ , pushSubscribedWeakSelf = weakSelf
1445+ , pushSubscribedParent = subscription
1630#ifdef DEBUG_NODEIDS
1446#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1447+ , pushSubscribedNodeId = unsafeNodeId p
1450+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1451+ liftIO $ writeIORef subscribedRef $! subscribed
1452+ liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1453+ return (sln, subscribed, occ)
1635−newFanInt :: IO (FanInt x a)
1455+cleanupPushSubscribed :: PushSubscribed x a b -> IO ()
1636−newFanInt = do
1456+cleanupPushSubscribed self = do
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
1457+ unsubscribe $ pushSubscribedParent self
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1458+ writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1459+
1640−#ifdef DEBUG_NODEIDS
1460+{-# INLINE subscribePushSubscribed #-}
1641− nodeId <- newNodeId
1461+subscribePushSubscribed :: PushSubscribed x a b -> Subscriber x b -> IO (WeakBagTicket (Subscriber x b))
1642−#endif
1462+subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1643− return $ FanInt
1463+
1644− { _fanInt_subscribers = subscribers
1464+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1645− , _fanInt_subscriptionRef = subscriptionRef
1465+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, Maybe (DMap k Identity))
1646− , _fanInt_occRef = occRef
1466+getMergeSubscribed m sub = do
1467+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1468+ case mSubscribed of
1469+ Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1470+ sln <- subscribeMergeSubscribed subscribed sub
1471+ occ <- readIORef $ mergeSubscribedOccurrence subscribed
1472+ return (sln, subscribed, occ)
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), parentOcc) <- subscribeAndRead e s
1480+ height <- liftIO $ getEventSubscribedHeight parentSubd
1481+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1482+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1483+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1484+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1485+ myHeight = if invalidHeight `elem` heights
1487+ else succHeight $ heightBagMax myHeightBag
1488+ currentHeight <- getCurrentHeight
1489+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1490+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1492+ unless (DMap.null accum) $ do
1493+ scheduleMerge myHeight subscribedUnsafe
1494+ occRef <- liftIO $ newIORef occ
1495+ when (isJust occ) $ scheduleClear occRef
1496+ accumRef <- liftIO $ newIORef accum
1497+ heightRef <- liftIO $ newIORef myHeight
1498+ heightMapRef <- liftIO $ newIORef myHeightBag
1499+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1500+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1501+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1502+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1503+ let !subscribed = MergeSubscribed
1504+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1505+ , mergeSubscribedOccurrence = occRef
1506+ , mergeSubscribedAccum = accumRef
1507+ , mergeSubscribedHeight = heightRef
1508+ , mergeSubscribedHeightBag = heightMapRef
1509+ , mergeSubscribedSubscribers = subs
1510+ , mergeSubscribedChange = changeSubdRef
1511+ , mergeSubscribedParents = parentsRef
1512+ , mergeSubscribedWeakSelf = weakSelf
1647#ifdef DEBUG_NODEIDS
1513#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1514+ , mergeSubscribedNodeId = unsafeNodeId m
1517+ defer $ SomeMergeInit subscribed $ updated $ mergeParents m
1518+ liftIO $ writeIORef subscribedRef $! subscribed
1519+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1520+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1521+ return (sln, subscribed, occ)
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1523+cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1653−fanInt p = unsafePerformIO $ do
1524+cleanupMergeSubscribed subscribed = do
1654− self <- newFanInt
1525+ parents <- readIORef $ mergeSubscribedParents subscribed
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1526+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1527+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1528+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
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
1530+{-# INLINE subscribeMergeSubscribed #-}
1531+subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO (WeakBagTicket (Subscriber x (DMap k Identity)))
1532+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1706−{-# INLINABLE getFanSubscribed #-}
1534+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), FanSubscribed x k, Maybe a) #-}
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+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, Maybe a)
1708getFanSubscribed k f sub = do
1536getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1537 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1538 case mSubscribed of
@@ -1722,16 +1550,13 @@ getFanSubscribed k f sub = do
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
1551 occRef <- liftIO $ newIORef parentOcc
1724 when (isJust parentOcc) $ scheduleClear occRef
1552 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1553 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1554 { fanSubscribedCachedSubscribed = fanSubscribed f
1730 , fanSubscribedOccurrence = occRef
1555 , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1556 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1557 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1558#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1559+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1562 let !self = (k, subscribed)
@@ -1741,7 +1566,7 @@ getFanSubscribed k f sub = do
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1566 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1567 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1569+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1570cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1571 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1572 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1578,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1578 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1580{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1581+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1757subscribeFanSubscribed k subscribed sub = do
1582subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1583 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1584 case DMap.lookup k subscribers of
@@ -1765,8 +1590,8 @@ subscribeFanSubscribed k subscribed sub = do
1765 return sln
1590 return sln
1766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1591 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
1768−{-# INLINABLE getSwitchSubscribed #-}
1593+{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), SwitchSubscribed x a, Maybe a) #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1594+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, Maybe a)
1770getSwitchSubscribed s sub = do
1595getSwitchSubscribed s sub = do
1771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1596 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
1772 case mSubscribed of
1597 case mSubscribed of
@@ -1791,9 +1616,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1616 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1617 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1618 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1619 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1620 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1621 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1628,7 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1628 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1629 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1630#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1631+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1634 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1821,11 +1643,11 @@ cleanupSwitchSubscribed subscribed = do
1821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1643 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
1823{-# INLINE subscribeSwitchSubscribed #-}
1645{-# INLINE subscribeSwitchSubscribed #-}
1824−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1646+subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1647subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1649+{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a, Maybe a) #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1650+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, Maybe a)
1829getCoincidenceSubscribed c sub = do
1651getCoincidenceSubscribed c sub = do
1830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1652 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
1831 case mSubscribed of
1653 case mSubscribed of
@@ -1851,9 +1673,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1673 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1674 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1675 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1676 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1677 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1678 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1683,7 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1683 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1684 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1685#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1686+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1689 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1878,535 +1697,145 @@ cleanupCoincidenceSubscribed subscribed = do
1878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1697 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
1880{-# INLINE subscribeCoincidenceSubscribed #-}
1699{-# INLINE subscribeCoincidenceSubscribed #-}
1881−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1700+subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1701subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1703+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1704+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))
1705+merge m = eventMerge $ Merge
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1706+ { mergeParents = m
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1707+ , 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 }
1710newtype 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
1712+fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
1713+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
1714 let f = Fan
2288 { fanParent = e
1715 { fanParent = e
2289− , fanSubscribed = ref
1716+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
1718+ in EventSelector $ \k -> eventFan k f
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1720+runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1721+runHoldInits holdInitRef mergeInitRef = do
2295 holdInits <- liftIO $ readIORef holdInitRef
1722 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
2297 mergeInits <- liftIO $ readIORef mergeInitRef
1723 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1724+ unless (null holdInits && null mergeInits) $ do
2299 liftIO $ writeIORef holdInitRef []
1725 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
2301 liftIO $ writeIORef mergeInitRef []
1726 liftIO $ writeIORef mergeInitRef []
2302 mapM_ initHold holdInits
1727 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
1728+ mapM_ initMerge mergeInits
2304− mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1729+ runHoldInits holdInitRef mergeInitRef
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1731+initHold :: SomeHoldInit x -> EventM x ()
2308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
1732initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
1734+initMerge :: SomeMergeInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1735+initMerge (SomeMergeInit subscribed changed) = do
1736+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1737+ (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1738+ forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1739+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2313−newEventEnv :: IO (EventEnv x)
1741+-- | Run an event action outside of a frame
2314−newEventEnv = do
1742+runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1743+runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1744+ -- 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
1745+ pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1746+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
2315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
1747 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
2316 holdInitRef <- newIORef []
1748 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
2318 mergeUpdateRef <- newIORef []
1749 mergeUpdateRef <- newIORef []
2319 mergeInitRef <- newIORef []
1750 mergeInitRef <- newIORef []
2320 heightRef <- newIORef zeroHeight
1751 heightRef <- newIORef zeroHeight
2321 toClearRef <- newIORef []
1752 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
2323 toClearRootRef <- newIORef []
1753 toClearRootRef <- newIORef []
2324 coincidenceInfosRef <- newIORef []
1754 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
1755+ delayedRef <- liftIO $ newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1756+ 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
1757 let go = do
2347 result <- a
1758 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
1759+ 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
1760 return result
2350− result <- runEventM go
1761+ result <- runEventM go env
2351− toClear <- readIORef $ eventEnvClears env
1762+ toClear <- readIORef toClearRef
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
1763+ 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
1764+ toClearRoot <- readIORef toClearRootRef
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1765+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1766+ toAssign <- readIORef toAssignRef
2358 toReconnectRef <- newIORef []
1767 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1768+ coincidenceInfos <- readIORef coincidenceInfosRef
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
1769 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
1770 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1771+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1772 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
1773+ mergeUpdates <- readIORef mergeUpdateRef
2365− writeIORef (eventEnvMergeUpdates env) []
1774+ writeIORef mergeUpdateRef []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1775+ let updateMerge :: SomeMergeUpdate x -> IO [SomeEventSubscription x]
1776+ updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k (Event x))) m) = do
1777+ oldParents <- readIORef $ mergeSubscribedParents m
1778+ let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1779+ (mOldSubd, newPs) <- case me of
1780+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1782+ s <- liftIO $ newSubscriberMerge k m
1783+ subscription@(EventSubscription _ subd) <- subscribe e s
1784+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1785+ let newParent = MergeSubscribedParent subscription s
1786+ liftIO $ addMergeHeight newParentHeight m
1787+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1788+ forM_ mOldSubd $ \oldSubd -> do
1789+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1790+ liftIO $ removeMergeHeight oldHeight m
1791+ return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1792+ (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
1793+ writeIORef (mergeSubscribedParents m) $! newParents
1794+ return subscriptionsToKill
1795+ when debugPropagate $ putStrLn "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1796+ mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1797+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
1798 toReconnect <- readIORef toReconnectRef
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1799 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
1800 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1801 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1802+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
1803 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
1804 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
1805 wi' <- mkWeakPtrWithDebug i "wi'"
2378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
1806 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
2379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1807 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
1808+ writeIORef holdInitRef [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
1809+ 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
1810+ 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
1811 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
2384 sub <- newSubscriberSwitch subscribed
1812 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
1813+ 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)
1815 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1816+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
1817 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
1818 EventNever -> "EventNever"
2391 _ -> "something else"
1819 _ -> "something else"
2393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1821 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
2394− return oldSubscription
1822+ return $ SomeEventSubscription oldSubscription
2395− liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
1823+ forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2396− liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
1824+ forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
1825 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
1826 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
2399 parentHeight <- getEventSubscribedHeight subd'
1827 parentHeight <- getEventSubscribedHeight subd'
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
1828 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
1829 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1830 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1831+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1832+ 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
1833+ 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
1834 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
1835 unsubscribe subscription
2407 mapM_ invalidateCoincidenceHeight mcs
1836 mapM_ invalidateCoincidenceHeight mcs
2408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1837 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
2409− mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
1838+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
1839 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
2411 height <- calculateSwitchHeight subscribed
1840 height <- calculateSwitchHeight subscribed
2412 updateSwitchHeight height subscribed
1841 updateSwitchHeight height subscribed
@@ -2436,12 +1865,50 @@ succHeight h@(Height a) =
2436 then invalidHeight
1865 then invalidHeight
2437 else Height $ succ a
1866 else Height $ succ a
1868+removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1869+removeMergeHeight oldParentHeight subscribed = do
1870+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1871+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1872+ let newHeights = heightBagRemove oldParentHeight oldHeights
1873+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1875+invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1876+invalidateMergeHeight subscribed = do
1877+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1878+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1879+ when (oldHeight /= invalidHeight) $ do
1880+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1881+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1883+addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1884+addMergeHeight newParentHeight subscribed = do
1885+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1886+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1887+ let newHeights = heightBagAdd newParentHeight oldHeights
1888+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1890+revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1891+revalidateMergeHeight subscribed = do
1892+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1893+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1894+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1895+ parents <- readIORef $ mergeSubscribedParents subscribed
1896+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1897+ case heightBagSize heights `compare` DMap.size parents of
1900+ let height = succHeight $ heightBagMax heights
1901+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1902+ writeIORef (mergeSubscribedHeight subscribed) $! height
1903+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1904+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
2439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1906invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2440invalidateCoincidenceHeight subscribed = do
1907invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
1908 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
1909 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1910 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1911+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1913updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
1914updateSwitchHeight new subscribed = do
@@ -2449,7 +1916,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
1916 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
1917 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
1918 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1919+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1921recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
1922recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1925,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
1925 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
1926 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1927 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1928+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1930calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
1931calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,170 +1964,157 @@ invalidate toReconnectRef wis = do
2497-- Reflex integration
1964-- Reflex integration
2498--------------------------------------------------------------------------------
1965--------------------------------------------------------------------------------
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2504-- | The default, global Spider environment
1967-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
1968+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
1970+-- | Designates the default, global Spider timeline
2512− {-# INLINABLE hold #-}
1971+data Global
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
1973+{-# NOINLINE globalSpiderEnv #-}
2531− {-# INLINABLE sample #-}
1974+globalSpiderEnv :: SpiderEnv Global
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1975+globalSpiderEnv = unsafePerformIO unsafeNewSpiderEnv
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1977+-- | Stores all global data relevant to a particular Spider timeline; only one
2535− {-# INLINABLE hold #-}
1978+-- value should exist for each type @x@
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
1979+data SpiderEnv x = SpiderEnv
2537− {-# INLINABLE holdDyn #-}
1980+ { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription x])
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
1981+ , _spiderEnv_lock :: !(MVar ())
2539− {-# INLINABLE holdIncremental #-}
1982+ , _spiderEnv_cleanups :: !(IORef [IO ()])
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
1983+#ifdef DEBUG
2541− {-# INLINABLE buildDynamic #-}
1984+ , _spiderEnv_depth :: !(IORef Int)
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
1985+#endif
2543− {-# INLINABLE headE #-}
1986+ }
2544− headE = R.slowHeadE
1987+type role SpiderEnv nominal
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
1989+instance GEq SpiderEnv where
1990+ a `geq` b = if _spiderEnv_lock a == _spiderEnv_lock b
1991+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderEnv can't have two different 'x' arguments
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
1994+unsafeNewSpiderEnv :: forall x. IO (SpiderEnv x)
2551− {-# INLINE return #-}
1995+unsafeNewSpiderEnv = do
2552− return = pure
1996+ toUnsubscribe <- newIORef []
2553− {-# INLINE (>>=) #-}
1997+ lock <- newMVar ()
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1998+ cleanups <- newIORef []
2555− {-# INLINE (>>) #-}
1999+#ifdef DEBUG
2556− (>>) = (*>)
2000+ depthRef <- newIORef 0
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2561−
2002+ return $ SpiderEnv
2562−{-# INLINABLE newJoinDyn #-}
2003+ { _spiderEnv_toUnsubscribe = toUnsubscribe
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2004+ , _spiderEnv_lock = lock
2564−newJoinDyn d =
2005+ , _spiderEnv_cleanups = cleanups
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2006+#ifdef DEBUG
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2007+ , _spiderEnv_depth = depthRef
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581− pure = SpiderDynamic . dynamicConst
2582−#if MIN_VERSION_base(4,10,0)
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2009+ }
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2011+-- | Create a new SpiderEnv
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2012+newSpiderEnv :: IO (Some SpiderEnv)
2013+newSpiderEnv = Some.This <$> unsafeNewSpiderEnv
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2015+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2017+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
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)
2019+instance R.Reflex (SpiderEnv x) where
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2020+ newtype Behavior (SpiderEnv x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2021+ newtype Event (SpiderEnv x) a = SpiderEvent { unSpiderEvent :: Event x a }
2022+ newtype Dynamic (SpiderEnv x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x Identity a } deriving (Functor, Applicative, Monad)
2023+ newtype Incremental (SpiderEnv x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic x p a }
2024+ type PullM (SpiderEnv x) = SpiderPullM x
2025+ type PushM (SpiderEnv x) = SpiderPushM x
2026+ {-# INLINABLE never #-}
2027+ never = SpiderEvent eventNever
2028+ {-# INLINABLE constant #-}
2029+ constant = SpiderBehavior . behaviorConst
2030+ {-# INLINABLE push #-}
2031+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2032+ {-# INLINABLE pull #-}
2033+ pull = SpiderBehavior . pull . coerce
2034+ {-# INLINABLE merge #-}
2035+ merge = SpiderEvent . merge . DynamicConst . (coerce :: DMap k (R.Event (SpiderEnv x)) -> DMap k (Event x))
2036+ {-# INLINABLE fan #-}
2037+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2038+ {-# INLINABLE switch #-}
2039+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderEnv x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2040+ {-# INLINABLE coincidence #-}
2041+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderEnv x) a) -> Event x (Event x a)) . unSpiderEvent
2042+ {-# INLINABLE current #-}
2043+ current = SpiderBehavior . current . unSpiderDynamic
2044+ {-# INLINABLE updated #-}
2045+ updated = SpiderEvent . fmap runIdentity . updated . unSpiderDynamic
2046+ {-# INLINABLE unsafeBuildDynamic #-}
2047+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2048+ {-# INLINABLE unsafeBuildIncremental #-}
2049+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ DynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2050+ {-# INLINABLE mergeIncremental #-}
2051+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x R.PatchDMap (DMap k (R.Event (SpiderEnv x))) -> Dynamic x R.PatchDMap (DMap k (Event x))) . unSpiderIncremental
2052+ {-# INLINABLE currentIncremental #-}
2053+ currentIncremental = SpiderBehavior . current . unSpiderIncremental
2054+ {-# INLINABLE updatedIncremental #-}
2055+ updatedIncremental = SpiderEvent . updated . unSpiderIncremental
2056+ {-# INLINABLE incrementalToDynamic #-}
2057+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ current i) $ flip push (updated i) $ \p -> do
2058+ c <- readBehaviorUntracked $ current i
2059+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2061+instance R.MonadSample (SpiderEnv x) (EventM x) where
2062+ {-# INLINABLE sample #-}
2063+ sample (SpiderBehavior b) = readBehaviorUntracked b
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2065+instance R.MonadHold (SpiderEnv x) (EventM x) where
2602 {-# INLINABLE hold #-}
2066 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2067+ hold = holdSpiderEventM
2604 {-# INLINABLE holdDyn #-}
2068 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2069+ holdDyn = holdDynSpiderEventM
2606 {-# INLINABLE holdIncremental #-}
2070 {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2071+ holdIncremental = holdIncrementalSpiderEventM
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
2073+holdSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Behavior (SpiderEnv x) a)
2074+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2076+holdDynSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Dynamic (SpiderEnv x) a)
2077+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2079+holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderEnv x) (p a) -> EventM x (R.Incremental (SpiderEnv x) p a)
2080+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2082+instance R.MonadHold (SpiderEnv x) (SpiderHost x) where
2620 {-# INLINABLE hold #-}
2083 {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2084+ hold v0 e = R.runHostFrame $ R.hold v0 e
2622 {-# INLINABLE holdDyn #-}
2085 {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2086+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2624 {-# INLINABLE holdIncremental #-}
2087 {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2088+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2626− {-# INLINABLE buildDynamic #-}
2089+
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
2090+instance R.MonadSample (SpiderEnv x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2091 {-# INLINABLE sample #-}
2636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2092 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2094+instance R.MonadSample (SpiderEnv x) (SpiderPullM x) where
2639 {-# INLINABLE sample #-}
2095 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2096+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2098+instance R.MonadSample (SpiderEnv x) (SpiderPushM x) where
2099+ {-# INLINABLE sample #-}
2100+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2102+instance R.MonadHold (SpiderEnv x) (SpiderPushM x) where
2643 {-# INLINABLE hold #-}
2103 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2104+ hold v0 e = R.current <$> R.holdDyn v0 e
2645 {-# INLINABLE holdDyn #-}
2105 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2106+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ coerce e
2647 {-# INLINABLE holdIncremental #-}
2107 {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2108+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . DynamicHold <$> hold v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2656−--------------------------------------------------------------------------------
2110+data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2658−--------------------------------------------------------------------------------
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2112+data SpiderEventHandle x a = SpiderEventHandle
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2113+ { spiderEventHandleSubscription :: EventSubscription x a
2662−type SpiderEnv = SpiderTimeline
2114+ , spiderEventHandleValue :: IORef (Maybe a)
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2117+instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHostFrame x) where
2664 {-# INLINABLE subscribeEvent #-}
2118 {-# INLINABLE subscribeEvent #-}
2665 subscribeEvent e = SpiderHostFrame $ do
2119 subscribeEvent e = SpiderHostFrame $ do
2666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
2120 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2677,149 +2131,18 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTim
2677 , spiderEventHandleValue = val
2131 , spiderEventHandleValue = val
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2134+instance R.ReflexHost (SpiderEnv x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2135+ type EventTrigger (SpiderEnv x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2136+ type EventHandle (SpiderEnv x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2137+ type HostFrame (SpiderEnv x) = SpiderHostFrame x
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2139+instance R.MonadReadEvent (SpiderEnv x) (ReadPhase x) where
2686 {-# NOINLINE readEvent #-}
2140 {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2141+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2688 result <- readIORef $ spiderEventHandleValue h
2142 result <- readIORef $ spiderEventHandleValue h
2690 return result
2144 return result
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2708−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709− type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710− fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711− runHostFrame = runFrame . runSpiderHostFrame
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
2718− depthRef <- newIORef 0
2720− return $ STE $ SpiderTimelineEnv
2721− { _spiderTimeline_lock = lock
2722− , _spiderTimeline_eventEnv = env
2724− , _spiderTimeline_depth = depthRef
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2732−data LocalSpiderTimeline (x :: Type) s
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2744−-- | Pass a new timeline to the given function.
2745−withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746−withSpiderTimeline k = do
2747− env <- unsafeNewSpiderTimelineEnv
2748− reify env $ \s -> k $ localSpiderTimeline s env
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2752−type ComputeM = EventM
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2756−instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757− {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2762− type PullM (SpiderTimeline x) = SpiderPullM x
2763− type PushM (SpiderTimeline x) = SpiderPushM x
2764− {-# INLINABLE never #-}
2765− never = SpiderEvent eventNever
2766− {-# INLINABLE constant #-}
2767− constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
2769− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772− {-# INLINABLE pull #-}
2773− pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783− {-# INLINABLE switch #-}
2784− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785− {-# INLINABLE coincidence #-}
2786− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2787− {-# INLINABLE current #-}
2788− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789− {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2791− {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793− {-# INLINABLE unsafeBuildIncremental #-}
2794− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799− {-# INLINABLE currentIncremental #-}
2800− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801− {-# INLINABLE updatedIncremental #-}
2802− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803− {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805− c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807− eventCoercion Coercion = Coercion
2808− behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2811− {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813− {-# INLINABLE fanInt #-}
2814− fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2816−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2818−data SpiderEventHandle x a = SpiderEventHandle
2819− { spiderEventHandleSubscription :: EventSubscription x
2820− , spiderEventHandleValue :: IORef (Maybe a)
2823instance MonadRef (EventM x) where
2146instance MonadRef (EventM x) where
2824 type Ref (EventM x) = Ref IO
2147 type Ref (EventM x) = Ref IO
2825 {-# INLINABLE newRef #-}
2148 {-# INLINABLE newRef #-}
@@ -2834,7 +2157,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2157 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2159-- | 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)
2160+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2162instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2163 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2166,15 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2166 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2167 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2168 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 #-}
2169 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2170+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2172-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2173-- a mutex for that timeline
2857runSpiderHost :: SpiderHost Global a -> IO a
2174runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2175+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)
2177+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2179instance Monad (SpiderHostFrame x) where
2869 {-# INLINABLE (>>=) #-}
2180 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2183,26 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2183 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2184 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2185 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2186 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2187 fail s = SpiderHostFrame $ fail s
2189+instance R.MonadSample (SpiderEnv x) (SpiderHostFrame x) where
2190+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2192+instance R.MonadHold (SpiderEnv x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2193+ {-# INLINABLE hold #-}
2882− notReady = pure ()
2194+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2195+ {-# INLINABLE holdDyn #-}
2196+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2197+ {-# INLINABLE holdIncremental #-}
2198+ 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)
2200+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2201newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2202 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2203 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2205+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2206newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2207 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2208 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2213,41 @@ newFanEventWithTriggerIO f = do
2898 return $ EventSelector $ \k -> eventRoot k r
2214 return $ EventSelector $ \k -> eventRoot k r
2216+instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHost x) where
2217+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2218+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2219+ es <- newFanEventWithTriggerIO f
2220+ return $ R.EventSelector $ SpiderEvent . select es
2222+instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHostFrame x) where
2223+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2224+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2225+ es <- newFanEventWithTriggerIO f
2226+ return $ R.EventSelector $ SpiderEvent . select es
2228+instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHost x) where
2229+ {-# INLINABLE subscribeEvent #-}
2230+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2232newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
2234+instance R.MonadSample (SpiderEnv x) (ReadPhase x) where
2235+ {-# INLINABLE sample #-}
2236+ sample = ReadPhase . R.sample
2238+instance R.MonadHold (SpiderEnv x) (ReadPhase x) where
2239+ {-# INLINABLE hold #-}
2240+ hold v0 e = ReadPhase $ R.hold v0 e
2241+ {-# INLINABLE holdDyn #-}
2242+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2243+ {-# INLINABLE holdIncremental #-}
2244+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2246+instance R.MonadReflexHost (SpiderEnv x) (SpiderHost x) where
2247+ type ReadPhase (SpiderHost x) = ReadPhase x
2248+ fireEventsAndRead es (ReadPhase a) = run es a
2249+ runHostFrame = runFrame . runSpiderHostFrame
2902instance MonadRef (SpiderHost x) where
2251instance MonadRef (SpiderHost x) where
2903 type Ref (SpiderHost x) = Ref IO
2252 type Ref (SpiderHost x) = Ref IO
2904 newRef = SpiderHost . newRef
2253 newRef = SpiderHost . newRef
@@ -2916,15 +2265,3 @@ instance MonadRef (SpiderHostFrame x) where
2917instance MonadAtomicRef (SpiderHostFrame x) where
2266instance MonadAtomicRef (SpiderHostFrame x) where
2918 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2267 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 ()