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