@@ -9,7 +9,6 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiWayIf #-}
13{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RoleAnnotations #-}
13{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE ScopedTypeVariables #-}
@@ -20,7 +19,7 @@
20{-# LANGUAGE DeriveFunctor #-}
19{-# LANGUAGE DeriveFunctor #-}
21{-# LANGUAGE StandaloneDeriving #-}
20{-# LANGUAGE StandaloneDeriving #-}
22{-# LANGUAGE InstanceSigs #-}
21{-# LANGUAGE InstanceSigs #-}
23−{-# LANGUAGE RecursiveDo #-}
22+{-# LANGUAGE MultiWayIf #-}
25#ifdef USE_REFLEX_OPTIMIZER
24#ifdef USE_REFLEX_OPTIMIZER
26{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -39,15 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
39import Control.Monad.Exception
38import Control.Monad.Exception
40import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
41import Control.Monad.Primitive
40import Control.Monad.Primitive
42−--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
43import Control.Monad.Reader.Class
41import Control.Monad.Reader.Class
44import Control.Monad.IO.Class
42import Control.Monad.IO.Class
45import Control.Monad.ReaderIO
43import Control.Monad.ReaderIO
46import Control.Monad.Ref
44import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
47import Data.Align
47import Data.Align
48import Data.Coerce
48import Data.Coerce
49−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
50import qualified Data.Dependent.Map as DMap
50import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
51import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
52import qualified Data.FastMutableIntMap as FastMutableIntMap
53import qualified Data.FastMutableIntMap as FastMutableIntMap
53import Data.Foldable hiding (concat, elem, sequence_)
54import Data.Foldable hiding (concat, elem, sequence_)
@@ -64,6 +65,7 @@ import Data.Monoid (mempty, (<>))
64import Data.Proxy
65import Data.Proxy
65import Data.These
66import Data.These
66import Data.Traversable
67import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
67import Data.Witherable (Filterable, mapMaybe)
69import Data.Witherable (Filterable, mapMaybe)
68import GHC.Exts hiding (toList)
70import GHC.Exts hiding (toList)
69import GHC.IORef (IORef (..))
71import GHC.IORef (IORef (..))
@@ -73,17 +75,20 @@ import System.IO.Unsafe
73import System.Mem.Weak
75import System.Mem.Weak
74import Unsafe.Coerce
76import Unsafe.Coerce
76−#if defined(MIN_VERSION_semialign)
78+#ifdef MIN_VERSION_semialign
77#if MIN_VERSION_these(0,8,0)
79#if MIN_VERSION_these(0,8,0)
78import Data.These.Combinators (justThese)
80import Data.These.Combinators (justThese)
82+#if MIN_VERSION_semialign(1,1,0)
83+import Data.Zip (Zip (..))
82#ifdef DEBUG_CYCLES
87#ifdef DEBUG_CYCLES
83import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
84−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
91+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
87import qualified Data.List.NonEmpty as NonEmpty
92import qualified Data.List.NonEmpty as NonEmpty
88import Data.Tree (Forest, Tree (..), drawForest)
93import Data.Tree (Forest, Tree (..), drawForest)
89import Data.List (isPrefixOf)
94import Data.List (isPrefixOf)
@@ -101,14 +106,21 @@ import qualified Reflex.Class
101import qualified Reflex.Class as R
106import qualified Reflex.Class as R
102import qualified Reflex.Host.Class
107import qualified Reflex.Host.Class
103import Reflex.NotReady.Class
108import Reflex.NotReady.Class
104−import Reflex.Patch
109+import Data.Patch
105−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
107#ifdef DEBUG_TRACE_EVENTS
113#ifdef DEBUG_TRACE_EVENTS
108import qualified Data.ByteString.Char8 as BS8
114import qualified Data.ByteString.Char8 as BS8
109import System.IO (stderr)
115import System.IO (stderr)
110import Data.List (isPrefixOf)
116import Data.List (isPrefixOf)
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
123+#ifdef DEBUG_TRACE_EVENTS
112withStackOneLine :: (BS8.ByteString -> a) -> a
124withStackOneLine :: (BS8.ByteString -> a) -> a
113withStackOneLine expr = unsafePerformIO $ do
125withStackOneLine expr = unsafePerformIO $ do
114 stack <- currentCallStack
126 stack <- currentCallStack
@@ -117,15 +129,39 @@ withStackOneLine expr = unsafePerformIO $ do
132+debugPropagate :: Bool
134+debugInvalidateHeight :: Bool
136+debugInvalidate :: Bool
120#ifdef DEBUG
138#ifdef DEBUG
121#define DEBUG_NODEIDS
139#define DEBUG_NODEIDS
141+#ifdef DEBUG_TRACE_PROPAGATION
142+debugPropagate = True
144+debugPropagate = False
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
150+debugInvalidateHeight = False
153+#ifdef DEBUG_TRACE_INVALIDATION
154+debugInvalidate = True
156+debugInvalidate = False
123class HasNodeId a where
159class HasNodeId a where
124 getNodeId :: a -> Int
160 getNodeId :: a -> Int
126instance HasNodeId (CacheSubscribed x a) where
162instance HasNodeId (CacheSubscribed x a) where
127 getNodeId = _cacheSubscribed_nodeId
163 getNodeId = _cacheSubscribed_nodeId
129instance HasNodeId (FanInt x a) where
165instance HasNodeId (FanInt x a) where
130 getNodeId = _fanInt_nodeId
166 getNodeId = _fanInt_nodeId
@@ -152,16 +188,24 @@ showNodeId :: HasNodeId a => a -> String
152showNodeId = showNodeId' . getNodeId
188showNodeId = showNodeId' . getNodeId
154showNodeId' :: Int -> String
190showNodeId' :: Int -> String
155−showNodeId' = ("#"<>) . show
191+showNodeId' = ("#"<>) . show
196+debugPropagate = False
197+debugInvalidateHeight = False
198+debugInvalidate = False
160-- 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
161{-# INLINE showNodeId #-}
201{-# INLINE showNodeId #-}
162showNodeId :: a -> String
202showNodeId :: a -> String
163showNodeId _ = ""
203showNodeId _ = ""
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
167#ifdef DEBUG_NODEIDS
211#ifdef DEBUG_NODEIDS
@@ -209,11 +253,11 @@ subscribeAndRead = unEvent
209{-# INLINE [1] pushCheap #-}
253{-# INLINE [1] pushCheap #-}
210pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
211pushCheap !f e = Event $ \sub -> do
255pushCheap !f e = Event $ \sub -> do
212− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" (sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
213 { subscriberPropagate = \a -> do
257 { subscriberPropagate = \a -> do
214 mb <- f a
258 mb <- f a
215 mapM_ (subscriberPropagate sub) mb
259 mapM_ (subscriberPropagate sub) mb
217 occ' <- join <$> mapM f occ
261 occ' <- join <$> mapM f occ
218 return (subscription, occ')
262 return (subscription, occ')
@@ -249,9 +293,9 @@ headE originalE = do
249 let clearParent = liftIO $ writeIORef parent Nothing
293 let clearParent = liftIO $ writeIORef parent Nothing
250 (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
294 (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
251 when (isJust occ) clearParent
295 when (isJust occ) clearParent
252− return $ Event $ \sub ->
296+ return $ Event $ \sub ->
253 liftIO (readIORef parent) >>= \case
297 liftIO (readIORef parent) >>= \case
254− Nothing -> subscribeAndReadNever
298+ Nothing -> subscribeAndReadNever
255 Just e -> subscribeAndReadHead e sub
299 Just e -> subscribeAndReadHead e sub
257data CacheSubscribed x a
301data CacheSubscribed x a
@@ -263,7 +307,20 @@ data CacheSubscribed x a
266−
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
268-- | Construct an 'Event' whose value is guaranteed not to be recomputed
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
269-- repeatedly
326-- repeatedly
@@ -294,14 +351,17 @@ cacheEvent e =
295 subscribers <- liftIO FastWeakBag.empty
352 subscribers <- liftIO FastWeakBag.empty
296 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
297 (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
355 (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
357+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
298 { subscriberPropagate = \a -> do
359 { subscriberPropagate = \a -> do
299− -- checkCycle (_eventSubscription_subscribed parentSub)
300 liftIO $ writeIORef occRef (Just a)
360 liftIO $ writeIORef occRef (Just a)
301 scheduleClear occRef
361 scheduleClear occRef
302 propagateFast a subscribers
362 propagateFast a subscribers
303− , subscriberInvalidateHeight = FastWeakBag.traverse subscribers . invalidateSubscriberHeight
363+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
304− , subscriberRecalculateHeight = FastWeakBag.traverse subscribers . recalculateSubscriberHeight
364+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
306 when (isJust occ) $ do
366 when (isJust occ) $ do
307 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
@@ -312,20 +372,20 @@ cacheEvent e =
312 , _cacheSubscribed_occurrence = occRef
372 , _cacheSubscribed_occurrence = occRef
313#ifdef DEBUG_NODEIDS
373#ifdef DEBUG_NODEIDS
314 , _cacheSubscribed_nodeId = nodeId
374 , _cacheSubscribed_nodeId = nodeId
317 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
318 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
319 return subscribedTicket
379 return subscribedTicket
320 liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
380 liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
322−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
382+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
323 -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
383 -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
324−cacheSubscription sub mSubscribedRef subscribedTicket = do
384+cacheSubscription sub mSubscribedRef subscribedTicket = do
325 subscribed <- getFastWeakTicketValue subscribedTicket
385 subscribed <- getFastWeakTicketValue subscribedTicket
326 ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
386 ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
327 occ <- readIORef $ _cacheSubscribed_occurrence subscribed
387 occ <- readIORef $ _cacheSubscribed_occurrence subscribed
329 let parentSub = _cacheSubscribed_parent subscribed
389 let parentSub = _cacheSubscribed_parent subscribed
330 es = EventSubscription
390 es = EventSubscription
331 { _eventSubscription_unsubscribe = do
391 { _eventSubscription_unsubscribe = do
@@ -344,9 +404,9 @@ cacheSubscription sub mSubscribedRef subscribedTicket = do
344 , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
404 , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
345 , eventSubscribedHasOwnHeightRef = False
405 , eventSubscribedHasOwnHeightRef = False
346 , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
406 , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
350 return (es, occ)
410 return (es, occ)
@@ -404,16 +464,6 @@ data Subscriber x a = Subscriber
404 , subscriberRecalculateHeight :: !(Height -> IO ())
464 , subscriberRecalculateHeight :: !(Height -> IO ())
407−--TODO: Move this comment to WeakBag
408−-- These function are constructor functions that are marked NOINLINE so they are
409−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
410−-- so any weak references that are attached to the constructors will have their
411−-- finalizer run. Using the opaque constructor, does not see the
412−-- constructor application, so it behaves like an IORef and cannot be fused away.
414−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
415−-- the weak pointer to it in some cases.
417newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
418newSubscriberHold h = return $ Subscriber
468newSubscriberHold h = return $ Subscriber
419 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -435,14 +485,12 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
435 return ()
485 return ()
436 , subscriberInvalidateHeight = \old -> do
486 , subscriberInvalidateHeight = \old -> do
437 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
438− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440 , subscriberRecalculateHeight = \new -> do
489 , subscriberRecalculateHeight = \new -> do
441 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
442− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
446newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
447newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
495newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
448 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
@@ -453,7 +501,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
453 oldHeight <- readIORef $ switchSubscribedHeight subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
454 when (oldHeight /= invalidHeight) $ do
502 when (oldHeight /= invalidHeight) $ do
455 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
456− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
457 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
505 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
@@ -469,17 +517,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
469 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
470 scheduleClear $ coincidenceSubscribedInnerParent subscribed
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
471 case occ of
519 case occ of
472− Nothing ->
520+ Nothing ->
473 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
474 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
475− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
476− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
477 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
478 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
479 scheduleClear $ coincidenceSubscribedOccurrence subscribed
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
480 propagate o $ coincidenceSubscribedSubscribers subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
481 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
529 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
482− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
485newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -500,21 +548,21 @@ invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
500invalidateSubscriberHeight = flip subscriberInvalidateHeight
548invalidateSubscriberHeight = flip subscriberInvalidateHeight
502recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
550recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
503−recalculateSubscriberHeight = flip subscriberRecalculateHeight
551+recalculateSubscriberHeight = flip subscriberRecalculateHeight
505-- | Propagate everything at the current height
553-- | Propagate everything at the current height
506propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
554propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
507−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
508 -- 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
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
509 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
510− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
512-- | Propagate everything at the current height
560-- | Propagate everything at the current height
513propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
561propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
514−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
515 -- 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
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
516 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
517− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
519--------------------------------------------------------------------------------
567--------------------------------------------------------------------------------
520-- EventSubscribed
568-- EventSubscribed
@@ -559,6 +607,16 @@ eventSubscribedNever = EventSubscribed
559 , eventSubscribedWhoCreated = return ["never"]
607 , eventSubscribedWhoCreated = return ["never"]
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
563eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
564eventSubscribedFan !subscribed = EventSubscribed
622eventSubscribedFan !subscribed = EventSubscribed
@@ -936,8 +994,10 @@ instance Monad (BehaviorM x) where
936 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
937 {-# INLINE return #-}
995 {-# INLINE return #-}
938 return x = BehaviorM $ return x
996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
939 {-# INLINE fail #-}
998 {-# INLINE fail #-}
940 fail s = BehaviorM $ fail s
999 fail s = BehaviorM $ fail s
942data BehaviorSubscribed x a
1002data BehaviorSubscribed x a
943 = forall p. BehaviorSubscribedHold (Hold x p)
1003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -997,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
997newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
999-- EventM can do everything BehaviorM can, plus create holds
1059-- EventM can do everything BehaviorM can, plus create holds
1000−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1002newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -1022,7 +1082,7 @@ heightBagFromList :: [Height] -> HeightBag
1022heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1024heightBagAdd :: Height -> HeightBag -> HeightBag
1084heightBagAdd :: Height -> HeightBag -> HeightBag
1025−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1026 IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1086 IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1028heightBagRemove :: Height -> HeightBag -> HeightBag
1088heightBagRemove :: Height -> HeightBag -> HeightBag
@@ -1033,11 +1093,11 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1033 _ -> IntMap.insert h (pred old) c
1093 _ -> IntMap.insert h (pred old) c
1035heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1095heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1036−heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1096+heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1037 removed old = HeightBag (pred s) $ case old of
1097 removed old = HeightBag (pred s) $ case old of
1038 0 -> IntMap.delete h c
1098 0 -> IntMap.delete h c
1039 _ -> IntMap.insert h (pred old) c
1099 _ -> IntMap.insert h (pred old) c
1042heightBagMax :: HeightBag -> Height
1102heightBagMax :: HeightBag -> Height
1043heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
@@ -1139,7 +1199,10 @@ instance HasSpiderTimeline x => Semialign (Event x) where
1139 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1199 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1140 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1200 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1142−#if defined(MIN_VERSION_semialign)
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1143 zip x y = mapMaybe justThese $ align x y
1206 zip x y = mapMaybe justThese $ align x y
@@ -1283,7 +1346,7 @@ mkWeakPtrWithDebug x debugNote = do
1283 x' <- evaluate x
1346 x' <- evaluate x
1284 mkWeakPtr x' $
1347 mkWeakPtr x' $
1285 if debugFinalize
1348 if debugFinalize
1286− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
1287 else Nothing
1350 else Nothing
1289type WeakList a = [Weak a]
1352type WeakList a = [Weak a]
@@ -1298,21 +1361,20 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1298debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1361debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1299debugSubscriber description = return . debugSubscriber' description
1362debugSubscriber description = return . debugSubscriber' description
1302debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1364debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1303−debugSubscriber' description subscribed = Subscriber
1365+debugSubscriber' description subscribed = Subscriber
1305 subscriberPropagate = \m -> do
1367 subscriberPropagate = \m -> do
1306 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1368 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1307 subscriberPropagate subscribed m
1369 subscriberPropagate subscribed m
1308 , subscriberInvalidateHeight = \old -> do
1370 , subscriberInvalidateHeight = \old -> do
1309− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1310 subscriberInvalidateHeight subscribed old
1372 subscriberInvalidateHeight subscribed old
1311− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1312 , subscriberRecalculateHeight = \new -> do
1374 , subscriberRecalculateHeight = \new -> do
1313− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1314 subscriberRecalculateHeight subscribed new
1376 subscriberRecalculateHeight subscribed new
1315− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
@@ -1326,11 +1388,15 @@ withIncreasedDepth _ a = do
1327{-# INLINE tracePropagate #-}
1389{-# INLINE tracePropagate #-}
1328tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1329−tracePropagate p = trace p
1391+tracePropagate p = when debugPropagate . trace p
1331{-# INLINE traceInvalidate #-}
1393{-# INLINE traceInvalidate #-}
1332traceInvalidate :: String -> IO ()
1394traceInvalidate :: String -> IO ()
1333−traceInvalidate = liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1335{-# INLINE trace #-}
1401{-# INLINE trace #-}
1336trace :: (CanTrace x m) => proxy x -> String -> m ()
1402trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1341,7 +1407,7 @@ traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1341traceM _ getMessage = do
1407traceM _ getMessage = do
1342 message <- getMessage
1408 message <- getMessage
1343 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1409 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1344− liftIO $ putStrLn $ replicate d ' ' <> message
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
@@ -1357,10 +1423,20 @@ tracePropagate _ _ = return ()
1357traceInvalidate :: String -> IO ()
1423traceInvalidate :: String -> IO ()
1358traceInvalidate _ = return ()
1424traceInvalidate _ = return ()
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1360{-# INLINE debugSubscriber #-}
1430{-# INLINE debugSubscriber #-}
1361debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1431debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1362debugSubscriber _ = return
1432debugSubscriber _ = return
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1364{-# INLINE trace #-}
1440{-# INLINE trace #-}
1365trace :: (CanTrace x m) => proxy x -> String -> m ()
1441trace :: (CanTrace x m) => proxy x -> String -> m ()
1366trace _ _ = return ()
1442trace _ _ = return ()
@@ -1391,17 +1467,20 @@ showStacks :: [[String]] -> String
1391showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1467showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1393filterStack :: String -> [String] -> [String]
1469filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1394filterStack prefix = filter (not . (prefix `isPrefixOf`))
1471filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473+filterStack prefix = id
1397#ifdef DEBUG_CYCLES
1476#ifdef DEBUG_CYCLES
1399−data EventLoopException = EventLoopException [[String]]
1478+data EventLoopException = EventLoopException [[String]]
1400instance Exception EventLoopException
1479instance Exception EventLoopException
1402instance Show EventLoopException where
1481instance Show EventLoopException where
1403− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1404− then "no location information, compile with profiling enabled for stack tree"
1483+ then "no location information, compile with profiling enabled for stack tree"
1405 else showStacks stacks
1484 else showStacks stacks
@@ -1419,7 +1498,7 @@ instance Show EventLoopException where
1419{-# INLINE propagateSubscriberHold #-}
1498{-# INLINE propagateSubscriberHold #-}
1420propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1421propagateSubscriberHold h a = do
1500propagateSubscriberHold h a = do
1422− traceM (Proxy :: Proxy x) $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1423 invalidators <- liftIO $ readIORef $ holdInvalidators h
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1424 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
@@ -1427,7 +1506,7 @@ propagateSubscriberHold h a = do
1427 case {-# SCC "apply" #-} apply a v of
1506 case {-# SCC "apply" #-} apply a v of
1428 Nothing -> return ()
1507 Nothing -> return ()
1429 Just v' -> do
1508 Just v' -> do
1430− withIncreasedDepth (Proxy :: Proxy x) $
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1431 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1510 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1432 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1433 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1548,7 +1627,7 @@ data FanInt x a = FanInt
1548 { _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
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
1549 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1550 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1551−#ifdef DEBUG_NODEIDS
1630+#ifdef DEBUG_NODEIDS
1552 , _fanInt_nodeId :: {-# UNPACK #-} !Int
1631 , _fanInt_nodeId :: {-# UNPACK #-} !Int
@@ -1558,15 +1637,15 @@ newFanInt = do
1558 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
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
1559 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1560 occRef <- newIORef $ error "fanInt: no occurrence"
1639 occRef <- newIORef $ error "fanInt: no occurrence"
1561−#ifdef DEBUG_NODEIDS
1640+#ifdef DEBUG_NODEIDS
1562 nodeId <- newNodeId
1641 nodeId <- newNodeId
1564 return $ FanInt
1643 return $ FanInt
1565 { _fanInt_subscribers = subscribers
1644 { _fanInt_subscribers = subscribers
1566 , _fanInt_subscriptionRef = subscriptionRef
1645 , _fanInt_subscriptionRef = subscriptionRef
1567 , _fanInt_occRef = occRef
1646 , _fanInt_occRef = occRef
1568−#ifdef DEBUG_NODEIDS
1647+#ifdef DEBUG_NODEIDS
1569− , _fanInt_nodeId = nodeId
1648+ , _fanInt_nodeId = nodeId
@@ -1582,15 +1661,15 @@ fanInt p = unsafePerformIO $ do
1582 liftIO $ writeIORef (_fanInt_occRef self) m
1661 liftIO $ writeIORef (_fanInt_occRef self) m
1583 scheduleIntClear $ _fanInt_occRef self
1662 scheduleIntClear $ _fanInt_occRef self
1584 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1663 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1585− FastWeakBag.traverse b $ \s ->
1664+ FastWeakBag.traverse_ b $ \s ->
1586 subscriberPropagate s v
1665 subscriberPropagate s v
1587− , subscriberInvalidateHeight = \old ->
1666+ , subscriberInvalidateHeight = \old ->
1588− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1589− FastWeakBag.traverse b $ \s ->
1668+ FastWeakBag.traverse_ b $ \s ->
1590 subscriberInvalidateHeight s old
1669 subscriberInvalidateHeight s old
1591 , subscriberRecalculateHeight = \new ->
1670 , subscriberRecalculateHeight = \new ->
1592− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1593− FastWeakBag.traverse b $ \s ->
1672+ FastWeakBag.traverse_ b $ \s ->
1594 subscriberRecalculateHeight s new
1673 subscriberRecalculateHeight s new
1596 liftIO $ do
1675 liftIO $ do
@@ -1606,14 +1685,14 @@ fanInt p = unsafePerformIO $ do
1606 Just b -> return b
1685 Just b -> return b
1607 ticket <- liftIO $ FastWeakBag.insert sub b
1686 ticket <- liftIO $ FastWeakBag.insert sub b
1608 currentOcc <- readIORef (_fanInt_occRef self)
1687 currentOcc <- readIORef (_fanInt_occRef self)
1610 subscribed <- fanIntSubscribed ticket self
1689 subscribed <- fanIntSubscribed ticket self
1611 return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1690 return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1613fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1692fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1614−fanIntSubscribed ticket self = do
1693+fanIntSubscribed ticket self = do
1615 subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1694 subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1616− return $ EventSubscribed
1695+ return $ EventSubscribed
1617 { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1696 { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1618 , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1697 , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1619#ifdef DEBUG_CYCLES
1698#ifdef DEBUG_CYCLES
@@ -1622,7 +1701,7 @@ fanIntSubscribed ticket self = do
1622 , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1701 , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1627{-# INLINABLE getFanSubscribed #-}
1706{-# INLINABLE getFanSubscribed #-}
1628getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1835,7 +1914,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
1835 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1836 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1837 forM_ mOldSubd $ \oldSubd -> do
1916 forM_ mOldSubd $ \oldSubd -> do
1838− oldHeight <- liftIO $ getEventSubscribedHeight $
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1839 _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1918 _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1841 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
@@ -1881,7 +1960,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1881 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1882 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1883 Nothing -> do
1962 Nothing -> do
1884− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1885 _mergeSubscribedParentWithMove_subscription parent
1964 _mergeSubscribedParentWithMove_subscription parent
1887 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
@@ -1889,7 +1968,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1889 Just toKey -> do
1968 Just toKey -> do
1890 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1891 return Nothing
1970 return Nothing
1892− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1893 DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1972 DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1895 return (toDelete, applyAlways p' oldParents)
1974 return (toDelete, applyAlways p' oldParents)
@@ -1942,16 +2021,16 @@ invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
1942invalidateMergeHeight' heightRef sub = do
2021invalidateMergeHeight' heightRef sub = do
1943 oldHeight <- readIORef heightRef
2022 oldHeight <- readIORef heightRef
1944 -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2023 -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1945− when (oldHeight /= invalidHeight) $ do
2024+ when (oldHeight /= invalidHeight) $ do
1946 writeIORef heightRef $! invalidHeight
2025 writeIORef heightRef $! invalidHeight
1947 subscriberInvalidateHeight sub oldHeight
2026 subscriberInvalidateHeight sub oldHeight
1949revalidateMergeHeight :: Merge x k v s -> IO ()
2028revalidateMergeHeight :: Merge x k v s -> IO ()
1950revalidateMergeHeight m = do
2029revalidateMergeHeight m = do
1951 currentHeight <- readIORef $ _merge_heightRef m
2030 currentHeight <- readIORef $ _merge_heightRef m
1953 -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2032 -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1954− when (currentHeight == invalidHeight) $ do
2033+ when (currentHeight == invalidHeight) $ do
1955 heights <- readIORef $ _merge_heightBagRef m
2034 heights <- readIORef $ _merge_heightBagRef m
1956 parents <- readIORef $ _merge_parentsRef m
2035 parents <- readIORef $ _merge_parentsRef m
1957 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1959,7 +2038,7 @@ revalidateMergeHeight m = do
1959 LT -> return ()
2038 LT -> return ()
1960 EQ -> do
2039 EQ -> do
1961 let height = succHeight $ heightBagMax heights
2040 let height = succHeight $ heightBagMax heights
1962− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1963 writeIORef (_merge_heightRef m) $! height
2042 writeIORef (_merge_heightRef m) $! height
1964 subscriberRecalculateHeight (_merge_sub m) height
2043 subscriberRecalculateHeight (_merge_sub m) height
1965 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1967,22 +2046,22 @@ revalidateMergeHeight m = do
1967scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1968scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
1969 vals <- liftIO $ readIORef $ _merge_accumRef m
2048 vals <- liftIO $ readIORef $ _merge_accumRef m
1970− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
1971 -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2050 -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
1972− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
1973 --TODO: Assert that m is not empty
2052 --TODO: Assert that m is not empty
1974 subscriberPropagate (_merge_sub m) vals
2053 subscriberPropagate (_merge_sub m) vals
1976checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2055checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
1977checkCycle subscribed = liftIO $ do
2056checkCycle subscribed = liftIO $ do
1978 height <- readIORef (eventSubscribedHeightRef subscribed)
2057 height <- readIORef (eventSubscribedHeightRef subscribed)
1980 -- currentHeight <- getCurrentHeight
2059 -- currentHeight <- getCurrentHeight
1981 -- when (height <= currentHeight) $ if height /= invalidHeight
2060 -- when (height <= currentHeight) $ if height /= invalidHeight
1982 -- then do
2061 -- then do
1983 -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2062 -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
1984 -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2063 -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1985− -- else liftIO $
2064+ -- else liftIO $
1986 when (height == invalidHeight) $
2065 when (height == invalidHeight) $
1987#ifdef DEBUG_CYCLES
2066#ifdef DEBUG_CYCLES
@@ -2035,17 +2114,17 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
2035 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2036 changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2115 changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2038− let subscribed = EventSubscribed
2117+ let subscribed = EventSubscribed
2039− { eventSubscribedHeightRef = heightRef
2118+ { eventSubscribedHeightRef = heightRef
2040 , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2119 , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2041#ifdef DEBUG_CYCLES
2120#ifdef DEBUG_CYCLES
2042 , eventSubscribedGetParents = do
2121 , eventSubscribedGetParents = do
2043 let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2122 let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2044− fmap getParent' . DMap.toList <$> readIORef parentsRef
2123+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2045 , eventSubscribedHasOwnHeightRef = False
2124 , eventSubscribedHasOwnHeightRef = False
2046 , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2125 , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2050 m = Merge
2129 m = Merge
2051 { _merge_parentsRef = parentsRef
2130 { _merge_parentsRef = parentsRef
@@ -2083,9 +2162,9 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
2083 -- its subscription.
2162 -- its subscription.
2084 liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2163 liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2085 let unsubscribeAll = destroy =<< readIORef parentsRef
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
2087 return (EventSubscription unsubscribeAll subscribed, occ)
2166 return (EventSubscription unsubscribeAll subscribed, occ)
2090mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2091mergeInt = cacheEvent . mergeIntCheap
2170mergeInt = cacheEvent . mergeIntCheap
@@ -2099,14 +2178,14 @@ mergeIntCheap d = Event $ \sub -> do
2099 heightBagRef <- liftIO $ newIORef heightBagEmpty
2178 heightBagRef <- liftIO $ newIORef heightBagEmpty
2100 parents <- liftIO $ FastMutableIntMap.newEmpty
2179 parents <- liftIO $ FastMutableIntMap.newEmpty
2101 changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2180 changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2102− let subscribed = EventSubscribed
2181+ let subscribed = EventSubscribed
2103− { eventSubscribedHeightRef = heightRef
2182+ { eventSubscribedHeightRef = heightRef
2104 , eventSubscribedRetained = toAny (parents, changeSubdRef)
2183 , eventSubscribedRetained = toAny (parents, changeSubdRef)
2105#ifdef DEBUG_CYCLES
2184#ifdef DEBUG_CYCLES
2106 , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2185 , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2107 , eventSubscribedHasOwnHeightRef = False
2186 , eventSubscribedHasOwnHeightRef = False
2108 , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2187 , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2111 let scheduleSelf = do
2190 let scheduleSelf = do
2112 height <- liftIO $ readIORef $ heightRef
2191 height <- liftIO $ readIORef $ heightRef
@@ -2123,7 +2202,7 @@ mergeIntCheap d = Event $ \sub -> do
2123 LT -> return ()
2202 LT -> return ()
2124 EQ -> do
2203 EQ -> do
2125 let height = succHeight $ heightBagMax heights
2204 let height = succHeight $ heightBagMax heights
2126− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2127 writeIORef heightRef $! height
2206 writeIORef heightRef $! height
2128 subscriberRecalculateHeight sub height
2207 subscriberRecalculateHeight sub height
2129 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
@@ -2195,7 +2274,7 @@ mergeIntCheap d = Event $ \sub -> do
2195 -- its subscription.
2274 -- its subscription.
2196 liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2275 liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2197 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2200 return (EventSubscription unsubscribeAll subscribed, occ)
2279 return (EventSubscription unsubscribeAll subscribed, occ)
@@ -2306,7 +2385,7 @@ runFrame a = SpiderHost $ do
2306 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
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
2308 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2309− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2310 EventRoot _ -> "EventRoot"
2389 EventRoot _ -> "EventRoot"
2311 EventNever -> "EventNever"
2390 EventNever -> "EventNever"
2312 _ -> "something else"
2391 _ -> "something else"
@@ -2321,7 +2400,7 @@ runFrame a = SpiderHost $ do
2321 myHeight <- readIORef $ switchSubscribedHeight subscribed
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
2322 when (parentHeight /= myHeight) $ do
2401 when (parentHeight /= myHeight) $ do
2323 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2324− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2325 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
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
2326 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2327 unsubscribe subscription
2406 unsubscribe subscription
@@ -2362,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
2362 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2363 when (oldHeight /= invalidHeight) $ do
2442 when (oldHeight /= invalidHeight) $ do
2364 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2365− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2367updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2368updateSwitchHeight new subscribed = do
2447updateSwitchHeight new subscribed = do
@@ -2370,7 +2449,7 @@ updateSwitchHeight new subscribed = do
2370 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
2371 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
2372 writeIORef (switchSubscribedHeight subscribed) $! new
2451 writeIORef (switchSubscribedHeight subscribed) $! new
2373− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2375recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2376recalculateCoincidenceHeight subscribed = do
2455recalculateCoincidenceHeight subscribed = do
@@ -2379,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
2379 height <- calculateCoincidenceHeight subscribed
2458 height <- calculateCoincidenceHeight subscribed
2380 when (height /= invalidHeight) $ do
2459 when (height /= invalidHeight) $ do
2381 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2382− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2384calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2385calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2441,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2441 {-# INLINABLE headE #-}
2520 {-# INLINABLE headE #-}
2442 headE = R.slowHeadE
2521 headE = R.slowHeadE
2443-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2445instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2446 {-# INLINABLE sample #-}
2527 {-# INLINABLE sample #-}
@@ -2462,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2462 {-# INLINABLE headE #-}
2543 {-# INLINABLE headE #-}
2463 headE = R.slowHeadE
2544 headE = R.slowHeadE
2464-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2466instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2467 {-# INLINE return #-}
2551 {-# INLINE return #-}
@@ -2470,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2470 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2471 {-# INLINE (>>) #-}
2555 {-# INLINE (>>) #-}
2472 (>>) = (*>)
2556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2473 {-# INLINE fail #-}
2558 {-# INLINE fail #-}
2474 fail _ = error "Dynamic does not support 'fail'"
2559 fail _ = error "Dynamic does not support 'fail'"
2476{-# INLINABLE newJoinDyn #-}
2562{-# INLINABLE newJoinDyn #-}
2477newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2523,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2523 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2524 {-# INLINABLE headE #-}
2610 {-# INLINABLE headE #-}
2525 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2527instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2528 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2539,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2539 {-# INLINABLE headE #-}
2628 {-# INLINABLE headE #-}
2540 headE = R.slowHeadE
2629 headE = R.slowHeadE
2541-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2543instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2544 {-# INLINABLE sample #-}
2635 {-# INLINABLE sample #-}
@@ -2559,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2559 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2560 {-# INLINABLE headE #-}
2651 {-# INLINABLE headE #-}
2561 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2563--------------------------------------------------------------------------------
2656--------------------------------------------------------------------------------
2564-- Deprecated items
2657-- Deprecated items
@@ -2682,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2682 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2683 {-# INLINABLE mergeG #-}
2776 {-# INLINABLE mergeG #-}
2685− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2686 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2687 -> DMap k q
2780 -> DMap k q
2688 -> R.Event (SpiderTimeline x) (DMap k v)
2781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2750,8 +2843,14 @@ instance Monad (SpiderHost x) where
2750 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2751 {-# INLINABLE return #-}
2844 {-# INLINABLE return #-}
2752 return x = SpiderHost $ return x
2845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
2847+ {-# INLINABLE fail #-}
2848+ fail = MonadFail.fail
2851+instance MonadFail (SpiderHost x) where
2753 {-# INLINABLE fail #-}
2852 {-# INLINABLE fail #-}
2754− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
2756-- | 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
2757-- a mutex for that timeline
2856-- a mutex for that timeline
@@ -2773,8 +2872,10 @@ instance Monad (SpiderHostFrame x) where
2773 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2774 {-# INLINABLE return #-}
2873 {-# INLINABLE return #-}
2775 return x = SpiderHostFrame $ return x
2874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
2776 {-# INLINABLE fail #-}
2876 {-# INLINABLE fail #-}
2777 fail s = SpiderHostFrame $ fail s
2877 fail s = SpiderHostFrame $ fail s
2779instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2780 notReadyUntil _ = pure ()
2881 notReadyUntil _ = pure ()
@@ -2819,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2819instance PrimMonad (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2820 type PrimState (SpiderHostFrame x) = PrimState IO
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2821 primitive = SpiderHostFrame . EventM . primitive
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 ()