@@ -9,22 +9,16 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
1213{-# LANGUAGE RankNTypes #-}
1314{-# LANGUAGE RoleAnnotations #-}
1415{-# LANGUAGE ScopedTypeVariables #-}
1516{-# LANGUAGE TypeFamilies #-}
1617{-# LANGUAGE TypeOperators #-}
1718{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2419#ifdef USE_REFLEX_OPTIMIZER
2520{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2621#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2822-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2923-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3024module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -38,17 +32,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3832import Control.Monad.Exception
3933import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4034import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
35+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4436import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4737import Data.Align
4838import Data.Coerce
49−import Data.Dependent.Map (DMap)
39+import Data.Dependent.Map (DMap, DSum (..))
5040import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5241import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5342import qualified Data.FastMutableIntMap as FastMutableIntMap
5443import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,15 +48,13 @@ import Data.GADT.Compare
5948import Data.IntMap.Strict (IntMap)
6049import qualified Data.IntMap.Strict as IntMap
6150import Data.IORef
62−import Data.Kind (Type)
6351import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
52+import Data.Monoid ((<>))
6553import Data.Proxy
6654import Data.These
6755import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6956import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
57+import GHC.Exts
7158import GHC.IORef (IORef (..))
7259import GHC.Stack
7360import Reflex.FastWeak
@@ -86,46 +73,37 @@ import Data.Zip (Zip (..))
8673
8774#ifdef DEBUG_CYCLES
8875import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9176import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9277import qualified Data.List.NonEmpty as NonEmpty
78+import Data.Monoid (mempty)
9379import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
80+#endif
9581
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
82+import Data.FastWeakBag (FastWeakBag)
9783import qualified Data.FastWeakBag as FastWeakBag
98−
9984import Data.Reflection
10085import Data.Some (Some(Some))
10186import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10387import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10488import qualified Data.WeakBag as WeakBag
10589import qualified Reflex.Class
10690import qualified Reflex.Class as R
10791import qualified Reflex.Host.Class
10892import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
93+import Reflex.Patch
94+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11295
11396#ifdef DEBUG_TRACE_EVENTS
11497import qualified Data.ByteString.Char8 as BS8
11598import System.IO (stderr)
116−import Data.List (isPrefixOf)
11799#endif
118100
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123101#ifdef DEBUG_TRACE_EVENTS
102+
124103withStackOneLine :: (BS8.ByteString -> a) -> a
125104withStackOneLine expr = unsafePerformIO $ do
126105 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
106+ return (expr (BS8.pack (unwords (reverse stack))))
129107
130108#endif
131109
@@ -136,42 +114,28 @@ debugInvalidateHeight :: Bool
136114debugInvalidate :: Bool
137115
138116#ifdef DEBUG
117+
139118#define DEBUG_NODEIDS
140119
141−#ifdef DEBUG_TRACE_PROPAGATION
142120debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146121
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150122debugInvalidateHeight = False
151−#endif
152123
153−#ifdef DEBUG_TRACE_INVALIDATION
154124debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158125
159126class HasNodeId a where
160127 getNodeId :: a -> Int
161128
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
129+instance HasNodeId (Hold x p a) where
169130 getNodeId = holdNodeId
170131
132+instance HasNodeId (PushSubscribed x a b) where
133+ getNodeId = pushSubscribedNodeId
134+
171135instance HasNodeId (SwitchSubscribed x a) where
172136 getNodeId = switchSubscribedNodeId
173137
174−instance HasNodeId (FanSubscribed x v a) where
138+instance HasNodeId (FanSubscribed x a) where
175139 getNodeId = fanSubscribedNodeId
176140
177141instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +149,41 @@ instance HasNodeId (Pull x a) where
185149
186150{-# INLINE showNodeId #-}
187151showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
152+showNodeId = ("#"<>) . show . getNodeId
153+
154+showSubscriberType :: Subscriber x a -> String
155+showSubscriberType = \case
156+ SubscriberPush _ _ -> "SubscriberPush"
157+ SubscriberMerge _ _ -> "SubscriberMerge"
158+ SubscriberFan _ -> "SubscriberFan"
159+ SubscriberMergeChange _ -> "SubscriberMergeChange"
160+ SubscriberHold _ -> "SubscriberHold"
161+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
162+ SubscriberSwitch _ -> "SubscriberSwitch"
163+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
164+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
165+ SubscriberHandle -> "SubscriberHandle"
166+
167+showEventType :: Event x a -> String
168+showEventType = \case
169+ EventRoot _ _ -> "EventRoot"
170+ EventNever -> "EventNever"
171+ EventPush _ -> "EventPush"
172+ EventMerge _ -> "EventMerge"
173+ EventFan _ _ -> "EventFan"
174+ EventSwitch _ -> "EventSwitch"
175+ EventCoincidence _ -> "EventCoincidence"
176+ EventHold _ -> "EventHold"
177+ EventDyn _ -> "EventDyn"
178+ EventHoldIdentity _ -> "EventHoldIdentity"
179+ EventDynIdentity _ -> "EventDynIdentity"
193180
194181#else
195182
196183debugPropagate = False
184+
197185debugInvalidateHeight = False
186+
198187debugInvalidate = False
199188
200189-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +191,6 @@ debugInvalidate = False
202191showNodeId :: a -> String
203192showNodeId _ = ""
204193
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209194#endif
210195
211196#ifdef DEBUG_NODEIDS
@@ -215,6 +200,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215200
216201newNodeId :: IO Int
217202newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
203+
204+{-# NOINLINE unsafeNodeId #-}
205+unsafeNodeId :: a -> Int
206+unsafeNodeId a = unsafePerformIO $ do
207+ touch a
208+ newNodeId
218209#endif
219210
220211--------------------------------------------------------------------------------
@@ -251,9 +242,9 @@ subscribeAndRead = unEvent
251242-- caching; if the computation function is very cheap, this is (much) more
252243-- efficient than 'push'
253244{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
245+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255246pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
247+ (subscription, occ) <- subscribeAndRead e $ sub
257248 { subscriberPropagate = \a -> do
258249 mb <- f a
259250 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +263,10 @@ terminalSubscriber p = Subscriber
272263
273264-- | Subscribe to an Event only for the duration of one occurrence
274265{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
266+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276267subscribeAndReadHead e sub = do
277268 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
269+ (subscription, occ) <- subscribeAndRead e $ sub
279270 { subscriberPropagate = \a -> do
280271 liftIO $ unsubscribe =<< readIORef subscriptionRef
281272 subscriberPropagate sub a
@@ -286,42 +277,24 @@ subscribeAndReadHead e sub = do
286277 return (subscription, occ)
287278
288279--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
280+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290281headE originalE = do
291282 parent <- liftIO $ newIORef $ Just originalE
292283 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293284 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
285+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295286 when (isJust occ) clearParent
296− return $ Event $ \sub ->
287+ return $ Event $ \sub -> do
297288 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
289+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299290 Just e -> subscribeAndReadHead e sub
300291
301292data CacheSubscribed x a
302293 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303294 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304295 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308296 }
309297
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
311−nowSpiderEventM =
312− SpiderEvent <$> now
313−
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
315− ) => m (Event x ())
316−now = do
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
322− , occ
323− )
324−
325298-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326299-- repeatedly
327300--
@@ -336,33 +309,27 @@ cacheEvent e =
336309#else
337310 Event $
338311#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
312+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
313+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
314+ in \sub -> {-# SCC "cacheEvent" #-} do
343315#ifdef DEBUG_TRACE_EVENTS
344316 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345317#endif
346318 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347319 Just subscribedTicket -> return subscribedTicket
348320 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352321 subscribers <- liftIO FastWeakBag.empty
353322 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
354−#ifdef DEBUG_NODEIDS
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
356−#else
357323 (parentSub, occ) <- subscribeAndRead e $ Subscriber
358−#endif
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365− }
324+ { subscriberPropagate = \a -> do
325+ liftIO $ writeIORef occRef $ Just a
326+ scheduleClear occRef
327+ propagateFast a subscribers
328+ , subscriberInvalidateHeight = \old -> do
329+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
330+ , subscriberRecalculateHeight = \new -> do
331+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
332+ }
366333 when (isJust occ) $ do
367334 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368335 scheduleClear occRef
@@ -370,45 +337,29 @@ cacheEvent e =
370337 { _cacheSubscribed_subscribers = subscribers
371338 , _cacheSubscribed_parent = parentSub
372339 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376340 }
377341 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378342 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379343 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
411−
344+ liftIO $ do
345+ subscribed <- getFastWeakTicketValue subscribedTicket
346+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
347+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
348+ let es = EventSubscription
349+ { _eventSubscription_unsubscribe = do
350+ FastWeakBag.remove ticket
351+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
352+ when isEmpty $ do
353+ writeIORef mSubscribedRef emptyFastWeak
354+ unsubscribe $ _cacheSubscribed_parent subscribed
355+ touch ticket
356+ touch subscribedTicket
357+ , _eventSubscription_subscribed = EventSubscribed
358+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
359+ , eventSubscribedRetained = toAny subscribedTicket
360+ }
361+ }
362+ return (es, occ)
412363
413364subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414365subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +371,13 @@ wrap tag getSpecificSubscribed sub = do
420371 let es = tag subd
421372 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422373
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
374+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424375eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425376
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429377eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
378+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431379
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
380+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433381eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434382
435383eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +412,16 @@ data Subscriber x a = Subscriber
464412 , subscriberRecalculateHeight :: !(Height -> IO ())
465413 }
466414
415+--TODO: Move this comment to WeakBag
416+-- These function are constructor functions that are marked NOINLINE so they are
417+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
418+-- so any weak references that are attached to the constructors will have their
419+-- finalizer run. Using the opaque constructor, does not see the
420+-- constructor application, so it behaves like an IORef and cannot be fused away.
421+--
422+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
423+-- the weak pointer to it in some cases.
424+
467425newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468426newSubscriberHold h = return $ Subscriber
469427 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +429,85 @@ newSubscriberHold h = return $ Subscriber
471429 , subscriberRecalculateHeight = \_ -> return ()
472430 }
473431
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
432+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
433+newSubscriberFan subscribed = return $ Subscriber
476434 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477435 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
436+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479437 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480438 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
439+ let f _ (Pair (Identity v) subsubs) = do
482440 propagate v $ _fanSubscribedChildren_list subsubs
483441 return $ Constant ()
484442 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485443 return ()
486444 , subscriberInvalidateHeight = \old -> do
445+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487446 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
447+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
448+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489449 , subscriberRecalculateHeight = \new -> do
450+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490451 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
452+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
453+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492454 }
493455
494456newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
457+newSubscriberSwitch subscribed = return $ Subscriber
496458 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
459+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497460 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498461 scheduleClear $ switchSubscribedOccurrence subscribed
499462 propagate a $ switchSubscribedSubscribers subscribed
500463 , subscriberInvalidateHeight = \_ -> do
464+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501465 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502466 when (oldHeight /= invalidHeight) $ do
503467 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
468+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
469+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
470+ , subscriberRecalculateHeight = \new -> do
471+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
472+ updateSwitchHeight new subscribed
473+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
474+ }
507475
508476newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
477+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510478 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
479+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511480 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512481 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513482 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514483 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515484 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517485 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518486 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519487 case occ of
520− Nothing ->
488+ Nothing -> do
521489 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522490 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
491+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
492+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525493 Just o -> do -- Since it's already firing, no need to adjust height
526494 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527495 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528496 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
497+ , subscriberInvalidateHeight = \_ -> do
498+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
499+ invalidateCoincidenceHeight subscribed
500+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
501+ , subscriberRecalculateHeight = \_ -> do
502+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
503+ recalculateCoincidenceHeight subscribed
504+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531505 }
532506
533507newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
508+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535509 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
510+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536511 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537512 case occ of
538513 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +515,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540515 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541516 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542517 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
518+ , subscriberInvalidateHeight = \_ -> do
519+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
520+ invalidateCoincidenceHeight subscribed
521+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
522+ , subscriberRecalculateHeight = \_ -> do
523+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
524+ recalculateCoincidenceHeight subscribed
525+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545526 }
546527
547528invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +532,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551532recalculateSubscriberHeight = flip subscriberRecalculateHeight
552533
553534-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
535+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
536+propagate a subscribers = withIncreasedDepth $ do
556537 -- 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
557538 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
539+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559540
560541-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
542+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
543+propagateFast a subscribers = withIncreasedDepth $ do
563544 -- 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
564545 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
546+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566547
567548--------------------------------------------------------------------------------
568549-- EventSubscribed
@@ -571,16 +552,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571552toAny :: a -> Any
572553toAny = unsafeCoerce
573554
574−-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575−-- existential type? Sadly, GHC does not currently know how to unbox types
576−-- with existentially quantified fields. So instead we just coerce values
577−-- to type Any on the way in. Since we never coerce them back, this is
578−-- perfectly safe.
579555data EventSubscribed x = EventSubscribed
580556 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581557 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582558#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
559+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584560 , eventSubscribedHasOwnHeightRef :: !Bool
585561 , eventSubscribedWhoCreated :: !(IO [String])
586562#endif
@@ -607,23 +583,13 @@ eventSubscribedNever = EventSubscribed
607583 , eventSubscribedWhoCreated = return ["never"]
608584#endif
609585 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620586
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
587+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622588eventSubscribedFan !subscribed = EventSubscribed
623589 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624590 , eventSubscribedRetained = toAny subscribed
625591#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
592+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627593 , eventSubscribedHasOwnHeightRef = False
628594 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629595#endif
@@ -636,7 +602,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636602#ifdef DEBUG_CYCLES
637603 , eventSubscribedGetParents = do
638604 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
605+ return [Some $ _eventSubscription_subscribed s]
640606 , eventSubscribedHasOwnHeightRef = True
641607 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642608#endif
@@ -649,8 +615,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649615#ifdef DEBUG_CYCLES
650616 , eventSubscribedGetParents = do
651617 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
618+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
619+ innerParents = maybeToList $ fmap Some innerSubscription
654620 return $ outerParent : innerParents
655621 , eventSubscribedHasOwnHeightRef = True
656622 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +630,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664630whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665631whoCreatedEventSubscribed = eventSubscribedWhoCreated
666632
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
633+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668634walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
635+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670636 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671637 when (h == invalidHeight) $ do
672638 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
639+ modify (Some s :)
674640 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
641+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676642 return subscribers
677643#endif
678644
@@ -709,7 +675,7 @@ behaviorPull !p = Behavior $ do
709675 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710676 parentsRef <- liftIO $ newIORef []
711677 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
678+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713679 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714680 parents <- liftIO $ readIORef parentsRef
715681 let subscribed = PullSubscribed
@@ -744,46 +710,42 @@ readBehaviorUntracked b = do
744710-- Dynamic
745711--------------------------------------------------------------------------------
746712
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
713+data Dynamic x p = Dynamic
714+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751715 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752716 }
753717
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
718+dynamicHold :: Hold x p -> Dynamic x p
760719dynamicHold !h = Dynamic
761720 { dynamicCurrent = behaviorHold h
762721 , dynamicUpdated = eventHold h
763722 }
764723
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
724+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766725dynamicHoldIdentity = dynamicHold
767726
768−dynamicConst :: PatchTarget p -> DynamicS x p
727+dynamicConst :: PatchTarget p -> Dynamic x p
769728dynamicConst !a = Dynamic
770729 { dynamicCurrent = behaviorConst a
771730 , dynamicUpdated = eventNever
772731 }
773732
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
733+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775734dynamicDyn !d = Dynamic
776735 { dynamicCurrent = behaviorDyn d
777736 , dynamicUpdated = eventDyn d
778737 }
779738
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
739+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781740dynamicDynIdentity = dynamicDyn
782741
783742--------------------------------------------------------------------------------
784743-- Combinators
785744--------------------------------------------------------------------------------
786745
746+--TODO: Figure out why certain things are not 'representational', then make them
747+--representational so we can use coerce
748+
787749--type role Hold representational
788750data Hold x p
789751 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +766,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804766
805767-- | Stores all global data relevant to a particular Spider timeline; only one
806768-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
811−
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
769+data SpiderTimelineEnv x = SpiderTimelineEnv
813770 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814771 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815772#ifdef DEBUG
816773 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817774#endif
818775 }
819−type role SpiderTimelineEnv' phantom
776+type role SpiderTimelineEnv nominal
820777
821778instance Eq (SpiderTimelineEnv x) where
822779 _ == _ = True -- Since only one exists of each type
823780
824781instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
782+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826783 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827784 else Nothing
828785
@@ -845,7 +802,7 @@ runEventM :: EventM x a -> IO a
845802runEventM = unEventM
846803
847804asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
805+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849806
850807class MonadIO m => Defer a m where
851808 getDeferralQueue :: m (IORef [a])
@@ -983,9 +940,9 @@ getHoldEventSubscription h = do
983940
984941type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985942
943+--type role BehaviorM representational
986944-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
945+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989946
990947instance Monad (BehaviorM x) where
991948 {-# INLINE (>>=) #-}
@@ -994,10 +951,8 @@ instance Monad (BehaviorM x) where
994951 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995952 {-# INLINE return #-}
996953 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998954 {-# INLINE fail #-}
999955 fail s = BehaviorM $ fail s
1000−#endif
1001956
1002957data BehaviorSubscribed x a
1003958 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +993,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038993#endif
1039994 }
1040995
1041−data Root x k
996+data Root x (k :: * -> *)
1042997 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043998 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044999 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1012,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571012newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581013
10591014-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1015+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
10611016
10621017newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631018
@@ -1082,8 +1037,7 @@ heightBagFromList :: [Height] -> HeightBag
10821037heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831038
10841039heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1040+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871041
10881042heightBagRemove :: Height -> HeightBag -> HeightBag
10891043heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1046,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921046 0 -> IntMap.delete h c
10931047 _ -> IntMap.insert h (pred old) c
10941048
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
1100−
1101−
11021049heightBagMax :: HeightBag -> Height
11031050heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041051 Just ((h, _), _) -> Height h
@@ -1116,25 +1063,25 @@ heightBagVerify b@(HeightBag s c) = if
11161063heightBagVerify = id
11171064#endif
11181065
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1066+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1067+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1068+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1069+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231070 }
11241071
1125−data FanSubscribed x k v
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1072+data FanSubscribed (x :: *) k
1073+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1074+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1075+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291076 , fanSubscribedParent :: !(EventSubscription x)
11301077#ifdef DEBUG_NODEIDS
11311078 , fanSubscribedNodeId :: Int
11321079#endif
11331080 }
11341081
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1082+data Fan x k
1083+ = Fan { fanParent :: !(Event x (DMap k Identity))
1084+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381085 }
11391086
11401087data SwitchSubscribed x a
@@ -1196,8 +1143,7 @@ instance HasSpiderTimeline x => Align (Event x) where
11961143#if MIN_VERSION_these(0, 8, 0)
11971144instance HasSpiderTimeline x => Semialign (Event x) where
11981145#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1146+ align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011147
12021148#ifdef MIN_VERSION_semialign
12031149#if MIN_VERSION_semialign(1,1,0)
@@ -1210,13 +1156,13 @@ data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101156 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111157 | HoldDyn !(Hold x p)
12121158
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1159+newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
12141160
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1161+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161162newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171163
12181164--TODO: Avoid the duplication between this and R.zipDynWith
1219−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1165+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201166zipDynWith f da db =
12211167 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221168 ec = flip push eab $ \o -> do
@@ -1239,12 +1185,18 @@ buildDynamic readV0 v' = do
12391185 return d
12401186
12411187unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1188+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1189+ where x = (readV0, v')
12441190
12451191-- ResultM can read behaviors and events
12461192type ResultM = EventM
12471193
1194+{-# NOINLINE unsafeNewIORef #-}
1195+unsafeNewIORef :: a -> b -> IORef b
1196+unsafeNewIORef a b = unsafePerformIO $ do
1197+ touch a
1198+ newIORef b
1199+
12481200instance HasSpiderTimeline x => Functor (Event x) where
12491201 fmap f = push $ return . Just . f
12501202
@@ -1257,42 +1209,33 @@ push f e = cacheEvent (pushCheap f e)
12571209
12581210{-# INLINABLE pull #-}
12591211pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1212+pull a = behaviorPull $ Pull
1213+ { pullCompute = a
1214+ , pullValue = unsafeNewIORef a Nothing
12681215#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1216+ , pullNodeId = unsafeNodeId a
12701217#endif
1271− }
1218+ }
12721219
12731220{-# INLINABLE switch #-}
12741221switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
1222+switch a = eventSwitch $ Switch
1223+ { switchParent = a
1224+ , switchSubscribed = unsafeNewIORef a Nothing
1225+ }
12811226
12821227coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
1228+coincidence a = eventCoincidence $ Coincidence
1229+ { coincidenceParent = a
1230+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1231+ }
12891232
12901233-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911234run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921235run roots after = do
12931236 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941237 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1238+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961239 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971240 occBefore <- liftIO $ do
12981241 occBefore <- readIORef occRef
@@ -1346,110 +1289,55 @@ mkWeakPtrWithDebug x debugNote = do
13461289 x' <- evaluate x
13471290 mkWeakPtr x' $
13481291 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1292+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501293 else Nothing
13511294
13521295type WeakList a = [Weak a]
13531296
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
1360−
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1366− {
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"
1378− }
1379−
1380−
13811297{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383−withIncreasedDepth _ a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1298+#ifdef DEBUG
1299+withIncreasedDepth :: CanTrace x m => m a -> m a
1300+withIncreasedDepth a = do
1301+ spiderTimeline <- askSpiderTimelineEnv
1302+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851303 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1304+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871305 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121306#else
1307+withIncreasedDepth :: m a -> m a
1308+withIncreasedDepth = id
1309+#endif
14131310
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1311+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171312
14181313{-# INLINE tracePropagate #-}
14191314tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1315+tracePropagate p = traceWhen p debugPropagate
14211316
14221317{-# INLINE traceInvalidate #-}
14231318traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1319+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14381320
1321+{-# INLINE traceWhen #-}
1322+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1323+traceWhen p b message = traceMWhen p b $ return message
14391324
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1447−
1325+{-# INLINE traceMWhen #-}
1326+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1327+traceMWhen _ b getMessage = when b $ do
1328+ message <- getMessage
1329+#ifdef DEBUG
1330+ spiderTimeline <- askSpiderTimelineEnv
1331+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1332+#else
1333+ let d = 0
14481334#endif
1335+ liftIO $ putStrLn $ replicate d ' ' <> message
14491336
14501337whoCreatedIORef :: IORef a -> IO [String]
14511338whoCreatedIORef (IORef a) = whoCreated $! a
14521339
1340+#ifdef DEBUG_CYCLES
14531341groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541342groupByHead = \case
14551343 [] -> []
@@ -1460,54 +1348,20 @@ groupByHead = \case
14601348 | otherwise -> (x, xs :| []) : l
14611349
14621350listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
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
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
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"
1494−
1351+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951352#endif
14961353
1497−
14981354{-# INLINE propagateSubscriberHold #-}
14991355propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001356propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1357+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021358 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031359 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051360 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061361 case {-# SCC "apply" #-} apply a v of
15071362 Nothing -> return ()
15081363 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1364+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111365 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121366 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131367 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1369,25 @@ propagateSubscriberHold h a = do
15151369data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161370
15171371runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1372+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191373
15201374askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211375askInvalidator = do
1522− (!m, _) <- ask
1376+ (!m, _) <- BehaviorM ask
15231377 case m of
15241378 Nothing -> return Nothing
15251379 Just (!wi, _) -> return $ Just wi
15261380
15271381askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281382askParentsRef = do
1529− (!m, _) <- ask
1383+ (!m, _) <- BehaviorM ask
15301384 case m of
15311385 Nothing -> return Nothing
15321386 Just (_, !p) -> return $ Just p
15331387
15341388askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351389askBehaviorHoldInits = do
1536− (_, !his) <- ask
1390+ (_, !his) <- BehaviorM ask
15371391 return his
15381392
15391393{-# INLINE getDynHold #-}
@@ -1561,7 +1415,7 @@ getDynHold d = do
15611415zeroRef :: IORef Height
15621416zeroRef = unsafePerformIO $ newIORef zeroHeight
15631417
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)
1418+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651419getRootSubscribed k r sub = do
15661420 mSubscribed <- readIORef $ rootSubscribed r
15671421 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1429,9 @@ getRootSubscribed k r sub = do
15751429 let !cached = rootSubscribed r
15761430 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771431 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1432+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811433 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821434 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861435 let !subscribed = RootSubscribed
15871436 { rootSubscribedKey = k
15881437 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1440,7 @@ getRootSubscribed k r sub = do
15911440 , rootSubscribedUninit = uninit
15921441 , rootSubscribedWeakSelf = weakSelf
15931442#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1443+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951444#endif
15961445 }
15971446 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1476,6 @@ data FanInt x a = FanInt
16271476 { _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
16281477 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291478 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331479 }
16341480
16351481newFanInt :: IO (FanInt x a)
@@ -1637,39 +1483,38 @@ newFanInt = do
16371483 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
16381484 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391485 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431486 return $ FanInt
16441487 { _fanInt_subscribers = subscribers
16451488 , _fanInt_subscriptionRef = subscriptionRef
16461489 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501490 }
16511491
1492+{-# NOINLINE unsafeNewFanInt #-}
1493+unsafeNewFanInt :: b -> FanInt x a
1494+unsafeNewFanInt b = unsafePerformIO $ do
1495+ touch b
1496+ newFanInt
1497+
16521498fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1499+fanInt p =
1500+ let self = unsafeNewFanInt p
1501+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561502 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571503 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1504+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601505 { subscriberPropagate = \m -> do
16611506 liftIO $ writeIORef (_fanInt_occRef self) m
16621507 scheduleIntClear $ _fanInt_occRef self
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1508+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1509+ FastWeakBag.traverse b $ \s -> do
16651510 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1511+ , subscriberInvalidateHeight = \old -> do
1512+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1513+ FastWeakBag.traverse b $ \s -> do
16691514 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1515+ , subscriberRecalculateHeight = \new -> do
1516+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1517+ FastWeakBag.traverse b $ \s -> do
16731518 subscriberRecalculateHeight s new
16741519 }
16751520 liftIO $ do
@@ -1683,28 +1528,13 @@ fanInt p = unsafePerformIO $ do
16831528 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841529 return b
16851530 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1531+ t <- liftIO $ FastWeakBag.insert sub b
16871532 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691−
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)
1698−#ifdef DEBUG_CYCLES
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702−#endif
1703− }
1704−
1533+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1534+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051535
17061536{-# INLINABLE getFanSubscribed #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1537+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081538getFanSubscribed k f sub = do
17091539 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101540 case mSubscribed of
@@ -1722,16 +1552,13 @@ getFanSubscribed k f sub = do
17221552 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231553 occRef <- liftIO $ newIORef parentOcc
17241554 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281555 let subscribed = FanSubscribed
17291556 { fanSubscribedCachedSubscribed = fanSubscribed f
17301557 , fanSubscribedOccurrence = occRef
17311558 , fanSubscribedParent = subscription
17321559 , fanSubscribedSubscribers = subscribersRef
17331560#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1561+ , fanSubscribedNodeId = unsafeNodeId f
17351562#endif
17361563 }
17371564 let !self = (k, subscribed)
@@ -1741,7 +1568,7 @@ getFanSubscribed k f sub = do
17411568 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421569 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431570
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1571+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451572cleanupFanSubscribed (k, subscribed) = do
17461573 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471574 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1580,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531580 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541581
17551582{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1583+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571584subscribeFanSubscribed k subscribed sub = do
17581585 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591586 case DMap.lookup k subscribers of
@@ -1791,9 +1618,6 @@ getSwitchSubscribed s sub = do
17911618 when (isJust parentOcc) $ scheduleClear occRef
17921619 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931620 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971621 let !subscribed = SwitchSubscribed
17981622 { switchSubscribedCachedSubscribed = switchSubscribed s
17991623 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1630,7 @@ getSwitchSubscribed s sub = do
18061630 , switchSubscribedCurrentParent = subscriptionRef
18071631 , switchSubscribedWeakSelf = weakSelf
18081632#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1633+ , switchSubscribedNodeId = unsafeNodeId s
18101634#endif
18111635 }
18121636 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1675,6 @@ getCoincidenceSubscribed c sub = do
18511675 scheduleClear innerSubdRef
18521676 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531677 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571678 let subscribed = CoincidenceSubscribed
18581679 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591680 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1685,7 @@ getCoincidenceSubscribed c sub = do
18641685 , coincidenceSubscribedInnerParent = innerSubdRef
18651686 , coincidenceSubscribedWeakSelf = weakSelf
18661687#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1688+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681689#endif
18691690 }
18701691 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1702,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811702subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821703subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831704
1884−{-# INLINE mergeG #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886− => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1705+{-# INLINE merge #-}
1706+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1707+merge d = cacheEvent (mergeCheap d)
18891708
18901709{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1710+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1711+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951712
18961713{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1714+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1715+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031716 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1717+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051718 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061719 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071720 (mOldSubd, newPs) <- case me of
19081721 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091722 Just e -> do
19101723 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1724+ subscription@(EventSubscription _ subd) <- subscribe e s
19121725 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131726 let newParent = MergeSubscribedParent subscription
19141727 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151728 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161729 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1730+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201731 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211732 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221733 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1734+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251735 getInitialSubscribers initialParents subscriber = do
19261736 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271737 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1738+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291739 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1740+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311741 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321742 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331743 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341744 )
1935−
19361745 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371746 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381747
19391748{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1749+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1750+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451751 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1752+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471753 updateMe subscriber heightBagRef oldParents p = do
19481754 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1755+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501756 subscribeParent k e = do
19511757 keyRef <- liftIO $ newIORef k
19521758 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1761,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551761 newParentHeight <- getEventSubscribedHeight subd
19561762 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571763 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1764+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591765 -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1766+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611767 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621768 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1769+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661770 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671771 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681772 Just toKey -> do
19691773 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701774 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1775+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741776 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1777+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761778 getInitialSubscribers initialParents subscriber = do
19771779 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781780 keyRef <- liftIO $ newIORef k
19791781 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1782+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811783 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1784+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831785 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841786 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851787 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861788 )
1987−
19881789 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891790 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901791
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1792+type MergeUpdateFunc k x p s
1793+ = (forall a. EventM x (k a) -> Subscriber x a)
19931794 -> IORef HeightBag
19941795 -> DMap k s
19951796 -> p
19961797 -> EventM x ([EventSubscription x], DMap k s)
19971798
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
2000−type MergeInitFunc k v q x s
2001− = DMap k q
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
1799+type MergeInitFunc k x s
1800+ = DMap k (Event x)
1801+ -> (forall a. EventM x (k a) -> Subscriber x a)
1802+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041803
20051804type MergeDestroyFunc k s
20061805 = DMap k s
20071806 -> IO ()
20081807
2009−data Merge x k v s = Merge
1808+data Merge x k s = Merge
20101809 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111810 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121811 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1812+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1813+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151814 }
20161815
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1816+invalidateMergeHeight :: Merge x k s -> IO ()
20181817invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191818
20201819invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211820invalidateMergeHeight' heightRef sub = do
20221821 oldHeight <- readIORef heightRef
2023− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024− when (oldHeight /= invalidHeight) $ do
1822+ 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
20251823 writeIORef heightRef $! invalidHeight
20261824 subscriberInvalidateHeight sub oldHeight
20271825
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1826+
1827+revalidateMergeHeight :: Merge x k s -> IO ()
20291828revalidateMergeHeight m = do
20301829 currentHeight <- readIORef $ _merge_heightRef m
2031−
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
1830+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341831 heights <- readIORef $ _merge_heightBagRef m
20351832 parents <- readIORef $ _merge_parentsRef m
20361833 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1835,44 @@ revalidateMergeHeight m = do
20381835 LT -> return ()
20391836 EQ -> do
20401837 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1838+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421839 writeIORef (_merge_heightRef m) $! height
20431840 subscriberRecalculateHeight (_merge_sub m) height
20441841 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451842
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1843+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471844scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481845 vals <- liftIO $ readIORef $ _merge_accumRef m
2049− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
1846+ 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
20521847 --TODO: Assert that m is not empty
20531848 subscriberPropagate (_merge_sub m) vals
20541849
2055−checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056−checkCycle subscribed = liftIO $ do
2057− height <- readIORef (eventSubscribedHeightRef subscribed)
2058−
2059− -- currentHeight <- getCurrentHeight
2060− -- when (height <= currentHeight) $ if height /= invalidHeight
2061− -- then do
2062− -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063− -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2064− -- else liftIO $
2065− when (height == invalidHeight) $
2066−#ifdef DEBUG_CYCLES
2067− do
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
2071−#else
2072− throwIO EventLoopException
2073−#endif
2074−
2075−
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)
2077−mergeSubscriber subscribed m getKey = Subscriber
1850+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1851+mergeSubscriber m getKey = Subscriber
20781852 { subscriberPropagate = \a -> do
20791853 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801854 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1855+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821856 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831857 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841858 when (DMap.null oldM) $ do -- Only schedule the firing once
20851859 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1860+ --TODO: assertions about height
1861+ currentHeight <- getCurrentHeight
1862+ when (height <= currentHeight) $ do
1863+ if height /= invalidHeight
1864+ then do
1865+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1866+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1867+ else liftIO $ do
1868+#ifdef DEBUG_CYCLES
1869+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1870+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1871+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1872+#else
1873+ let cycleInfo = ""
1874+#endif
1875+ error $ "Causality loop found" <> cycleInfo
20881876 scheduleMergeSelf m height
20891877 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901878 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1883,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951883 }
20961884
20971885--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
1886+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1887+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001888 where updateMe = do
21011889 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1890+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031891 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041892 return subscriptionsToKill
21051893
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1894+{-# INLINE mergeCheap' #-}
1895+mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k Identity)
1896+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101897 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111898 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121899 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131900 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141901 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120−#ifdef DEBUG_CYCLES
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
2126−#endif
2127− }
2128−
2129− m = Merge
1902+ let m = Merge
21301903 { _merge_parentsRef = parentsRef
21311904 , _merge_heightBagRef = heightBagRef
21321905 , _merge_heightRef = heightRef
21331906 , _merge_sub = sub
21341907 , _merge_accumRef = accumRef
21351908 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1909+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371910 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381911 myHeight = if invalidHeight `elem` heights
21391912 then invalidHeight
@@ -2142,57 +1915,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421915 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431916 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441917 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1918+ unless (DMap.null accum) $ do
1919+ scheduleMergeSelf m myHeight
21461920 liftIO $ writeIORef accumRef $! accum
21471921 liftIO $ writeIORef heightRef $! myHeight
21481922 liftIO $ writeIORef heightBagRef $! myHeightBag
1923+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491924 liftIO $ writeIORef parentsRef $! initialParentState
21501925 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1926+ let s = Subscriber
21521927 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1928+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1929+ defer $ updateMerge m updateFunc a
21551930 , subscriberInvalidateHeight = \_ -> return ()
21561931 , subscriberRecalculateHeight = \_ -> return ()
21571932 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1933+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1934+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601935 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611936 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621937 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1938+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641939 let unsubscribeAll = destroy =<< readIORef parentsRef
1940+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1941+ , occ
1942+ )
21651943
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
2168−
2169−mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1944+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701945mergeInt = cacheEvent . mergeIntCheap
21711946
21721947{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1948+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741949mergeIntCheap d = Event $ \sub -> do
21751950 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761951 accum <- liftIO $ FastMutableIntMap.newEmpty
21771952 heightRef <- liftIO $ newIORef zeroHeight
21781953 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791954 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)
2184−#ifdef DEBUG_CYCLES
2185− , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186− , eventSubscribedHasOwnHeightRef = False
2187− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188−#endif
2189− }
21901955 let scheduleSelf = do
21911956 height <- liftIO $ readIORef $ heightRef
21921957 scheduleMerge' height heightRef $ do
21931958 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941959 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1960+ invalidateMyHeight = do
1961+ invalidateMergeHeight' heightRef sub
21961962 recalculateMyHeight = do
21971963 currentHeight <- readIORef heightRef
21981964 when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
@@ -2202,14 +1968,12 @@ mergeIntCheap d = Event $ \sub -> do
22021968 LT -> return ()
22031969 EQ -> do
22041970 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1971+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061972 writeIORef heightRef $! height
22071973 subscriberRecalculateHeight sub height
22081974 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091975 mySubscriber k = Subscriber
22101976 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131977 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141978 liftIO $ FastMutableIntMap.insert accum k a
22151979 when wasEmpty scheduleSelf
@@ -2243,6 +2007,7 @@ mergeIntCheap d = Event $ \sub -> do
22432007 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442008 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452009 return Nothing
2010+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462011 defer $ SomeMergeInit $ do
22472012 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482013 where
@@ -2256,39 +2021,35 @@ mergeIntCheap d = Event $ \sub -> do
22562021 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572022 liftIO $ for_ oldParents $ \oldParent -> do
22582023 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612024 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622025 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2026+ let s = Subscriber
22642027 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652028 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662029 defer $ updateMe a
22672030 , subscriberInvalidateHeight = \_ -> return ()
22682031 , subscriberRecalculateHeight = \_ -> return ()
22692032 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2033+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712034 forM_ change $ \c -> defer $ updateMe c
22722035 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732036 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742037 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2038+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762039 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2040+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2041+ , occ
2042+ )
22802043
22812044newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282−newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
22832045
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2046+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2047+fan e =
22872048 let f = Fan
22882049 { fanParent = e
2289− , fanSubscribed = ref
2050+ , fanSubscribed = unsafeNewIORef e Nothing
22902051 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2052+ in EventSelector $ \k -> eventFan k f
22922053
22932054runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942055runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2103,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422103-- | Run an event action outside of a frame
23432104runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442105runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2106+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462107 let go = do
23472108 result <- a
23482109 runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
@@ -2359,19 +2120,19 @@ runFrame a = SpiderHost $ do
23592120 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602121 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612122 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2123+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632124 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642125 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652126 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2127+ when debugPropagate $ putStrLn "Updating merges"
23672128 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2129+ when debugPropagate $ putStrLn "Updating merges done"
23692130 toReconnect <- readIORef toReconnectRef
23702131 clearEventEnv env
23712132 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722133 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732134 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2135+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752136 finalize wi
23762137 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772138 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2146,7 @@ runFrame a = SpiderHost $ do
23852146 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
23862147 {-
23872148 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2149+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892150 EventRoot _ -> "EventRoot"
23902151 EventNever -> "EventNever"
23912152 _ -> "something else"
@@ -2400,7 +2161,7 @@ runFrame a = SpiderHost $ do
24002161 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012162 when (parentHeight /= myHeight) $ do
24022163 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2164+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042165 mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
24052166 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062167 unsubscribe subscription
@@ -2441,7 +2202,7 @@ invalidateCoincidenceHeight subscribed = do
24412202 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422203 when (oldHeight /= invalidHeight) $ do
24432204 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2205+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452206
24462207updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472208updateSwitchHeight new subscribed = do
@@ -2449,7 +2210,7 @@ updateSwitchHeight new subscribed = do
24492210 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502211 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512212 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2213+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532214
24542215recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552216recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2219,7 @@ recalculateCoincidenceHeight subscribed = do
24582219 height <- calculateCoincidenceHeight subscribed
24592220 when (height /= invalidHeight) $ do
24602221 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2222+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622223
24632224calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642225calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2281,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202281 {-# INLINABLE headE #-}
25212282 headE = R.slowHeadE
25222283-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252284
25262285instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272286 {-# INLINABLE sample #-}
@@ -2543,9 +2302,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432302 {-# INLINABLE headE #-}
25442303 headE = R.slowHeadE
25452304-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492305
25502306instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512307 {-# INLINE return #-}
@@ -2554,13 +2310,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542310 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552311 {-# INLINE (>>) #-}
25562312 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582313 {-# INLINE fail #-}
25592314 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612315
25622316{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2317+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642318newJoinDyn d =
25652319 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662320 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2363,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092363 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102364 {-# INLINABLE headE #-}
26112365 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152366
26162367instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172368 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2379,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282379 {-# INLINABLE headE #-}
26292380 headE = R.slowHeadE
26302381-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332382
26342383instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352384 {-# INLINABLE sample #-}
@@ -2650,8 +2399,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502399 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512400 {-# INLINABLE headE #-}
26522401 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552402
26562403--------------------------------------------------------------------------------
26572404-- Deprecated items
@@ -2689,13 +2436,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892436 touch h
26902437 return result
26912438
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2439+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932440 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942441 newFanEventWithTrigger f = SpiderHost $ do
26952442 es <- newFanEventWithTriggerIO f
26962443 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972444
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2445+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992446 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002447 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012448 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2464,7 @@ unsafeNewSpiderTimelineEnv = do
27172464#ifdef DEBUG
27182465 depthRef <- newIORef 0
27192466#endif
2720− return $ STE $ SpiderTimelineEnv
2467+ return $ SpiderTimelineEnv
27212468 { _spiderTimeline_lock = lock
27222469 , _spiderTimeline_eventEnv = env
27232470#ifdef DEBUG
@@ -2729,17 +2476,17 @@ unsafeNewSpiderTimelineEnv = do
27292476newSpiderTimeline :: IO (Some SpiderTimelineEnv)
27302477newSpiderTimeline = withSpiderTimeline (pure . Some)
27312478
2732−data LocalSpiderTimeline (x :: Type) s
2479+data LocalSpiderTimeline x s
27332480
27342481instance Reifies s (SpiderTimelineEnv x) =>
27352482 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2483+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372484
27382485localSpiderTimeline
2739− :: proxy s
2486+ :: Proxy s
27402487 -> SpiderTimelineEnv x
27412488 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2489+localSpiderTimeline _ = unsafeCoerce
27432490
27442491-- | Pass a new timeline to the given function.
27452492withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2494,18 @@ withSpiderTimeline k = do
27472494 env <- unsafeNewSpiderTimelineEnv
27482495 reify env $ \s -> k $ localSpiderTimeline s env
27492496
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2497+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512498
27522499type ComputeM = EventM
27532500
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2501+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552502
27562503instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572504 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582505 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592506 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2507+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2508+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622509 type PullM (SpiderTimeline x) = SpiderPullM x
27632510 type PushM (SpiderTimeline x) = SpiderPushM x
27642511 {-# INLINABLE never #-}
@@ -2771,15 +2518,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712518 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722519 {-# INLINABLE pull #-}
27732520 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2777− mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780− -> DMap k q
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2521+ {-# INLINABLE merge #-}
2522+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2523+ {-# INLINABLE fan #-}
2524+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832525 {-# INLINABLE switch #-}
27842526 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852527 {-# INLINABLE coincidence #-}
@@ -2787,15 +2529,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872529 {-# INLINABLE current #-}
27882530 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892531 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2532+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912533 {-# INLINABLE unsafeBuildDynamic #-}
27922534 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932535 {-# INLINABLE unsafeBuildIncremental #-}
27942536 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2537+ {-# INLINABLE mergeIncremental #-}
2538+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2539+ {-# INLINABLE mergeIncrementalWithMove #-}
2540+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992541 {-# INLINABLE currentIncremental #-}
28002542 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012543 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2548,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062548 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072549 eventCoercion Coercion = Coercion
28082550 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2551+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112552 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2553+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132554 {-# INLINABLE fanInt #-}
28142555 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152556
@@ -2834,7 +2575,7 @@ instance MonadAtomicRef (EventM x) where
28342575 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352576
28362577-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2578+newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382579
28392580instance Monad (SpiderHost x) where
28402581 {-# INLINABLE (>>=) #-}
@@ -2843,14 +2584,8 @@ instance Monad (SpiderHost x) where
28432584 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442585 {-# INLINABLE return #-}
28452586 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472587 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2588+ fail s = SpiderHost $ fail s
28542589
28552590-- | Run an action affecting the global Spider timeline; this will be guarded by
28562591-- a mutex for that timeline
@@ -2862,7 +2597,7 @@ runSpiderHost (SpiderHost a) = a
28622597runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
28632598runSpiderHostForTimeline (SpiderHost a) _ = a
28642599
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2600+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
28662601 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672602
28682603instance Monad (SpiderHostFrame x) where
@@ -2872,21 +2607,19 @@ instance Monad (SpiderHostFrame x) where
28722607 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732608 {-# INLINABLE return #-}
28742609 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762610 {-# INLINABLE fail #-}
28772611 fail s = SpiderHostFrame $ fail s
2878−#endif
28792612
28802613instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812614 notReadyUntil _ = pure ()
28822615 notReady = pure ()
28832616
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2617+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852618newEventWithTriggerIO f = do
28862619 es <- newFanEventWithTriggerIO $ \Refl -> f
28872620 return $ select es Refl
28882621
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2622+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902623newFanEventWithTriggerIO f = do
28912624 occRef <- newIORef DMap.empty
28922625 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2653,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202653instance PrimMonad (SpiderHostFrame x) where
29212654 type PrimState (SpiderHostFrame x) = PrimState IO
29222655 primitive = SpiderHostFrame . EventM . primitive
2923−
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2927−
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()