@@ -9,6 +9,7 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
12{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE ScopedTypeVariables #-}
15{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,7 +20,6 @@
19{-# LANGUAGE DeriveFunctor #-}
20{-# LANGUAGE DeriveFunctor #-}
20{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE InstanceSigs #-}
22{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
24#ifdef USE_REFLEX_OPTIMIZER
24#ifdef USE_REFLEX_OPTIMIZER
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +38,15 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
38import Control.Monad.Exception
38import Control.Monad.Exception
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
40import Control.Monad.Primitive
40import Control.Monad.Primitive
41+--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
41import Control.Monad.Reader.Class
42import Control.Monad.Reader.Class
42import Control.Monad.IO.Class
43import Control.Monad.IO.Class
43import Control.Monad.ReaderIO
44import Control.Monad.ReaderIO
44import Control.Monad.Ref
45import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
46import Data.Align
48import Data.Coerce
47import Data.Coerce
49−import Data.Dependent.Map (DMap)
48+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
49import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
50import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53import qualified Data.FastMutableIntMap as FastMutableIntMap
51import qualified Data.FastMutableIntMap as FastMutableIntMap
54import Data.Foldable hiding (concat, elem, sequence_)
52import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +59,12 @@ import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
59import Data.IORef
62import Data.Kind (Type)
60import Data.Kind (Type)
63import Data.Maybe hiding (mapMaybe)
61import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
62+import Data.Monoid ((<>))
65import Data.Proxy
63import Data.Proxy
66import Data.These
64import Data.These
67import Data.Traversable
65import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69import Data.Witherable (Filterable, mapMaybe)
66import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
67+import GHC.Exts
71import GHC.IORef (IORef (..))
68import GHC.IORef (IORef (..))
72import GHC.Stack
69import GHC.Stack
73import Reflex.FastWeak
70import Reflex.FastWeak
@@ -86,16 +83,14 @@ import Data.Zip (Zip (..))
87#ifdef DEBUG_CYCLES
84#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
85import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
86import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
87import qualified Data.List.NonEmpty as NonEmpty
88+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
89import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
90+#endif
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
92+import Data.FastWeakBag (FastWeakBag)
97import qualified Data.FastWeakBag as FastWeakBag
93import qualified Data.FastWeakBag as FastWeakBag
99import Data.Reflection
94import Data.Reflection
100import Data.Some (Some(Some))
95import Data.Some (Some(Some))
101import Data.Type.Coercion
96import Data.Type.Coercion
@@ -106,26 +101,20 @@ import qualified Reflex.Class
106import qualified Reflex.Class as R
101import qualified Reflex.Class as R
107import qualified Reflex.Host.Class
102import qualified Reflex.Host.Class
108import Reflex.NotReady.Class
103import Reflex.NotReady.Class
109−import Data.Patch
104+import Reflex.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
105+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
113#ifdef DEBUG_TRACE_EVENTS
107#ifdef DEBUG_TRACE_EVENTS
114import qualified Data.ByteString.Char8 as BS8
108import qualified Data.ByteString.Char8 as BS8
115import System.IO (stderr)
109import System.IO (stderr)
116−import Data.List (isPrefixOf)
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
123#ifdef DEBUG_TRACE_EVENTS
112#ifdef DEBUG_TRACE_EVENTS
124withStackOneLine :: (BS8.ByteString -> a) -> a
114withStackOneLine :: (BS8.ByteString -> a) -> a
125withStackOneLine expr = unsafePerformIO $ do
115withStackOneLine expr = unsafePerformIO $ do
126 stack <- currentCallStack
116 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
117+ return (expr (BS8.pack (unwords (reverse stack))))
128− where dropInternal = filterStack "Reflex.Spider.Internal"
@@ -136,42 +125,28 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
125debugInvalidate :: Bool
138#ifdef DEBUG
127#ifdef DEBUG
139#define DEBUG_NODEIDS
129#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
131debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
133debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
135debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
137class HasNodeId a where
160 getNodeId :: a -> Int
138 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
140+instance HasNodeId (Hold x p a) where
163− getNodeId = _cacheSubscribed_nodeId
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
168−instance HasNodeId (Hold x p) where
169 getNodeId = holdNodeId
141 getNodeId = holdNodeId
143+instance HasNodeId (PushSubscribed x a b) where
144+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
146instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
147 getNodeId = switchSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
149+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
150 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
152instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +160,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
161{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
162showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
163+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
165+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
166+showSubscriberType = \case
192−
167+ SubscriberPush _ _ -> "SubscriberPush"
168+ SubscriberMerge _ _ -> "SubscriberMerge"
169+ SubscriberFan _ -> "SubscriberFan"
170+ SubscriberMergeChange _ -> "SubscriberMergeChange"
171+ SubscriberHold _ -> "SubscriberHold"
172+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
173+ SubscriberSwitch _ -> "SubscriberSwitch"
174+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
175+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
176+ SubscriberHandle -> "SubscriberHandle"
178+showEventType :: Event x a -> String
179+showEventType = \case
180+ EventRoot _ _ -> "EventRoot"
181+ EventNever -> "EventNever"
182+ EventPush _ -> "EventPush"
183+ EventMerge _ -> "EventMerge"
184+ EventFan _ _ -> "EventFan"
185+ EventSwitch _ -> "EventSwitch"
186+ EventCoincidence _ -> "EventCoincidence"
187+ EventHold _ -> "EventHold"
188+ EventDyn _ -> "EventDyn"
189+ EventHoldIdentity _ -> "EventHoldIdentity"
190+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
194debugPropagate = False
197debugInvalidateHeight = False
196debugInvalidateHeight = False
198debugInvalidate = False
198debugInvalidate = False
200-- 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
@@ -202,10 +202,6 @@ debugInvalidate = False
202showNodeId :: a -> String
202showNodeId :: a -> String
203showNodeId _ = ""
203showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
207#ifdef DEBUG_NODEIDS
@@ -251,9 +247,9 @@ subscribeAndRead = unEvent
251-- caching; if the computation function is very cheap, this is (much) more
247-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
248-- efficient than 'push'
253{-# INLINE [1] pushCheap #-}
249{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
250+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255pushCheap !f e = Event $ \sub -> do
251pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
252+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
253 { subscriberPropagate = \a -> do
258 mb <- f a
254 mb <- f a
259 mapM_ (subscriberPropagate sub) mb
255 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +268,10 @@ terminalSubscriber p = Subscriber
273-- | Subscribe to an Event only for the duration of one occurrence
269-- | Subscribe to an Event only for the duration of one occurrence
274{-# INLINE subscribeAndReadHead #-}
270{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
271+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276subscribeAndReadHead e sub = do
272subscribeAndReadHead e sub = do
277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
273 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
274+ (subscription, occ) <- subscribeAndRead e $ sub
279 { subscriberPropagate = \a -> do
275 { subscriberPropagate = \a -> do
280 liftIO $ unsubscribe =<< readIORef subscriptionRef
276 liftIO $ unsubscribe =<< readIORef subscriptionRef
281 subscriberPropagate sub a
277 subscriberPropagate sub a
@@ -286,42 +282,24 @@ subscribeAndReadHead e sub = do
286 return (subscription, occ)
282 return (subscription, occ)
288--TODO: Make this lazy in its input event
284--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)
285+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290headE originalE = do
286headE originalE = do
291 parent <- liftIO $ newIORef $ Just originalE
287 parent <- liftIO $ newIORef $ Just originalE
292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
288 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293 let clearParent = liftIO $ writeIORef parent Nothing
289 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
290+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295 when (isJust occ) clearParent
291 when (isJust occ) clearParent
296− return $ Event $ \sub ->
292+ return $ Event $ \sub -> do
297 liftIO (readIORef parent) >>= \case
293 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
294+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299 Just e -> subscribeAndReadHead e sub
295 Just e -> subscribeAndReadHead e sub
301data CacheSubscribed x a
297data CacheSubscribed x a
302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
298 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
299 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
300 , _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
303-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
304-- repeatedly
@@ -346,23 +324,18 @@ cacheEvent e =
346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
324 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347 Just subscribedTicket -> return subscribedTicket
325 Just subscribedTicket -> return subscribedTicket
348 Nothing -> do
326 Nothing -> do
350− nodeId <- liftIO newNodeId
352 subscribers <- liftIO FastWeakBag.empty
327 subscribers <- liftIO FastWeakBag.empty
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
328 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
329 (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
330+ { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
331+ liftIO $ writeIORef occRef $ Just a
361− scheduleClear occRef
332+ scheduleClear occRef
362− propagateFast a subscribers
333+ propagateFast a subscribers
334+ , subscriberInvalidateHeight = \old -> do
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
335+ FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
336+ , subscriberRecalculateHeight = \new -> do
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
337+ FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
366 when (isJust occ) $ do
339 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
340 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368 scheduleClear occRef
341 scheduleClear occRef
@@ -370,45 +343,29 @@ cacheEvent e =
370 { _cacheSubscribed_subscribers = subscribers
343 { _cacheSubscribed_subscribers = subscribers
371 , _cacheSubscribed_parent = parentSub
344 , _cacheSubscribed_parent = parentSub
372 , _cacheSubscribed_occurrence = occRef
345 , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
347 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
348 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379 return subscribedTicket
349 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
350+ liftIO $ do
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
351+ subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
352+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
353+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
354+ let es = EventSubscription
391− { _eventSubscription_unsubscribe = do
355+ { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
356+ FastWeakBag.remove ticket
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
357+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
358+ when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
359+ writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
360+ unsubscribe $ _cacheSubscribed_parent subscribed
398− touch ticket
361+ touch ticket
399− touch subscribedTicket
362+ touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
363+ , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
364+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
402− , eventSubscribedRetained = toAny subscribedTicket
365+ , eventSubscribedRetained = toAny subscribedTicket
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
410− return (es, occ)
368+ return (es, occ)
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
370subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
371subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +377,11 @@ wrap tag getSpecificSubscribed sub = do
420 let es = tag subd
377 let es = tag subd
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
378 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
380+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
381eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
429eventNever :: Event x a
383eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
384+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
386eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
387eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +418,16 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
418 , subscriberRecalculateHeight :: !(Height -> IO ())
421+--TODO: Move this comment to WeakBag
422+-- These function are constructor functions that are marked NOINLINE so they are
423+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
424+-- so any weak references that are attached to the constructors will have their
425+-- finalizer run. Using the opaque constructor, does not see the
426+-- constructor application, so it behaves like an IORef and cannot be fused away.
428+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
429+-- the weak pointer to it in some cases.
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
431newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
432newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
433 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +436,10 @@ newSubscriberHold h = return $ Subscriber
474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
438newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
439+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
440 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
441 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
442+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
443 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
444 scheduleClear $ fanSubscribedOccurrence subscribed
481 let f _ (Pair v subsubs) = do
445 let f _ (Pair v subsubs) = do
@@ -484,40 +448,50 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
448 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
449 return ()
486 , subscriberInvalidateHeight = \old -> do
450 , subscriberInvalidateHeight = \old -> do
451+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
452 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
453 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
454+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
455 , subscriberRecalculateHeight = \new -> do
456+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
457 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
458 forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
459+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
462newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
463+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
464 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
465+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
466 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
467 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
468 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
469 , subscriberInvalidateHeight = \_ -> do
470+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
471 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
472 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
473 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
474 WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
475+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
476+ , subscriberRecalculateHeight = \new -> do
477+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
478+ updateSwitchHeight new subscribed
479+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
482newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
483+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
484 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
485+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
486 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
487 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
488 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
489 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
490 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
491 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
492 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
493 case occ of
520− Nothing ->
494+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
495 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
496 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
497 WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
@@ -526,13 +500,20 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
500 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
501 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
502 propagate o $ coincidenceSubscribedSubscribers subscribed
503+ , subscriberInvalidateHeight = \_ -> do
504+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
505+ invalidateCoincidenceHeight subscribed
506+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
507+ , subscriberRecalculateHeight = \_ -> do
508+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
509+ recalculateCoincidenceHeight subscribed
510+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
513newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
514+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
515 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
516+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
517 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
518 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
519 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +521,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
521 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
522 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
523 propagate a $ coincidenceSubscribedSubscribers subscribed
524+ , subscriberInvalidateHeight = \_ -> do
525+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
526+ invalidateCoincidenceHeight subscribed
527+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
528+ , subscriberRecalculateHeight = \_ -> do
529+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
530+ recalculateCoincidenceHeight subscribed
531+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
534invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,15 +538,15 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
538recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
540-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
541+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
542+propagate a subscribers = withIncreasedDepth $ do
556 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
543 -- 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
544 --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
545 WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
560-- | Propagate everything at the current height
547-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
548+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
549+propagateFast a subscribers = withIncreasedDepth $ do
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
550 -- 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
551 --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
552 FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
@@ -580,7 +567,7 @@ data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
567 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
568 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
569#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
570+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
571 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
572 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +594,13 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
594 , 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"]
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
598eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
599eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
600 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
601 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
602#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
603+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
604 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
605 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +613,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
613#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
614 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
615 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
616+ return [Some $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
617 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
618 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +626,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
626#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
627 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
628 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
629+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
630+ innerParents = maybeToList $ fmap Some innerSubscription
654 return $ outerParent : innerParents
631 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
632 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
633 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +641,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
641whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
642whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
644+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
645walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
646+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
647 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
648 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
649 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
650+ modify (Some s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
651 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
652+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
653 return subscribers
@@ -994,10 +971,8 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
971 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
972 {-# INLINE return #-}
996 return x = BehaviorM $ return x
973 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
974 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
975 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
977data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
978 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +1032,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1032newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
1034-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1035+newtype EventM x a = EventM { unEventM :: 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
1062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1037newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -1082,8 +1057,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1057heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
1059heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1060+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1088heightBagRemove :: Height -> HeightBag -> HeightBag
1062heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
1063heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1066,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
1066 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
1067 _ -> IntMap.insert h (pred old) c
1095−heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1096−heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1097− removed old = HeightBag (pred s) $ case old of
1098− 0 -> IntMap.delete h c
1099− _ -> IntMap.insert h (pred old) c
1102heightBagMax :: HeightBag -> Height
1069heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1070heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
1071 Just ((h, _), _) -> Height h
@@ -1346,110 +1313,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1313 x' <- evaluate x
1347 mkWeakPtr x' $
1314 mkWeakPtr x' $
1348 if debugFinalize
1315 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1316+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1317 else Nothing
1352type WeakList a = [Weak a]
1319type WeakList a = [Weak a]
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1381{-# INLINE withIncreasedDepth #-}
1321{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1323+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1324+withIncreasedDepth a = do
1325+ spiderTimeline <- askSpiderTimelineEnv
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1326+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
1385 result <- a
1327 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1328+ liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1387 return result
1329 return result
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1331+withIncreasedDepth :: m a -> m a
1332+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1335+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1337{-# INLINE tracePropagate #-}
1419tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1338tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1339+tracePropagate p = traceWhen p debugPropagate
1422{-# INLINE traceInvalidate #-}
1341{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1342traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1343+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
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 #-}
1345+{-# INLINE traceWhen #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1346+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1446−traceM _ _ = return ()
1347+traceWhen p b message = traceMWhen p b $ return message
1349+{-# INLINE traceMWhen #-}
1350+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1351+traceMWhen _ b getMessage = when b $ do
1352+ message <- getMessage
1354+ spiderTimeline <- askSpiderTimelineEnv
1355+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1359+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1361whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1362whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1365groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1366groupByHead = \case
1455 [] -> []
1367 [] -> []
@@ -1460,54 +1372,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1372 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1374listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1375+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473−filterStack prefix = id
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1498{-# INLINE propagateSubscriberHold #-}
1378{-# INLINE propagateSubscriberHold #-}
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1379propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1380propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1381+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1382 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1383 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1384 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506 case {-# SCC "apply" #-} apply a v of
1385 case {-# SCC "apply" #-} apply a v of
1507 Nothing -> return ()
1386 Nothing -> return ()
1508 Just v' -> do
1387 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1388+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1389 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1390 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1391 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1561,7 +1439,7 @@ getDynHold d = do
1561zeroRef :: IORef Height
1439zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1440zeroRef = unsafePerformIO $ newIORef zeroHeight
1564−getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1442+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1443getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1444 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1445 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1453,7 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1453 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1454 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1455 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1456+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1457 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1458 writeIORef uninitRef $! uninit
1583#ifdef DEBUG_NODEIDS
1459#ifdef DEBUG_NODEIDS
@@ -1627,9 +1503,6 @@ data FanInt x a = FanInt
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
1503 { _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
1628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1504 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1505 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1635newFanInt :: IO (FanInt x a)
1508newFanInt :: IO (FanInt x a)
@@ -1637,16 +1510,10 @@ newFanInt = do
1637 subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1510 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
1638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1511 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639 occRef <- newIORef $ error "fanInt: no occurrence"
1512 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1643 return $ FanInt
1513 return $ FanInt
1644 { _fanInt_subscribers = subscribers
1514 { _fanInt_subscribers = subscribers
1645 , _fanInt_subscriptionRef = subscriptionRef
1515 , _fanInt_subscriptionRef = subscriptionRef
1646 , _fanInt_occRef = occRef
1516 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1519fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1522,20 @@ fanInt p = unsafePerformIO $ do
1655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1522 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1523 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1524 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1525+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1660 { subscriberPropagate = \m -> do
1526 { subscriberPropagate = \m -> do
1661 liftIO $ writeIORef (_fanInt_occRef self) m
1527 liftIO $ writeIORef (_fanInt_occRef self) m
1662 scheduleIntClear $ _fanInt_occRef self
1528 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?
1529+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1530+ FastWeakBag.traverse_ b $ \s -> do
1665 subscriberPropagate s v
1531 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1532+ , subscriberInvalidateHeight = \old -> do
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1533+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1668− FastWeakBag.traverse_ b $ \s ->
1534+ FastWeakBag.traverse_ b $ \s -> do
1669 subscriberInvalidateHeight s old
1535 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1536+ , subscriberRecalculateHeight = \new -> do
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1537+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1672− FastWeakBag.traverse_ b $ \s ->
1538+ FastWeakBag.traverse_ b $ \s -> do
1673 subscriberRecalculateHeight s new
1539 subscriberRecalculateHeight s new
1675 liftIO $ do
1541 liftIO $ do
@@ -1683,25 +1549,10 @@ fanInt p = unsafePerformIO $ do
1683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1549 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684 return b
1550 return b
1685 Just b -> return b
1551 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1552+ t <- liftIO $ FastWeakBag.insert sub b
1687 currentOcc <- readIORef (_fanInt_occRef self)
1553 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1554+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1555+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), 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 #-}
1557{-# INLINABLE getFanSubscribed #-}
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))
1558getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1899,7 +1750,7 @@ mergeCheap
1899 => (forall a. q a -> Event x (v a))
1750 => (forall a. q a -> Event x (v a))
1900 -> DynamicS x (PatchDMap k q)
1751 -> DynamicS x (PatchDMap k q)
1901 -> Event x (DMap k v)
1752 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1753+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1755 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1756 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1765,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1765 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1766 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916 forM_ mOldSubd $ \oldSubd -> do
1767 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1768+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1769 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1770 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922 foldM f ([], oldParents) $ DMap.toList p
1771 foldM f ([], oldParents) $ DMap.toList p
@@ -1941,7 +1790,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941 => (forall a. q a -> Event x (v a))
1790 => (forall a. q a -> Event x (v a))
1942 -> DynamicS x (PatchDMapWithMove k q)
1791 -> DynamicS x (PatchDMapWithMove k q)
1943 -> Event x (DMap k v)
1792 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1793+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1795 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947 updateMe subscriber heightBagRef oldParents p = do
1796 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1809,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1809 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
1810 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962 Nothing -> do
1811 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1812+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1964− _mergeSubscribedParentWithMove_subscription parent
1966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1813 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1814 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968 Just toKey -> do
1815 Just toKey -> do
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1816 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970 return Nothing
1817 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1818+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1974 return (toDelete, applyAlways p' oldParents)
1819 return (toDelete, applyAlways p' oldParents)
1975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1820 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976 getInitialSubscribers initialParents subscriber = do
1821 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1840,6 @@ type MergeUpdateFunc k v x p s
1996 -> EventM x ([EventSubscription x], DMap k s)
1841 -> EventM x ([EventSubscription x], DMap k s)
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
2000type MergeInitFunc k v q x s
1843type MergeInitFunc k v q x s
2001 = DMap k q
1844 = DMap k q
2002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
1845 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1863,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
2020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
1863invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021invalidateMergeHeight' heightRef sub = do
1864invalidateMergeHeight' heightRef sub = do
2022 oldHeight <- readIORef heightRef
1865 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
1866+ when (oldHeight /= invalidHeight) $ do -- 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
1867 writeIORef heightRef $! invalidHeight
2026 subscriberInvalidateHeight sub oldHeight
1868 subscriberInvalidateHeight sub oldHeight
2028revalidateMergeHeight :: Merge x k v s -> IO ()
1870revalidateMergeHeight :: Merge x k v s -> IO ()
2029revalidateMergeHeight m = do
1871revalidateMergeHeight m = do
2030 currentHeight <- readIORef $ _merge_heightRef m
1872 currentHeight <- readIORef $ _merge_heightRef m
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1873+ when (currentHeight == invalidHeight) $ do -- 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
1874 heights <- readIORef $ _merge_heightBagRef m
2035 parents <- readIORef $ _merge_parentsRef m
1875 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
1876 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1878,7 @@ revalidateMergeHeight m = do
2038 LT -> return ()
1878 LT -> return ()
2039 EQ -> do
1879 EQ -> do
2040 let height = succHeight $ heightBagMax heights
1880 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1881+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2042 writeIORef (_merge_heightRef m) $! height
1882 writeIORef (_merge_heightRef m) $! height
2043 subscriberRecalculateHeight (_merge_sub m) height
1883 subscriberRecalculateHeight (_merge_sub m) height
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
1884 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1886,36 @@ revalidateMergeHeight m = do
2046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1886scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
1887scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048 vals <- liftIO $ readIORef $ _merge_accumRef m
1888 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,
1889+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, 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
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052 --TODO: Assert that m is not empty
1890 --TODO: Assert that m is not empty
2053 subscriberPropagate (_merge_sub m) vals
1891 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)
1893+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077−mergeSubscriber subscribed m getKey = Subscriber
1894+mergeSubscriber m getKey = Subscriber
2078 { subscriberPropagate = \a -> do
1895 { subscriberPropagate = \a -> do
2079 oldM <- liftIO $ readIORef $ _merge_accumRef m
1896 oldM <- liftIO $ readIORef $ _merge_accumRef m
2080 k <- getKey
1897 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1898+ 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)
1899 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
1900 liftIO $ writeIORef (_merge_accumRef m) $! newM
2084 when (DMap.null oldM) $ do -- Only schedule the firing once
1901 when (DMap.null oldM) $ do -- Only schedule the firing once
2085 height <- liftIO $ readIORef $ _merge_heightRef m
1902 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
1903+ --TODO: assertions about height
2087−
1904+ currentHeight <- getCurrentHeight
1905+ when (height <= currentHeight) $ do
1906+ if height /= invalidHeight
1908+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1909+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1912+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1913+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1914+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1918+ error $ "Causality loop found" <> cycleInfo
2088 scheduleMergeSelf m height
1919 scheduleMergeSelf m height
2089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1920 , 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
1921 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1926,31 @@ mergeSubscriber subscribed m getKey = Subscriber
2097--TODO: Be able to run as much of this as possible promptly
1928--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
1929+updateMerge :: (HasSpiderTimeline x, GCompare k) => 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)
1930+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100 where updateMe = do
1931 where updateMe = do
2101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1932 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1933+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
1934 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104 return subscriptionsToKill
1935 return subscriptionsToKill
2106{-# INLINE mergeGCheap' #-}
1937{-# INLINE mergeGCheap' #-}
2107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1938mergeGCheap' :: 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)
1939+ => 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
1940+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1941 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1942 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1943 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1944 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1945 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
2129− m = Merge
1946+ let m = Merge
2130 { _merge_parentsRef = parentsRef
1947 { _merge_parentsRef = parentsRef
2131 , _merge_heightBagRef = heightBagRef
1948 , _merge_heightBagRef = heightBagRef
2132 , _merge_heightRef = heightRef
1949 , _merge_heightRef = heightRef
2133 , _merge_sub = sub
1950 , _merge_sub = sub
2134 , _merge_accumRef = accumRef
1951 , _merge_accumRef = accumRef
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1953+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1954 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138 myHeight = if invalidHeight `elem` heights
1955 myHeight = if invalidHeight `elem` heights
2139 then invalidHeight
1956 then invalidHeight
@@ -2142,29 +1959,31 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
2142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1959 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)
1960 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144 else (Nothing, dm)
1961 else (Nothing, dm)
1962+ unless (DMap.null accum) $ do
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1963+ scheduleMergeSelf m myHeight
2146 liftIO $ writeIORef accumRef $! accum
1964 liftIO $ writeIORef accumRef $! accum
2147 liftIO $ writeIORef heightRef $! myHeight
1965 liftIO $ writeIORef heightRef $! myHeight
2148 liftIO $ writeIORef heightBagRef $! myHeightBag
1966 liftIO $ writeIORef heightBagRef $! myHeightBag
1967+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2149 liftIO $ writeIORef parentsRef $! initialParentState
1968 liftIO $ writeIORef parentsRef $! initialParentState
2150 defer $ SomeMergeInit $ do
1969 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1970+ let s = Subscriber
2152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1971 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
1972+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1973+ defer $ updateMerge m updateFunc a
2155 , subscriberInvalidateHeight = \_ -> return ()
1974 , subscriberInvalidateHeight = \_ -> return ()
2156 , subscriberRecalculateHeight = \_ -> return ()
1975 , subscriberRecalculateHeight = \_ -> return ()
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1977+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1978+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
2160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
1979 -- 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
1980 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162 -- its subscription.
1981 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1982+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
1983 let unsubscribeAll = destroy =<< readIORef parentsRef
2166− return (EventSubscription unsubscribeAll subscribed, occ)
1984+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1988mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170mergeInt = cacheEvent . mergeIntCheap
1989mergeInt = cacheEvent . mergeIntCheap
@@ -2177,22 +1996,13 @@ mergeIntCheap d = Event $ \sub -> do
2177 heightRef <- liftIO $ newIORef zeroHeight
1996 heightRef <- liftIO $ newIORef zeroHeight
2178 heightBagRef <- liftIO $ newIORef heightBagEmpty
1997 heightBagRef <- liftIO $ newIORef heightBagEmpty
2179 parents <- liftIO $ FastMutableIntMap.newEmpty
1998 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
1999 let scheduleSelf = do
2191 height <- liftIO $ readIORef $ heightRef
2000 height <- liftIO $ readIORef $ heightRef
2192 scheduleMerge' height heightRef $ do
2001 scheduleMerge' height heightRef $ do
2193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2002 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194 subscriberPropagate sub vals
2003 subscriberPropagate sub vals
2004+ invalidateMyHeight = do
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2005+ invalidateMergeHeight' heightRef sub
2196 recalculateMyHeight = do
2006 recalculateMyHeight = do
2197 currentHeight <- readIORef heightRef
2007 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?
2008 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?
@@ -2202,14 +2012,12 @@ mergeIntCheap d = Event $ \sub -> do
2202 LT -> return ()
2012 LT -> return ()
2203 EQ -> do
2013 EQ -> do
2204 let height = succHeight $ heightBagMax heights
2014 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2015+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2206 writeIORef heightRef $! height
2016 writeIORef heightRef $! height
2207 subscriberRecalculateHeight sub height
2017 subscriberRecalculateHeight sub height
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2018 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209 mySubscriber k = Subscriber
2019 mySubscriber k = Subscriber
2210 { subscriberPropagate = \a -> do
2020 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2021 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214 liftIO $ FastMutableIntMap.insert accum k a
2022 liftIO $ FastMutableIntMap.insert accum k a
2215 when wasEmpty scheduleSelf
2023 when wasEmpty scheduleSelf
@@ -2243,6 +2051,7 @@ mergeIntCheap d = Event $ \sub -> do
2243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2051 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
2052 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245 return Nothing
2053 return Nothing
2054+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2246 defer $ SomeMergeInit $ do
2055 defer $ SomeMergeInit $ do
2247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2056 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
@@ -2256,27 +2065,25 @@ mergeIntCheap d = Event $ \sub -> do
2256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2065 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257 liftIO $ for_ oldParents $ \oldParent -> do
2066 liftIO $ for_ oldParents $ \oldParent -> do
2258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2067 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2260− print ("updateMe", oldParentHeight)
2261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2068 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262 return $ IntMap.elems oldParents
2069 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2070+ let s = Subscriber
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2071 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2072 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266 defer $ updateMe a
2073 defer $ updateMe a
2267 , subscriberInvalidateHeight = \_ -> return ()
2074 , subscriberInvalidateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
2075 , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2077+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2271 forM_ change $ \c -> defer $ updateMe c
2078 forM_ change $ \c -> defer $ updateMe c
2272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2079 -- 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
2080 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274 -- its subscription.
2081 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2082+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2083 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2084+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2088newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
2089newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2359,19 +2166,19 @@ runFrame a = SpiderHost $ do
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2166 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2167 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
2168 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2169+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2170 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2171 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365 writeIORef (eventEnvMergeUpdates env) []
2172 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2173+ when debugPropagate $ putStrLn "Updating merges"
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2174 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2175+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
2176 toReconnect <- readIORef toReconnectRef
2370 clearEventEnv env
2177 clearEventEnv env
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2178 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2179 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2180 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2181+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
2182 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2183 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
2184 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2192,7 @@ runFrame a = SpiderHost $ do
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
2192 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
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2194 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2195+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
2196 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
2197 EventNever -> "EventNever"
2391 _ -> "something else"
2198 _ -> "something else"
@@ -2520,8 +2327,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2520 {-# INLINABLE headE #-}
2327 {-# INLINABLE headE #-}
2521 headE = R.slowHeadE
2328 headE = R.slowHeadE
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2329-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2331instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527 {-# INLINABLE sample #-}
2332 {-# INLINABLE sample #-}
@@ -2543,9 +2348,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2543 {-# INLINABLE headE #-}
2348 {-# INLINABLE headE #-}
2544 headE = R.slowHeadE
2349 headE = R.slowHeadE
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2350-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2352instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
2353 {-# INLINE return #-}
@@ -2554,10 +2356,8 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2356 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555 {-# INLINE (>>) #-}
2357 {-# INLINE (>>) #-}
2556 (>>) = (*>)
2358 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558 {-# INLINE fail #-}
2359 {-# INLINE fail #-}
2559 fail _ = error "Dynamic does not support 'fail'"
2360 fail _ = error "Dynamic does not support 'fail'"
2562{-# INLINABLE newJoinDyn #-}
2362{-# INLINABLE newJoinDyn #-}
2563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2363newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2609,9 +2409,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2409 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610 {-# INLINABLE headE #-}
2410 {-# INLINABLE headE #-}
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2411 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2413instance 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
2414 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2425,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2628 {-# INLINABLE headE #-}
2425 {-# INLINABLE headE #-}
2629 headE = R.slowHeadE
2426 headE = R.slowHeadE
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2427-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2429instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2430 {-# INLINABLE sample #-}
@@ -2650,8 +2445,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2445 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651 {-# INLINABLE headE #-}
2446 {-# INLINABLE headE #-}
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2447 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2656--------------------------------------------------------------------------------
2449--------------------------------------------------------------------------------
2657-- Deprecated items
2450-- Deprecated items
@@ -2689,13 +2482,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
2690 return result
2483 return result
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2485+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2486 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694 newFanEventWithTrigger f = SpiderHost $ do
2487 newFanEventWithTrigger f = SpiderHost $ do
2695 es <- newFanEventWithTriggerIO f
2488 es <- newFanEventWithTriggerIO f
2696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2489 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2491+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2492 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2493 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701 es <- newFanEventWithTriggerIO f
2494 es <- newFanEventWithTriggerIO f
@@ -2775,7 +2568,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2568 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776 {-# INLINABLE mergeG #-}
2569 {-# INLINABLE mergeG #-}
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2571+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2572 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780 -> DMap k q
2573 -> DMap k q
2781 -> R.Event (SpiderTimeline x) (DMap k v)
2574 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2843,14 +2636,8 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2636 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2637 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2638 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847− {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852 {-# INLINABLE fail #-}
2639 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2640+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2642-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2643-- a mutex for that timeline
@@ -2872,21 +2659,19 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2659 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2660 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2661 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2662 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2663 fail s = SpiderHostFrame $ fail s
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2665instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881 notReadyUntil _ = pure ()
2666 notReadyUntil _ = pure ()
2882 notReady = pure ()
2667 notReady = pure ()
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2669+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2670newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2671 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2672 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2674+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2675newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2676 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2677 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2705,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2705instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2706 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2707 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 ()