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