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