@@ -9,7 +9,6 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiWayIf #-}
13{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RoleAnnotations #-}
13{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE ScopedTypeVariables #-}
@@ -20,6 +19,7 @@
20{-# LANGUAGE DeriveFunctor #-}
19{-# LANGUAGE DeriveFunctor #-}
21{-# LANGUAGE StandaloneDeriving #-}
20{-# LANGUAGE StandaloneDeriving #-}
22{-# LANGUAGE InstanceSigs #-}
21{-# 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,15 +38,17 @@ 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_)
42import Control.Monad.Reader.Class
41import Control.Monad.Reader.Class
43import Control.Monad.IO.Class
42import Control.Monad.IO.Class
44import Control.Monad.ReaderIO
43import Control.Monad.ReaderIO
45import Control.Monad.Ref
44import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
46import Data.Align
47import Data.Align
47import Data.Coerce
48import Data.Coerce
48−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
49import qualified Data.Dependent.Map as DMap
50import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
50import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
51import qualified Data.FastMutableIntMap as FastMutableIntMap
53import qualified Data.FastMutableIntMap as FastMutableIntMap
52import Data.Foldable hiding (concat, elem, sequence_)
54import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,12 +61,13 @@ import qualified Data.IntMap.Strict as IntMap
59import Data.IORef
61import Data.IORef
60import Data.Kind (Type)
62import Data.Kind (Type)
61import Data.Maybe hiding (mapMaybe)
63import Data.Maybe hiding (mapMaybe)
62−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
63import Data.Proxy
65import Data.Proxy
64import Data.These
66import Data.These
65import Data.Traversable
67import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
66import Data.Witherable (Filterable, mapMaybe)
69import Data.Witherable (Filterable, mapMaybe)
67−import GHC.Exts
70+import GHC.Exts hiding (toList)
68import GHC.IORef (IORef (..))
71import GHC.IORef (IORef (..))
69import GHC.Stack
72import GHC.Stack
70import Reflex.FastWeak
73import Reflex.FastWeak
@@ -83,14 +86,16 @@ import Data.Zip (Zip (..))
84#ifdef DEBUG_CYCLES
87#ifdef DEBUG_CYCLES
85import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
86import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
87import qualified Data.List.NonEmpty as NonEmpty
92import qualified Data.List.NonEmpty as NonEmpty
88−import Data.Monoid (mempty)
89import Data.Tree (Forest, Tree (..), drawForest)
93import Data.Tree (Forest, Tree (..), drawForest)
90−#endif
94+import Data.List (isPrefixOf)
92−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
93import qualified Data.FastWeakBag as FastWeakBag
97import qualified Data.FastWeakBag as FastWeakBag
94import Data.Reflection
99import Data.Reflection
95import Data.Some (Some(Some))
100import Data.Some (Some(Some))
96import Data.Type.Coercion
101import Data.Type.Coercion
@@ -101,20 +106,26 @@ import qualified Reflex.Class
101import qualified Reflex.Class as R
106import qualified Reflex.Class as R
102import qualified Reflex.Host.Class
107import qualified Reflex.Host.Class
103import Reflex.NotReady.Class
108import Reflex.NotReady.Class
104−import Reflex.Patch
109+import Data.Patch
105−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
107#ifdef DEBUG_TRACE_EVENTS
113#ifdef DEBUG_TRACE_EVENTS
108import qualified Data.ByteString.Char8 as BS8
114import qualified Data.ByteString.Char8 as BS8
109import System.IO (stderr)
115import System.IO (stderr)
116+import Data.List (isPrefixOf)
112−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
123+#ifdef DEBUG_TRACE_EVENTS
114withStackOneLine :: (BS8.ByteString -> a) -> a
124withStackOneLine :: (BS8.ByteString -> a) -> a
115withStackOneLine expr = unsafePerformIO $ do
125withStackOneLine expr = unsafePerformIO $ do
116 stack <- currentCallStack
126 stack <- currentCallStack
117− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
@@ -125,28 +136,42 @@ debugInvalidateHeight :: Bool
125debugInvalidate :: Bool
136debugInvalidate :: Bool
127#ifdef DEBUG
138#ifdef DEBUG
129#define DEBUG_NODEIDS
139#define DEBUG_NODEIDS
141+#ifdef DEBUG_TRACE_PROPAGATION
131debugPropagate = True
142debugPropagate = True
144+debugPropagate = False
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
133debugInvalidateHeight = False
150debugInvalidateHeight = False
153+#ifdef DEBUG_TRACE_INVALIDATION
135debugInvalidate = True
154debugInvalidate = True
156+debugInvalidate = False
137class HasNodeId a where
159class HasNodeId a where
138 getNodeId :: a -> Int
160 getNodeId :: a -> Int
140−instance HasNodeId (Hold x p a) where
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
165+instance HasNodeId (FanInt x a) where
141− getNodeId = holdNodeId
166+ getNodeId = _fanInt_nodeId
143−instance HasNodeId (PushSubscribed x a b) where
168+instance HasNodeId (Hold x p) where
144− getNodeId = pushSubscribedNodeId
169+ getNodeId = holdNodeId
146instance HasNodeId (SwitchSubscribed x a) where
171instance HasNodeId (SwitchSubscribed x a) where
147 getNodeId = switchSubscribedNodeId
172 getNodeId = switchSubscribedNodeId
149−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
150 getNodeId = fanSubscribedNodeId
175 getNodeId = fanSubscribedNodeId
152instance HasNodeId (CoincidenceSubscribed x a) where
177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -160,41 +185,16 @@ instance HasNodeId (Pull x a) where
161{-# INLINE showNodeId #-}
186{-# INLINE showNodeId #-}
162showNodeId :: HasNodeId a => a -> String
187showNodeId :: HasNodeId a => a -> String
163−showNodeId = ("#"<>) . show . getNodeId
188+showNodeId = showNodeId' . getNodeId
165−showSubscriberType :: Subscriber x a -> String
190+showNodeId' :: Int -> String
166−showSubscriberType = \case
191+showNodeId' = ("#"<>) . show
167− SubscriberPush _ _ -> "SubscriberPush"
192+
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"
194debugPropagate = False
196debugPropagate = False
196debugInvalidateHeight = False
197debugInvalidateHeight = 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,6 +202,10 @@ debugInvalidate = False
202showNodeId :: a -> String
202showNodeId :: a -> String
203showNodeId _ = ""
203showNodeId _ = ""
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207#ifdef DEBUG_NODEIDS
211#ifdef DEBUG_NODEIDS
@@ -211,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
212newNodeId :: IO Int
216newNodeId :: IO Int
213newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
215−{-# NOINLINE unsafeNodeId #-}
216−unsafeNodeId :: a -> Int
217−unsafeNodeId a = unsafePerformIO $ do
222--------------------------------------------------------------------------------
220--------------------------------------------------------------------------------
@@ -253,9 +251,9 @@ subscribeAndRead = unEvent
253-- caching; if the computation function is very cheap, this is (much) more
251-- caching; if the computation function is very cheap, this is (much) more
254-- efficient than 'push'
252-- efficient than 'push'
255{-# INLINE [1] pushCheap #-}
253{-# INLINE [1] pushCheap #-}
256−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
257pushCheap !f e = Event $ \sub -> do
255pushCheap !f e = Event $ \sub -> do
258− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
259 { subscriberPropagate = \a -> do
257 { subscriberPropagate = \a -> do
260 mb <- f a
258 mb <- f a
261 mapM_ (subscriberPropagate sub) mb
259 mapM_ (subscriberPropagate sub) mb
@@ -274,10 +272,10 @@ terminalSubscriber p = Subscriber
275-- | Subscribe to an Event only for the duration of one occurrence
273-- | Subscribe to an Event only for the duration of one occurrence
276{-# INLINE subscribeAndReadHead #-}
274{-# INLINE subscribeAndReadHead #-}
277−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
278subscribeAndReadHead e sub = do
276subscribeAndReadHead e sub = do
279 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
280− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
281 { subscriberPropagate = \a -> do
279 { subscriberPropagate = \a -> do
282 liftIO $ unsubscribe =<< readIORef subscriptionRef
280 liftIO $ unsubscribe =<< readIORef subscriptionRef
283 subscriberPropagate sub a
281 subscriberPropagate sub a
@@ -288,24 +286,42 @@ subscribeAndReadHead e sub = do
288 return (subscription, occ)
286 return (subscription, occ)
290--TODO: Make this lazy in its input event
288--TODO: Make this lazy in its input event
291−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
292headE originalE = do
290headE originalE = do
293 parent <- liftIO $ newIORef $ Just originalE
291 parent <- liftIO $ newIORef $ Just originalE
294 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
295 let clearParent = liftIO $ writeIORef parent Nothing
293 let clearParent = liftIO $ writeIORef parent Nothing
296− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
297 when (isJust occ) clearParent
295 when (isJust occ) clearParent
298− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
299 liftIO (readIORef parent) >>= \case
297 liftIO (readIORef parent) >>= \case
300− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
301 Just e -> subscribeAndReadHead e sub
299 Just e -> subscribeAndReadHead e sub
303data CacheSubscribed x a
301data CacheSubscribed x a
304 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
305 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
306 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
310+nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
314+now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
317+ nowOrNot <- liftIO $ newIORef $ Just ()
318+ scheduleClear nowOrNot
319+ return . Event $ \_ -> do
320+ occ <- liftIO . readIORef $ nowOrNot
321+ return ( EventSubscription (return ()) eventSubscribedNow
309-- | Construct an 'Event' whose value is guaranteed not to be recomputed
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
310-- repeatedly
326-- repeatedly
@@ -320,27 +336,33 @@ cacheEvent e =
339+ unsafePerformIO $ do
323− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
324− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
341+ <- newIORef emptyFastWeak
325− in \sub -> {-# SCC "cacheEvent" #-} do
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
326#ifdef DEBUG_TRACE_EVENTS
343#ifdef DEBUG_TRACE_EVENTS
327 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
329 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
330 Just subscribedTicket -> return subscribedTicket
347 Just subscribedTicket -> return subscribedTicket
331 Nothing -> do
348 Nothing -> do
350+ nodeId <- liftIO newNodeId
332 subscribers <- liftIO FastWeakBag.empty
352 subscribers <- liftIO FastWeakBag.empty
333 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
355+ (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
334 (parentSub, occ) <- subscribeAndRead e $ Subscriber
357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
335− { subscriberPropagate = \a -> do
359+ { subscriberPropagate = \a -> do
336− liftIO $ writeIORef occRef $ Just a
360+ liftIO $ writeIORef occRef (Just a)
337− scheduleClear occRef
361+ scheduleClear occRef
338− propagateFast a subscribers
362+ propagateFast a subscribers
339− , subscriberInvalidateHeight = \old -> do
340− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
363+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
341− , subscriberRecalculateHeight = \new -> do
342− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
364+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
344 when (isJust occ) $ do
366 when (isJust occ) $ do
345 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
346 scheduleClear occRef
368 scheduleClear occRef
@@ -348,29 +370,45 @@ cacheEvent e =
348 { _cacheSubscribed_subscribers = subscribers
370 { _cacheSubscribed_subscribers = subscribers
349 , _cacheSubscribed_parent = parentSub
371 , _cacheSubscribed_parent = parentSub
350 , _cacheSubscribed_occurrence = occRef
372 , _cacheSubscribed_occurrence = occRef
374+ , _cacheSubscribed_nodeId = nodeId
352 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
353 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
354 return subscribedTicket
379 return subscribedTicket
355− liftIO $ do
380+ liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
382+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383+ -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384+cacheSubscription sub mSubscribedRef subscribedTicket = do
356− subscribed <- getFastWeakTicketValue subscribedTicket
385+ subscribed <- getFastWeakTicketValue subscribedTicket
357− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
386+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
358− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
387+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389+ let parentSub = _cacheSubscribed_parent subscribed
359− let es = EventSubscription
390+ es = EventSubscription
360− { _eventSubscription_unsubscribe = do
391+ { _eventSubscription_unsubscribe = do
361− FastWeakBag.remove ticket
392+ FastWeakBag.remove ticket
362− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
394+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
363− when isEmpty $ do
395+ when isEmpty $ do
364− writeIORef mSubscribedRef emptyFastWeak
396+ writeIORef mSubscribedRef emptyFastWeak
365− unsubscribe $ _cacheSubscribed_parent subscribed
397+ unsubscribe parentSub
366− touch ticket
398+ touch ticket
367− touch subscribedTicket
399+ touch subscribedTicket
368− , _eventSubscription_subscribed = EventSubscribed
400+ , _eventSubscription_subscribed = EventSubscribed
369− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
401+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
370− , eventSubscribedRetained = toAny subscribedTicket
402+ , eventSubscribedRetained = toAny subscribedTicket
404+ , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405+ , eventSubscribedHasOwnHeightRef = False
406+ , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
373− return (es, occ)
410+ return (es, occ)
375subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
376subscribe e s = fst <$> subscribeAndRead e s
414subscribe e s = fst <$> subscribeAndRead e s
@@ -382,11 +420,14 @@ wrap tag getSpecificSubscribed sub = do
382 let es = tag subd
420 let es = tag subd
383 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
385−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
386eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
388eventNever :: Event x a
429eventNever :: Event x a
389−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
391eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
392eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -423,16 +464,6 @@ data Subscriber x a = Subscriber
423 , subscriberRecalculateHeight :: !(Height -> IO ())
464 , subscriberRecalculateHeight :: !(Height -> IO ())
426−--TODO: Move this comment to WeakBag
427−-- These function are constructor functions that are marked NOINLINE so they are
428−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
429−-- so any weak references that are attached to the constructors will have their
430−-- finalizer run. Using the opaque constructor, does not see the
431−-- constructor application, so it behaves like an IORef and cannot be fused away.
433−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
434−-- the weak pointer to it in some cases.
436newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
437newSubscriberHold h = return $ Subscriber
468newSubscriberHold h = return $ Subscriber
438 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -441,10 +472,10 @@ newSubscriberHold h = return $ Subscriber
443newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
444−newSubscriberFan subscribed = return $ Subscriber
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
445 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
446 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
447− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
448 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
449 scheduleClear $ fanSubscribedOccurrence subscribed
480 scheduleClear $ fanSubscribedOccurrence subscribed
450 let f _ (Pair v subsubs) = do
481 let f _ (Pair v subsubs) = do
@@ -453,72 +484,55 @@ newSubscriberFan subscribed = return $ Subscriber
453 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
454 return ()
485 return ()
455 , subscriberInvalidateHeight = \old -> do
486 , subscriberInvalidateHeight = \old -> do
456− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
457 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
458− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
459− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
460 , subscriberRecalculateHeight = \new -> do
489 , subscriberRecalculateHeight = \new -> do
461− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
462 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
463− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
464− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
467newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
468−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
469 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
470− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
471 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
472 scheduleClear $ switchSubscribedOccurrence subscribed
498 scheduleClear $ switchSubscribedOccurrence subscribed
473 propagate a $ switchSubscribedSubscribers subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
474 , subscriberInvalidateHeight = \_ -> do
500 , subscriberInvalidateHeight = \_ -> do
475− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
476 oldHeight <- readIORef $ switchSubscribedHeight subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
477 when (oldHeight /= invalidHeight) $ do
502 when (oldHeight /= invalidHeight) $ do
478 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
479− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
480− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
481− , subscriberRecalculateHeight = \new -> do
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
482− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
483− updateSwitchHeight new subscribed
484− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
487newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
488−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
489 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
490− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
491 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
492 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
493 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
494 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
495 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
496 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
497 scheduleClear $ coincidenceSubscribedInnerParent subscribed
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
498 case occ of
519 case occ of
499− Nothing -> do
520+ Nothing ->
500 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
501 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
502− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
503− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
504 Just o -> do -- Since it's already firing, no need to adjust height
525 Just o -> do -- Since it's already firing, no need to adjust height
505 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
506 scheduleClear $ coincidenceSubscribedOccurrence subscribed
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
507 propagate o $ coincidenceSubscribedSubscribers subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
508− , subscriberInvalidateHeight = \_ -> do
509− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
510− invalidateCoincidenceHeight subscribed
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
511− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
512− , subscriberRecalculateHeight = \_ -> do
513− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
514− recalculateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
515− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
518newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
519−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
520 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
521− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
522 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
523 case occ of
537 case occ of
524 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -526,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate a $ coincidenceSubscribedSubscribers subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> do
530− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
531− invalidateCoincidenceHeight subscribed
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
532− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
533− , subscriberRecalculateHeight = \_ -> do
534− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
535− recalculateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
536− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
539invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -543,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
543recalculateSubscriberHeight = flip subscriberRecalculateHeight
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
545-- | Propagate everything at the current height
553-- | Propagate everything at the current height
546−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
547−propagate a subscribers = withIncreasedDepth $ do
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
548 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
556 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
549 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
550− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
552-- | Propagate everything at the current height
560-- | Propagate everything at the current height
553−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
554−propagateFast a subscribers = withIncreasedDepth $ do
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
555 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
563 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
556 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
557− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
559--------------------------------------------------------------------------------
567--------------------------------------------------------------------------------
560-- EventSubscribed
568-- EventSubscribed
@@ -572,7 +580,7 @@ data EventSubscribed x = EventSubscribed
572 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
573 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
574#ifdef DEBUG_CYCLES
582#ifdef DEBUG_CYCLES
575− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
576 , eventSubscribedHasOwnHeightRef :: !Bool
584 , eventSubscribedHasOwnHeightRef :: !Bool
577 , eventSubscribedWhoCreated :: !(IO [String])
585 , eventSubscribedWhoCreated :: !(IO [String])
@@ -599,13 +607,23 @@ eventSubscribedNever = EventSubscribed
599 , eventSubscribedWhoCreated = return ["never"]
607 , eventSubscribedWhoCreated = return ["never"]
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
603eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
604eventSubscribedFan !subscribed = EventSubscribed
622eventSubscribedFan !subscribed = EventSubscribed
605 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
606 , eventSubscribedRetained = toAny subscribed
624 , eventSubscribedRetained = toAny subscribed
607#ifdef DEBUG_CYCLES
625#ifdef DEBUG_CYCLES
608− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
609 , eventSubscribedHasOwnHeightRef = False
627 , eventSubscribedHasOwnHeightRef = False
610 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -618,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
618#ifdef DEBUG_CYCLES
636#ifdef DEBUG_CYCLES
619 , eventSubscribedGetParents = do
637 , eventSubscribedGetParents = do
620 s <- readIORef $ switchSubscribedCurrentParent subscribed
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
621− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
622 , eventSubscribedHasOwnHeightRef = True
640 , eventSubscribedHasOwnHeightRef = True
623 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -631,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
631#ifdef DEBUG_CYCLES
649#ifdef DEBUG_CYCLES
632 , eventSubscribedGetParents = do
650 , eventSubscribedGetParents = do
633 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
634− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
635− innerParents = maybeToList $ fmap Some innerSubscription
653+ innerParents = maybeToList $ innerSubscription
636 return $ outerParent : innerParents
654 return $ outerParent : innerParents
637 , eventSubscribedHasOwnHeightRef = True
655 , eventSubscribedHasOwnHeightRef = True
638 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -646,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
646whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
647whoCreatedEventSubscribed = eventSubscribedWhoCreated
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
649−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
650walkInvalidHeightParents s0 = do
668walkInvalidHeightParents s0 = do
651− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
652 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
653 when (h == invalidHeight) $ do
671 when (h == invalidHeight) $ do
654 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
655− modify (Some s :)
673+ modify (s :)
656 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
657− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
658 return subscribers
676 return subscribers
@@ -976,8 +994,10 @@ instance Monad (BehaviorM x) where
976 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
977 {-# INLINE return #-}
995 {-# INLINE return #-}
978 return x = BehaviorM $ return x
996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
979 {-# INLINE fail #-}
998 {-# INLINE fail #-}
980 fail s = BehaviorM $ fail s
999 fail s = BehaviorM $ fail s
982data BehaviorSubscribed x a
1002data BehaviorSubscribed x a
983 = forall p. BehaviorSubscribedHold (Hold x p)
1003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1037,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1037newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1039-- EventM can do everything BehaviorM can, plus create holds
1059-- EventM can do everything BehaviorM can, plus create holds
1040−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
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1042newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -1062,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
1062heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1064heightBagAdd :: Height -> HeightBag -> HeightBag
1084heightBagAdd :: Height -> HeightBag -> HeightBag
1065−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1067heightBagRemove :: Height -> HeightBag -> HeightBag
1088heightBagRemove :: Height -> HeightBag -> HeightBag
1068heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1071,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1071 0 -> IntMap.delete h c
1092 0 -> IntMap.delete h c
1072 _ -> IntMap.insert h (pred old) c
1093 _ -> IntMap.insert h (pred old) c
1095+heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1096+heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1097+ removed old = HeightBag (pred s) $ case old of
1098+ 0 -> IntMap.delete h c
1099+ _ -> IntMap.insert h (pred old) c
1074heightBagMax :: HeightBag -> Height
1102heightBagMax :: HeightBag -> Height
1075heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1076 Just ((h, _), _) -> Height h
1104 Just ((h, _), _) -> Height h
@@ -1211,18 +1239,12 @@ buildDynamic readV0 v' = do
1211 return d
1239 return d
1213unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1214−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1242+unsafeBuildDynamic readV0 v' =
1215− where x = (readV0, v')
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1217-- ResultM can read behaviors and events
1245-- ResultM can read behaviors and events
1218type ResultM = EventM
1246type ResultM = EventM
1220−{-# NOINLINE unsafeNewIORef #-}
1221−unsafeNewIORef :: a -> b -> IORef b
1222−unsafeNewIORef a b = unsafePerformIO $ do
1226instance HasSpiderTimeline x => Functor (Event x) where
1248instance HasSpiderTimeline x => Functor (Event x) where
1227 fmap f = push $ return . Just . f
1249 fmap f = push $ return . Just . f
@@ -1235,26 +1257,35 @@ push f e = cacheEvent (pushCheap f e)
1236{-# INLINABLE pull #-}
1258{-# INLINABLE pull #-}
1237pull :: BehaviorM x a -> Behavior x a
1259pull :: BehaviorM x a -> Behavior x a
1238−pull a = behaviorPull $ Pull
1260+pull a = unsafePerformIO $ do
1239− { pullCompute = a
1261+ ref <- newIORef Nothing
1240− , pullValue = unsafeNewIORef a Nothing
1241#ifdef DEBUG_NODEIDS
1262#ifdef DEBUG_NODEIDS
1242− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
1265+ pure $ behaviorPull $ Pull
1268+#ifdef DEBUG_NODEIDS
1246{-# INLINABLE switch #-}
1273{-# INLINABLE switch #-}
1247switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1248−switch a = eventSwitch $ Switch
1277+ pure $ eventSwitch $ Switch
1249− { switchParent = a
1278+ { switchParent = a
1250− , switchSubscribed = unsafeNewIORef a Nothing
1279+ , switchSubscribed = ref
1253coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1254−coincidence a = eventCoincidence $ Coincidence
1285+ pure $ eventCoincidence $ Coincidence
1255− { coincidenceParent = a
1286+ { coincidenceParent = a
1256− , coincidenceSubscribed = unsafeNewIORef a Nothing
1287+ , coincidenceSubscribed = ref
1259-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1260run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
@@ -1315,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
1315 x' <- evaluate x
1346 x' <- evaluate x
1316 mkWeakPtr x' $
1347 mkWeakPtr x' $
1317 if debugFinalize
1348 if debugFinalize
1318− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
1319 else Nothing
1350 else Nothing
1321type WeakList a = [Weak a]
1352type WeakList a = [Weak a]
1323−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1324#ifdef DEBUG
1359#ifdef DEBUG
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
1367+ subscriberPropagate = \m -> do
1368+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369+ subscriberPropagate subscribed m
1370+ , subscriberInvalidateHeight = \old -> do
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372+ subscriberInvalidateHeight subscribed old
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374+ , subscriberRecalculateHeight = \new -> do
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376+ subscriberRecalculateHeight subscribed new
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1325−withIncreasedDepth :: CanTrace x m => m a -> m a
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1326−withIncreasedDepth a = do
1383+withIncreasedDepth _ a = do
1327− spiderTimeline <- askSpiderTimelineEnv
1328− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) succ
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1329 result <- a
1385 result <- a
1330− liftIO $ modifyIORef' (_spiderTimeline_depth (unSTE spiderTimeline)) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1331 return result
1387 return result
1333−withIncreasedDepth :: m a -> m a
1334−withIncreasedDepth = id
1337−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1339{-# INLINE tracePropagate #-}
1389{-# INLINE tracePropagate #-}
1340tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1341−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
1343{-# INLINE traceInvalidate #-}
1393{-# INLINE traceInvalidate #-}
1344traceInvalidate :: String -> IO ()
1394traceInvalidate :: String -> IO ()
1345−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1347−{-# INLINE traceWhen #-}
1401+{-# INLINE trace #-}
1348−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1349−traceWhen p b message = traceMWhen p b $ return message
1403+trace p message = traceM p $ return message
1351−{-# INLINE traceMWhen #-}
1405+{-# INLINE traceM #-}
1352−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1353−traceMWhen _ b getMessage = when b $ do
1407+traceM _ getMessage = do
1354 message <- getMessage
1408 message <- getMessage
1356− spiderTimeline <- askSpiderTimelineEnv
1357− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1361− liftIO $ putStrLn $ replicate d ' ' <> message
1363whoCreatedIORef :: IORef a -> IO [String]
1450whoCreatedIORef :: IORef a -> IO [String]
1364whoCreatedIORef (IORef a) = whoCreated $! a
1451whoCreatedIORef (IORef a) = whoCreated $! a
1367groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1368groupByHead = \case
1454groupByHead = \case
1369 [] -> []
1455 [] -> []
@@ -1374,20 +1460,54 @@ groupByHead = \case
1374 | otherwise -> (x, xs :| []) : l
1460 | otherwise -> (x, xs :| []) : l
1376listsToForest :: Eq a => [[a]] -> Forest a
1462listsToForest :: Eq a => [[a]] -> Forest a
1377−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1463+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1466+showStacks :: [[String]] -> String
1467+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1469+filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1471+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473+filterStack prefix = id
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1380{-# INLINE propagateSubscriberHold #-}
1498{-# INLINE propagateSubscriberHold #-}
1381propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1382propagateSubscriberHold h a = do
1500propagateSubscriberHold h a = do
1383− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1384 invalidators <- liftIO $ readIORef $ holdInvalidators h
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1385 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1386 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1387 case {-# SCC "apply" #-} apply a v of
1506 case {-# SCC "apply" #-} apply a v of
1388 Nothing -> return ()
1507 Nothing -> return ()
1389 Just v' -> do
1508 Just v' -> do
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1390− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1391 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1392 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1393 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1441,7 +1561,7 @@ getDynHold d = do
1441zeroRef :: IORef Height
1561zeroRef :: IORef Height
1442zeroRef = unsafePerformIO $ newIORef zeroHeight
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1444−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1445getRootSubscribed k r sub = do
1565getRootSubscribed k r sub = do
1446 mSubscribed <- readIORef $ rootSubscribed r
1566 mSubscribed <- readIORef $ rootSubscribed r
1447 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1455,9 +1575,14 @@ getRootSubscribed k r sub = do
1455 let !cached = rootSubscribed r
1575 let !cached = rootSubscribed r
1456 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1457 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1458− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1459 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1460 writeIORef uninitRef $! uninit
1582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1461 let !subscribed = RootSubscribed
1586 let !subscribed = RootSubscribed
1462 { rootSubscribedKey = k
1587 { rootSubscribedKey = k
1463 , rootSubscribedCachedSubscribed = cached
1588 , rootSubscribedCachedSubscribed = cached
@@ -1466,7 +1591,7 @@ getRootSubscribed k r sub = do
1466 , rootSubscribedUninit = uninit
1591 , rootSubscribedUninit = uninit
1467 , rootSubscribedWeakSelf = weakSelf
1592 , rootSubscribedWeakSelf = weakSelf
1468#ifdef DEBUG_NODEIDS
1593#ifdef DEBUG_NODEIDS
1469− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
1472 -- If we die at the same moment that all our children die, they will
1597 -- If we die at the same moment that all our children die, they will
@@ -1502,6 +1627,9 @@ data FanInt x a = FanInt
1502 { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1627 { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1503 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1504 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1507newFanInt :: IO (FanInt x a)
1635newFanInt :: IO (FanInt x a)
@@ -1509,38 +1637,39 @@ newFanInt = do
1509 subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1637 subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1510 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1511 occRef <- newIORef $ error "fanInt: no occurrence"
1639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1512 return $ FanInt
1643 return $ FanInt
1513 { _fanInt_subscribers = subscribers
1644 { _fanInt_subscribers = subscribers
1514 , _fanInt_subscriptionRef = subscriptionRef
1645 , _fanInt_subscriptionRef = subscriptionRef
1515 , _fanInt_occRef = occRef
1646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1518−{-# NOINLINE unsafeNewFanInt #-}
1519−unsafeNewFanInt :: b -> FanInt x a
1520−unsafeNewFanInt b = unsafePerformIO $ do
1524fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1525−fanInt p =
1653+fanInt p = unsafePerformIO $ do
1526− let self = unsafeNewFanInt p
1654+ self <- newFanInt
1527− in EventSelectorInt $ \k -> Event $ \sub -> do
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1528 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1529 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1530− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1531 { subscriberPropagate = \m -> do
1660 { subscriberPropagate = \m -> do
1532 liftIO $ writeIORef (_fanInt_occRef self) m
1661 liftIO $ writeIORef (_fanInt_occRef self) m
1533 scheduleIntClear $ _fanInt_occRef self
1662 scheduleIntClear $ _fanInt_occRef self
1534− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1535− FastWeakBag.traverse b $ \s -> do
1664+ FastWeakBag.traverse_ b $ \s ->
1536 subscriberPropagate s v
1665 subscriberPropagate s v
1537− , subscriberInvalidateHeight = \old -> do
1666+ , subscriberInvalidateHeight = \old ->
1538− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1539− FastWeakBag.traverse b $ \s -> do
1668+ FastWeakBag.traverse_ b $ \s ->
1540 subscriberInvalidateHeight s old
1669 subscriberInvalidateHeight s old
1541− , subscriberRecalculateHeight = \new -> do
1670+ , subscriberRecalculateHeight = \new ->
1542− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1543− FastWeakBag.traverse b $ \s -> do
1672+ FastWeakBag.traverse_ b $ \s ->
1544 subscriberRecalculateHeight s new
1673 subscriberRecalculateHeight s new
1546 liftIO $ do
1675 liftIO $ do
@@ -1554,10 +1683,25 @@ fanInt p =
1554 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1555 return b
1684 return b
1556 Just b -> return b
1685 Just b -> return b
1557− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1558 currentOcc <- readIORef (_fanInt_occRef self)
1687 currentOcc <- readIORef (_fanInt_occRef self)
1559− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1560− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1562{-# INLINABLE getFanSubscribed #-}
1706{-# INLINABLE getFanSubscribed #-}
1563getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1578,13 +1722,16 @@ getFanSubscribed k f sub = do
1578 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1579 occRef <- liftIO $ newIORef parentOcc
1723 occRef <- liftIO $ newIORef parentOcc
1580 when (isJust parentOcc) $ scheduleClear occRef
1724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1581 let subscribed = FanSubscribed
1728 let subscribed = FanSubscribed
1582 { fanSubscribedCachedSubscribed = fanSubscribed f
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1583 , fanSubscribedOccurrence = occRef
1730 , fanSubscribedOccurrence = occRef
1584 , fanSubscribedParent = subscription
1731 , fanSubscribedParent = subscription
1585 , fanSubscribedSubscribers = subscribersRef
1732 , fanSubscribedSubscribers = subscribersRef
1586#ifdef DEBUG_NODEIDS
1733#ifdef DEBUG_NODEIDS
1587− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
1590 let !self = (k, subscribed)
1737 let !self = (k, subscribed)
@@ -1644,6 +1791,9 @@ getSwitchSubscribed s sub = do
1644 when (isJust parentOcc) $ scheduleClear occRef
1791 when (isJust parentOcc) $ scheduleClear occRef
1645 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1646 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1647 let !subscribed = SwitchSubscribed
1797 let !subscribed = SwitchSubscribed
1648 { switchSubscribedCachedSubscribed = switchSubscribed s
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1649 , switchSubscribedOccurrence = occRef
1799 , switchSubscribedOccurrence = occRef
@@ -1656,7 +1806,7 @@ getSwitchSubscribed s sub = do
1656 , switchSubscribedCurrentParent = subscriptionRef
1806 , switchSubscribedCurrentParent = subscriptionRef
1657 , switchSubscribedWeakSelf = weakSelf
1807 , switchSubscribedWeakSelf = weakSelf
1658#ifdef DEBUG_NODEIDS
1808#ifdef DEBUG_NODEIDS
1659− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
1662 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1701,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
1701 scheduleClear innerSubdRef
1851 scheduleClear innerSubdRef
1702 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1703 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1704 let subscribed = CoincidenceSubscribed
1857 let subscribed = CoincidenceSubscribed
1705 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1706 , coincidenceSubscribedOccurrence = occRef
1859 , coincidenceSubscribedOccurrence = occRef
@@ -1711,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
1711 , coincidenceSubscribedInnerParent = innerSubdRef
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1712 , coincidenceSubscribedWeakSelf = weakSelf
1865 , coincidenceSubscribedWeakSelf = weakSelf
1713#ifdef DEBUG_NODEIDS
1866#ifdef DEBUG_NODEIDS
1714− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
1717 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1746,7 +1899,7 @@ mergeCheap
1746 => (forall a. q a -> Event x (v a))
1899 => (forall a. q a -> Event x (v a))
1747 -> DynamicS x (PatchDMap k q)
1900 -> DynamicS x (PatchDMap k q)
1748 -> Event x (DMap k v)
1901 -> Event x (DMap k v)
1749−mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1751 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1752 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1761,7 +1914,9 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1761 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1762 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1763 forM_ mOldSubd $ \oldSubd -> do
1916 forM_ mOldSubd $ \oldSubd -> do
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1764− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1765 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1766 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1767 foldM f ([], oldParents) $ DMap.toList p
1922 foldM f ([], oldParents) $ DMap.toList p
@@ -1786,7 +1941,7 @@ mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1786 => (forall a. q a -> Event x (v a))
1941 => (forall a. q a -> Event x (v a))
1787 -> DynamicS x (PatchDMapWithMove k q)
1942 -> DynamicS x (PatchDMapWithMove k q)
1788 -> Event x (DMap k v)
1943 -> Event x (DMap k v)
1789−mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1791 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1792 updateMe subscriber heightBagRef oldParents p = do
1947 updateMe subscriber heightBagRef oldParents p = do
@@ -1805,13 +1960,17 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1805 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1806 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1807 Nothing -> do
1962 Nothing -> do
1808− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1809 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1810 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1811 Just toKey -> do
1968 Just toKey -> do
1812 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1813 return Nothing
1970 return Nothing
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1814− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1815 return (toDelete, applyAlways p' oldParents)
1974 return (toDelete, applyAlways p' oldParents)
1816 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1817 getInitialSubscribers initialParents subscriber = do
1976 getInitialSubscribers initialParents subscriber = do
@@ -1836,6 +1995,8 @@ type MergeUpdateFunc k v x p s
1837 -> EventM x ([EventSubscription x], DMap k s)
1996 -> EventM x ([EventSubscription x], DMap k s)
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1839type MergeInitFunc k v q x s
2000type MergeInitFunc k v q x s
1840 = DMap k q
2001 = DMap k q
1841 -> (forall a. EventM x (k a) -> Subscriber x (v a))
2002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -1859,14 +2020,17 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
1859invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
1860invalidateMergeHeight' heightRef sub = do
2021invalidateMergeHeight' heightRef sub = do
1861 oldHeight <- readIORef heightRef
2022 oldHeight <- readIORef heightRef
1862− 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
2023+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024+ when (oldHeight /= invalidHeight) $ do
1863 writeIORef heightRef $! invalidHeight
2025 writeIORef heightRef $! invalidHeight
1864 subscriberInvalidateHeight sub oldHeight
2026 subscriberInvalidateHeight sub oldHeight
1866revalidateMergeHeight :: Merge x k v s -> IO ()
2028revalidateMergeHeight :: Merge x k v s -> IO ()
1867revalidateMergeHeight m = do
2029revalidateMergeHeight m = do
1868 currentHeight <- readIORef $ _merge_heightRef m
2030 currentHeight <- readIORef $ _merge_heightRef m
1869− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2032+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033+ when (currentHeight == invalidHeight) $ do
1870 heights <- readIORef $ _merge_heightBagRef m
2034 heights <- readIORef $ _merge_heightBagRef m
1871 parents <- readIORef $ _merge_parentsRef m
2035 parents <- readIORef $ _merge_parentsRef m
1872 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1874,7 +2038,7 @@ revalidateMergeHeight m = do
1874 LT -> return ()
2038 LT -> return ()
1875 EQ -> do
2039 EQ -> do
1876 let height = succHeight $ heightBagMax heights
2040 let height = succHeight $ heightBagMax heights
1877− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1878 writeIORef (_merge_heightRef m) $! height
2042 writeIORef (_merge_heightRef m) $! height
1879 subscriberRecalculateHeight (_merge_sub m) height
2043 subscriberRecalculateHeight (_merge_sub m) height
1880 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -1882,36 +2046,45 @@ revalidateMergeHeight m = do
1882scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1883scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
1884 vals <- liftIO $ readIORef $ _merge_accumRef m
2048 vals <- liftIO $ readIORef $ _merge_accumRef m
1885− 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
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
1886 --TODO: Assert that m is not empty
2052 --TODO: Assert that m is not empty
1887 subscriberPropagate (_merge_sub m) vals
2053 subscriberPropagate (_merge_sub m) vals
2055+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056+checkCycle subscribed = liftIO $ do
2057+ height <- readIORef (eventSubscribedHeightRef subscribed)
2059+ -- currentHeight <- getCurrentHeight
2060+ -- when (height <= currentHeight) $ if height /= invalidHeight
2062+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2065+ when (height == invalidHeight) $
2068+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070+ throwIO (EventLoopException stacks)
2072+ throwIO EventLoopException
1889−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
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)
1890−mergeSubscriber m getKey = Subscriber
2077+mergeSubscriber subscribed m getKey = Subscriber
1891 { subscriberPropagate = \a -> do
2078 { subscriberPropagate = \a -> do
1892 oldM <- liftIO $ readIORef $ _merge_accumRef m
2079 oldM <- liftIO $ readIORef $ _merge_accumRef m
1893 k <- getKey
2080 k <- getKey
1894− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1895 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1896 liftIO $ writeIORef (_merge_accumRef m) $! newM
2083 liftIO $ writeIORef (_merge_accumRef m) $! newM
1897 when (DMap.null oldM) $ do -- Only schedule the firing once
2084 when (DMap.null oldM) $ do -- Only schedule the firing once
1898 height <- liftIO $ readIORef $ _merge_heightRef m
2085 height <- liftIO $ readIORef $ _merge_heightRef m
1899− --TODO: assertions about height
2086+ checkCycle subscribed
1900− currentHeight <- getCurrentHeight
2087+
1901− when (height <= currentHeight) $ do
1902− if height /= invalidHeight
1904− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1905− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1908− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1909− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1910− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1914− error $ "Causality loop found" <> cycleInfo
1915 scheduleMergeSelf m height
2088 scheduleMergeSelf m height
1916 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1917 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1922,31 +2095,45 @@ mergeSubscriber m getKey = Subscriber
1924--TODO: Be able to run as much of this as possible promptly
2097--TODO: Be able to run as much of this as possible promptly
1925−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2098+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1926−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2099+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
1927 where updateMe = do
2100 where updateMe = do
1928 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1929− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1930 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
1931 return subscriptionsToKill
2104 return subscriptionsToKill
1933{-# INLINE mergeGCheap' #-}
2106{-# INLINE mergeGCheap' #-}
1934mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1935− => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
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)
1936−mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1937 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1938 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1939 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1940 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1941 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
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
1942− let m = Merge
2129+ m = Merge
1943 { _merge_parentsRef = parentsRef
2130 { _merge_parentsRef = parentsRef
1944 , _merge_heightBagRef = heightBagRef
2131 , _merge_heightBagRef = heightBagRef
1945 , _merge_heightRef = heightRef
2132 , _merge_heightRef = heightRef
1946 , _merge_sub = sub
2133 , _merge_sub = sub
1947 , _merge_accumRef = accumRef
2134 , _merge_accumRef = accumRef
1949− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1950 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1951 myHeight = if invalidHeight `elem` heights
2138 myHeight = if invalidHeight `elem` heights
1952 then invalidHeight
2139 then invalidHeight
@@ -1955,31 +2142,29 @@ mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1955 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1956 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1957 else (Nothing, dm)
2144 else (Nothing, dm)
1958− unless (DMap.null accum) $ do
1959− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1960 liftIO $ writeIORef accumRef $! accum
2146 liftIO $ writeIORef accumRef $! accum
1961 liftIO $ writeIORef heightRef $! myHeight
2147 liftIO $ writeIORef heightRef $! myHeight
1962 liftIO $ writeIORef heightBagRef $! myHeightBag
2148 liftIO $ writeIORef heightBagRef $! myHeightBag
1963− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1964 liftIO $ writeIORef parentsRef $! initialParentState
2149 liftIO $ writeIORef parentsRef $! initialParentState
1965 defer $ SomeMergeInit $ do
2150 defer $ SomeMergeInit $ do
1966− let s = Subscriber
2151+ let changeSubscriber = Subscriber
1967 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1968− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
1969− defer $ updateMerge m updateFunc a
2154+ defer $ updateMerge subscribed m updateFunc a
1970 , subscriberInvalidateHeight = \_ -> return ()
2155 , subscriberInvalidateHeight = \_ -> return ()
1971 , subscriberRecalculateHeight = \_ -> return ()
2156 , subscriberRecalculateHeight = \_ -> return ()
1973− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1974− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1975 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
1976 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
1977 -- its subscription.
2162 -- its subscription.
1978− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1979 let unsubscribeAll = destroy =<< readIORef parentsRef
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
1980− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
1984mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2169mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1985mergeInt = cacheEvent . mergeIntCheap
2170mergeInt = cacheEvent . mergeIntCheap
@@ -1992,13 +2177,22 @@ mergeIntCheap d = Event $ \sub -> do
1992 heightRef <- liftIO $ newIORef zeroHeight
2177 heightRef <- liftIO $ newIORef zeroHeight
1993 heightBagRef <- liftIO $ newIORef heightBagEmpty
2178 heightBagRef <- liftIO $ newIORef heightBagEmpty
1994 parents <- liftIO $ FastMutableIntMap.newEmpty
2179 parents <- liftIO $ FastMutableIntMap.newEmpty
2180+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181+ let subscribed = EventSubscribed
2182+ { eventSubscribedHeightRef = heightRef
2183+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2185+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186+ , eventSubscribedHasOwnHeightRef = False
2187+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
1995 let scheduleSelf = do
2190 let scheduleSelf = do
1996 height <- liftIO $ readIORef $ heightRef
2191 height <- liftIO $ readIORef $ heightRef
1997 scheduleMerge' height heightRef $ do
2192 scheduleMerge' height heightRef $ do
1998 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
1999 subscriberPropagate sub vals
2194 subscriberPropagate sub vals
2000− invalidateMyHeight = do
2001− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
2002 recalculateMyHeight = do
2196 recalculateMyHeight = do
2003 currentHeight <- readIORef heightRef
2197 currentHeight <- readIORef heightRef
2004 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?
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,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
2008 LT -> return ()
2202 LT -> return ()
2009 EQ -> do
2203 EQ -> do
2010 let height = succHeight $ heightBagMax heights
2204 let height = succHeight $ heightBagMax heights
2011− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2012 writeIORef heightRef $! height
2206 writeIORef heightRef $! height
2013 subscriberRecalculateHeight sub height
2207 subscriberRecalculateHeight sub height
2014 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2015 mySubscriber k = Subscriber
2209 mySubscriber k = Subscriber
2016 { subscriberPropagate = \a -> do
2210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2017 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2018 liftIO $ FastMutableIntMap.insert accum k a
2214 liftIO $ FastMutableIntMap.insert accum k a
2019 when wasEmpty scheduleSelf
2215 when wasEmpty scheduleSelf
@@ -2047,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
2047 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2048 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2049 return Nothing
2245 return Nothing
2050− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2051 defer $ SomeMergeInit $ do
2246 defer $ SomeMergeInit $ do
2052 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
@@ -2061,36 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
2061 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2062 liftIO $ for_ oldParents $ \oldParent -> do
2257 liftIO $ for_ oldParents $ \oldParent -> do
2063 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2260+ print ("updateMe", oldParentHeight)
2064 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2065 return $ IntMap.elems oldParents
2262 return $ IntMap.elems oldParents
2066− let s = Subscriber
2263+ let changeSubscriber = Subscriber
2067 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2068 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2069 defer $ updateMe a
2266 defer $ updateMe a
2070 , subscriberInvalidateHeight = \_ -> return ()
2267 , subscriberInvalidateHeight = \_ -> return ()
2071 , subscriberRecalculateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
2073− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2074 forM_ change $ \c -> defer $ updateMe c
2271 forM_ change $ \c -> defer $ updateMe c
2075 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2076 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2077 -- its subscription.
2274 -- its subscription.
2078− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2079 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2080− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
2084newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2085newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
2282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
2087fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2284fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2088−fanG e =
2285+fanG e = unsafePerformIO $ do
2286+ ref <- newIORef Nothing
2089 let f = Fan
2287 let f = Fan
2090 { fanParent = e
2288 { fanParent = e
2091− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
2093− in EventSelectorG $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
2095runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2096runHoldInits holdInitRef dynInitRef mergeInitRef = do
2294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2161,19 +2359,19 @@ runFrame a = SpiderHost $ do
2161 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2162 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2163 writeIORef vRef v
2361 writeIORef vRef v
2164− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
2165 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2166 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2167 writeIORef (eventEnvMergeUpdates env) []
2365 writeIORef (eventEnvMergeUpdates env) []
2168− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
2169 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2170− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2171 toReconnect <- readIORef toReconnectRef
2369 toReconnect <- readIORef toReconnectRef
2172 clearEventEnv env
2370 clearEventEnv env
2173 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2174 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2175 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2176− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2177 finalize wi
2375 finalize wi
2178 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2179 wi' <- mkWeakPtrWithDebug i "wi'"
2377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2187,7 +2385,7 @@ runFrame a = SpiderHost $ do
2187 subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2385 subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2189 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2190− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2191 EventRoot _ -> "EventRoot"
2389 EventRoot _ -> "EventRoot"
2192 EventNever -> "EventNever"
2390 EventNever -> "EventNever"
2193 _ -> "something else"
2391 _ -> "something else"
@@ -2202,7 +2400,7 @@ runFrame a = SpiderHost $ do
2202 myHeight <- readIORef $ switchSubscribedHeight subscribed
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
2203 when (parentHeight /= myHeight) $ do
2401 when (parentHeight /= myHeight) $ do
2204 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2205− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2206 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
2404 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
2207 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2208 unsubscribe subscription
2406 unsubscribe subscription
@@ -2243,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
2243 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2244 when (oldHeight /= invalidHeight) $ do
2442 when (oldHeight /= invalidHeight) $ do
2245 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2246− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2248updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2249updateSwitchHeight new subscribed = do
2447updateSwitchHeight new subscribed = do
@@ -2251,7 +2449,7 @@ updateSwitchHeight new subscribed = do
2251 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2252 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2253 writeIORef (switchSubscribedHeight subscribed) $! new
2451 writeIORef (switchSubscribedHeight subscribed) $! new
2254− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2256recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2257recalculateCoincidenceHeight subscribed = do
2455recalculateCoincidenceHeight subscribed = do
@@ -2260,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
2260 height <- calculateCoincidenceHeight subscribed
2458 height <- calculateCoincidenceHeight subscribed
2261 when (height /= invalidHeight) $ do
2459 when (height /= invalidHeight) $ do
2262 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2263− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2265calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2266calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2322,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2322 {-# INLINABLE headE #-}
2520 {-# INLINABLE headE #-}
2323 headE = R.slowHeadE
2521 headE = R.slowHeadE
2324-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2326instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2327 {-# INLINABLE sample #-}
2527 {-# INLINABLE sample #-}
@@ -2343,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2343 {-# INLINABLE headE #-}
2543 {-# INLINABLE headE #-}
2344 headE = R.slowHeadE
2544 headE = R.slowHeadE
2345-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2347instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2348 {-# INLINE return #-}
2551 {-# INLINE return #-}
@@ -2351,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2351 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2352 {-# INLINE (>>) #-}
2555 {-# INLINE (>>) #-}
2353 (>>) = (*>)
2556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2354 {-# INLINE fail #-}
2558 {-# INLINE fail #-}
2355 fail _ = error "Dynamic does not support 'fail'"
2559 fail _ = error "Dynamic does not support 'fail'"
2357{-# INLINABLE newJoinDyn #-}
2562{-# INLINABLE newJoinDyn #-}
2358newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2404,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2404 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2405 {-# INLINABLE headE #-}
2610 {-# INLINABLE headE #-}
2406 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2408instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2409 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2420,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2420 {-# INLINABLE headE #-}
2628 {-# INLINABLE headE #-}
2421 headE = R.slowHeadE
2629 headE = R.slowHeadE
2422-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2424instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2425 {-# INLINABLE sample #-}
2635 {-# INLINABLE sample #-}
@@ -2440,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2440 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2441 {-# INLINABLE headE #-}
2651 {-# INLINABLE headE #-}
2442 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2444--------------------------------------------------------------------------------
2656--------------------------------------------------------------------------------
2445-- Deprecated items
2657-- Deprecated items
@@ -2477,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
2478 return result
2690 return result
2480−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2481 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2482 newFanEventWithTrigger f = SpiderHost $ do
2694 newFanEventWithTrigger f = SpiderHost $ do
2483 es <- newFanEventWithTriggerIO f
2695 es <- newFanEventWithTriggerIO f
2484 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2486−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2487 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2488 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2489 es <- newFanEventWithTriggerIO f
2701 es <- newFanEventWithTriggerIO f
@@ -2563,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2563 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2564 {-# INLINABLE mergeG #-}
2776 {-# INLINABLE mergeG #-}
2566− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2567 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2568 -> DMap k q
2780 -> DMap k q
2569 -> R.Event (SpiderTimeline x) (DMap k v)
2781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2631,8 +2843,14 @@ instance Monad (SpiderHost x) where
2631 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2632 {-# INLINABLE return #-}
2844 {-# INLINABLE return #-}
2633 return x = SpiderHost $ return x
2845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
2634 {-# INLINABLE fail #-}
2847 {-# INLINABLE fail #-}
2848+ fail = MonadFail.fail
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2635− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
2637-- | Run an action affecting the global Spider timeline; this will be guarded by
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2638-- a mutex for that timeline
2856-- a mutex for that timeline
@@ -2654,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
2654 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2655 {-# INLINABLE return #-}
2873 {-# INLINABLE return #-}
2656 return x = SpiderHostFrame $ return x
2874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
2657 {-# INLINABLE fail #-}
2876 {-# INLINABLE fail #-}
2658 fail s = SpiderHostFrame $ fail s
2877 fail s = SpiderHostFrame $ fail s
2660instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2661 notReadyUntil _ = pure ()
2881 notReadyUntil _ = pure ()
2662 notReady = pure ()
2882 notReady = pure ()
2664−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2665newEventWithTriggerIO f = do
2885newEventWithTriggerIO f = do
2666 es <- newFanEventWithTriggerIO $ \Refl -> f
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2667 return $ select es Refl
2887 return $ select es Refl
2669−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2670newFanEventWithTriggerIO f = do
2890newFanEventWithTriggerIO f = do
2671 occRef <- newIORef DMap.empty
2891 occRef <- newIORef DMap.empty
2672 subscribedRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
@@ -2700,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2700instance PrimMonad (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2701 type PrimState (SpiderHostFrame x) = PrimState IO
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2702 primitive = SpiderHostFrame . EventM . primitive
2922 primitive = SpiderHostFrame . EventM . primitive
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()