@@ -9,17 +9,22 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiParamTypeClasses #-}
13−{-# LANGUAGE MultiWayIf #-}
1412{-# LANGUAGE RankNTypes #-}
1513{-# LANGUAGE RoleAnnotations #-}
1614{-# LANGUAGE ScopedTypeVariables #-}
1715{-# LANGUAGE TypeFamilies #-}
1816{-# LANGUAGE TypeOperators #-}
1917{-# LANGUAGE UndecidableInstances #-}
18+{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
21+{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
23+
2024#ifdef USE_REFLEX_OPTIMIZER
2125{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2226#endif
27+{-# OPTIONS_GHC -Wunused-binds #-}
2328-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2429-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
2530module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -33,12 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3338import Control.Monad.Exception
3439import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3540import Control.Monad.Primitive
36−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
41+import Control.Monad.Reader.Class
42+import Control.Monad.IO.Class
43+import Control.Monad.ReaderIO
3744import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
3847import Data.Align
3948import Data.Coerce
40−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4150import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
4252import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
4353import qualified Data.FastMutableIntMap as FastMutableIntMap
4454import Data.Foldable hiding (concat, elem, sequence_)
@@ -49,13 +59,15 @@ import Data.GADT.Compare
4959import Data.IntMap.Strict (IntMap)
5060import qualified Data.IntMap.Strict as IntMap
5161import Data.IORef
62+import Data.Kind (Type)
5263import Data.Maybe hiding (mapMaybe)
53−import Data.Monoid ((<>))
64+import Data.Monoid (mempty, (<>))
5465import Data.Proxy
5566import Data.These
5667import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
5769import Data.Witherable (Filterable, mapMaybe)
58−import GHC.Exts
70+import GHC.Exts hiding (toList)
5971import GHC.IORef (IORef (..))
6072import GHC.Stack
6173import Reflex.FastWeak
@@ -63,39 +75,57 @@ import System.IO.Unsafe
6375import System.Mem.Weak
6476import Unsafe.Coerce
6577
78+#ifdef MIN_VERSION_semialign
79+#if MIN_VERSION_these(0,8,0)
80+import Data.These.Combinators (justThese)
81+#endif
82+#if MIN_VERSION_semialign(1,1,0)
83+import Data.Zip (Zip (..))
84+#endif
85+#endif
86+
6687#ifdef DEBUG_CYCLES
6788import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
6891import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
6992import qualified Data.List.NonEmpty as NonEmpty
70−import Data.Monoid (mempty)
7193import Data.Tree (Forest, Tree (..), drawForest)
72−#endif
94+import Data.List (isPrefixOf)
7395
74−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
7597import qualified Data.FastWeakBag as FastWeakBag
98+
7699import Data.Reflection
77100import Data.Some (Some(Some))
78101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
79103import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
80104import qualified Data.WeakBag as WeakBag
81105import qualified Reflex.Class
82106import qualified Reflex.Class as R
83107import qualified Reflex.Host.Class
84108import Reflex.NotReady.Class
85−import Reflex.Patch
86−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
87112
88113#ifdef DEBUG_TRACE_EVENTS
89114import qualified Data.ByteString.Char8 as BS8
90115import System.IO (stderr)
116+import Data.List (isPrefixOf)
91117#endif
92118
93−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
94122
123+#ifdef DEBUG_TRACE_EVENTS
95124withStackOneLine :: (BS8.ByteString -> a) -> a
96125withStackOneLine expr = unsafePerformIO $ do
97126 stack <- currentCallStack
98− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
99129
100130#endif
101131
@@ -106,28 +136,42 @@ debugInvalidateHeight :: Bool
106136debugInvalidate :: Bool
107137
108138#ifdef DEBUG
109−
110139#define DEBUG_NODEIDS
111140
141+#ifdef DEBUG_TRACE_PROPAGATION
112142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
113146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
114150debugInvalidateHeight = False
151+#endif
115152
153+#ifdef DEBUG_TRACE_INVALIDATION
116154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
117158
118159class HasNodeId a where
119160 getNodeId :: a -> Int
120161
121−instance HasNodeId (Hold x p a) where
122− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
123167
124−instance HasNodeId (PushSubscribed x a b) where
125− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
126170
127171instance HasNodeId (SwitchSubscribed x a) where
128172 getNodeId = switchSubscribedNodeId
129173
130−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
131175 getNodeId = fanSubscribedNodeId
132176
133177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -141,41 +185,16 @@ instance HasNodeId (Pull x a) where
141185
142186{-# INLINE showNodeId #-}
143187showNodeId :: HasNodeId a => a -> String
144−showNodeId = ("#"<>) . show . getNodeId
145−
146−showSubscriberType :: Subscriber x a -> String
147−showSubscriberType = \case
148− SubscriberPush _ _ -> "SubscriberPush"
149− SubscriberMerge _ _ -> "SubscriberMerge"
150− SubscriberFan _ -> "SubscriberFan"
151− SubscriberMergeChange _ -> "SubscriberMergeChange"
152− SubscriberHold _ -> "SubscriberHold"
153− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
154− SubscriberSwitch _ -> "SubscriberSwitch"
155− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
156− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
157− SubscriberHandle -> "SubscriberHandle"
158−
159−showEventType :: Event x a -> String
160−showEventType = \case
161− EventRoot _ _ -> "EventRoot"
162− EventNever -> "EventNever"
163− EventPush _ -> "EventPush"
164− EventMerge _ -> "EventMerge"
165− EventFan _ _ -> "EventFan"
166− EventSwitch _ -> "EventSwitch"
167− EventCoincidence _ -> "EventCoincidence"
168− EventHold _ -> "EventHold"
169− EventDyn _ -> "EventDyn"
170− EventHoldIdentity _ -> "EventHoldIdentity"
171− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
172193
173194#else
174195
175196debugPropagate = False
176−
177197debugInvalidateHeight = False
178−
179198debugInvalidate = False
180199
181200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -183,6 +202,10 @@ debugInvalidate = False
183202showNodeId :: a -> String
184203showNodeId _ = ""
185204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
186209#endif
187210
188211#ifdef DEBUG_NODEIDS
@@ -192,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
192215
193216newNodeId :: IO Int
194217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
195−
196−{-# NOINLINE unsafeNodeId #-}
197−unsafeNodeId :: a -> Int
198−unsafeNodeId a = unsafePerformIO $ do
199− touch a
200− newNodeId
201218#endif
202219
203220--------------------------------------------------------------------------------
@@ -234,9 +251,9 @@ subscribeAndRead = unEvent
234251-- caching; if the computation function is very cheap, this is (much) more
235252-- efficient than 'push'
236253{-# INLINE [1] pushCheap #-}
237−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
238255pushCheap !f e = Event $ \sub -> do
239− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
240257 { subscriberPropagate = \a -> do
241258 mb <- f a
242259 mapM_ (subscriberPropagate sub) mb
@@ -255,10 +272,10 @@ terminalSubscriber p = Subscriber
255272
256273-- | Subscribe to an Event only for the duration of one occurrence
257274{-# INLINE subscribeAndReadHead #-}
258−subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
259276subscribeAndReadHead e sub = do
260277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
261− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
262279 { subscriberPropagate = \a -> do
263280 liftIO $ unsubscribe =<< readIORef subscriptionRef
264281 subscriberPropagate sub a
@@ -269,24 +286,42 @@ subscribeAndReadHead e sub = do
269286 return (subscription, occ)
270287
271288--TODO: Make this lazy in its input event
272−headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
273290headE originalE = do
274291 parent <- liftIO $ newIORef $ Just originalE
275292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
276293 let clearParent = liftIO $ writeIORef parent Nothing
277− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
278295 when (isJust occ) clearParent
279− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
280297 liftIO (readIORef parent) >>= \case
281− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
282299 Just e -> subscribeAndReadHead e sub
283300
284301data CacheSubscribed x a
285302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
286303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
287304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
288308 }
289309
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+
290325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
291326-- repeatedly
292327--
@@ -301,27 +336,33 @@ cacheEvent e =
301336#else
302337 Event $
303338#endif
304− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
305− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
306− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
307343#ifdef DEBUG_TRACE_EVENTS
308344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
309345#endif
310346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
311347 Just subscribedTicket -> return subscribedTicket
312348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
313352 subscribers <- liftIO FastWeakBag.empty
314353 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
315357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
316− { subscriberPropagate = \a -> do
317− liftIO $ writeIORef occRef $ Just a
318− scheduleClear occRef
319− propagateFast a subscribers
320− , subscriberInvalidateHeight = \old -> do
321− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
322− , subscriberRecalculateHeight = \new -> do
323− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
324− }
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+ }
325366 when (isJust occ) $ do
326367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
327368 scheduleClear occRef
@@ -329,29 +370,45 @@ cacheEvent e =
329370 { _cacheSubscribed_subscribers = subscribers
330371 , _cacheSubscribed_parent = parentSub
331372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
332376 }
333377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
334378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
335379 return subscribedTicket
336− liftIO $ do
337− subscribed <- getFastWeakTicketValue subscribedTicket
338− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
339− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
340− let es = EventSubscription
341− { _eventSubscription_unsubscribe = do
342− FastWeakBag.remove ticket
343− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
344− when isEmpty $ do
345− writeIORef mSubscribedRef emptyFastWeak
346− unsubscribe $ _cacheSubscribed_parent subscribed
347− touch ticket
348− touch subscribedTicket
349− , _eventSubscription_subscribed = EventSubscribed
350− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
351− , eventSubscribedRetained = toAny subscribedTicket
352− }
353− }
354− return (es, occ)
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+
355412
356413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
357414subscribe e s = fst <$> subscribeAndRead e s
@@ -363,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
363420 let es = tag subd
364421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
365422
366−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
367424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
368425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
369429eventNever :: Event x a
370−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
371431
372−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
373433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
374434
375435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -404,16 +464,6 @@ data Subscriber x a = Subscriber
404464 , subscriberRecalculateHeight :: !(Height -> IO ())
405465 }
406466
407−--TODO: Move this comment to WeakBag
408−-- These function are constructor functions that are marked NOINLINE so they are
409−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
410−-- so any weak references that are attached to the constructors will have their
411−-- finalizer run. Using the opaque constructor, does not see the
412−-- constructor application, so it behaves like an IORef and cannot be fused away.
413−--
414−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
415−-- the weak pointer to it in some cases.
416−
417467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
418468newSubscriberHold h = return $ Subscriber
419469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -421,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
421471 , subscriberRecalculateHeight = \_ -> return ()
422472 }
423473
424−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
425−newSubscriberFan subscribed = return $ Subscriber
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
426476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
427477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
428− tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
429479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
430480 scheduleClear $ fanSubscribedOccurrence subscribed
431− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
432482 propagate v $ _fanSubscribedChildren_list subsubs
433483 return $ Constant ()
434484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
435485 return ()
436486 , subscriberInvalidateHeight = \old -> do
437− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
438487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
439− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
441489 , subscriberRecalculateHeight = \new -> do
442− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
443490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
444− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
445− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
446492 }
447493
448494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
449−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
450496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
451− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
452497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
453498 scheduleClear $ switchSubscribedOccurrence subscribed
454499 propagate a $ switchSubscribedSubscribers subscribed
455500 , subscriberInvalidateHeight = \_ -> do
456− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
457501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
458502 when (oldHeight /= invalidHeight) $ do
459503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
460− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
461− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
462− , subscriberRecalculateHeight = \new -> do
463− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
464− updateSwitchHeight new subscribed
465− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
466− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
467507
468508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
469−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
470510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
471− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
472511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
473512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
474513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
475514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
476515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
477517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
478518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
479519 case occ of
480− Nothing -> do
520+ Nothing ->
481521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
482522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
483− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
484− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
485525 Just o -> do -- Since it's already firing, no need to adjust height
486526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
487527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
488528 propagate o $ coincidenceSubscribedSubscribers subscribed
489− , subscriberInvalidateHeight = \_ -> do
490− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
491− invalidateCoincidenceHeight subscribed
492− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
493− , subscriberRecalculateHeight = \_ -> do
494− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
495− recalculateCoincidenceHeight subscribed
496− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
497531 }
498532
499533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
500−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
501535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
502− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
503536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
504537 case occ of
505538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -507,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
507540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
508541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
509542 propagate a $ coincidenceSubscribedSubscribers subscribed
510− , subscriberInvalidateHeight = \_ -> do
511− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
512− invalidateCoincidenceHeight subscribed
513− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
514− , subscriberRecalculateHeight = \_ -> do
515− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
516− recalculateCoincidenceHeight subscribed
517− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
518545 }
519546
520547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -524,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
524551recalculateSubscriberHeight = flip subscriberRecalculateHeight
525552
526553-- | Propagate everything at the current height
527−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
528−propagate a subscribers = withIncreasedDepth $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
529556 -- 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
530557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
531− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
532559
533560-- | Propagate everything at the current height
534−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
535−propagateFast a subscribers = withIncreasedDepth $ do
561+propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
536563 -- 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
537564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
538− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
539566
540567--------------------------------------------------------------------------------
541568-- EventSubscribed
@@ -544,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
544571toAny :: a -> Any
545572toAny = unsafeCoerce
546573
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.
547579data EventSubscribed x = EventSubscribed
548580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
549581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
550582#ifdef DEBUG_CYCLES
551− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
552584 , eventSubscribedHasOwnHeightRef :: !Bool
553585 , eventSubscribedWhoCreated :: !(IO [String])
554586#endif
@@ -575,13 +607,23 @@ eventSubscribedNever = EventSubscribed
575607 , eventSubscribedWhoCreated = return ["never"]
576608#endif
577609 }
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+ }
578620
579−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
580622eventSubscribedFan !subscribed = EventSubscribed
581623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
582624 , eventSubscribedRetained = toAny subscribed
583625#ifdef DEBUG_CYCLES
584− , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
585627 , eventSubscribedHasOwnHeightRef = False
586628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
587629#endif
@@ -594,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
594636#ifdef DEBUG_CYCLES
595637 , eventSubscribedGetParents = do
596638 s <- readIORef $ switchSubscribedCurrentParent subscribed
597− return [Some $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
598640 , eventSubscribedHasOwnHeightRef = True
599641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
600642#endif
@@ -607,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
607649#ifdef DEBUG_CYCLES
608650 , eventSubscribedGetParents = do
609651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
610− let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
611− innerParents = maybeToList $ fmap Some innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
612654 return $ outerParent : innerParents
613655 , eventSubscribedHasOwnHeightRef = True
614656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -622,15 +664,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
622664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
623665whoCreatedEventSubscribed = eventSubscribedWhoCreated
624666
625−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
626668walkInvalidHeightParents s0 = do
627− subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
628670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
629671 when (h == invalidHeight) $ do
630672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
631− modify (Some s :)
673+ modify (s :)
632674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
633− forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
634676 return subscribers
635677#endif
636678
@@ -667,7 +709,7 @@ behaviorPull !p = Behavior $ do
667709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
668710 parentsRef <- liftIO $ newIORef []
669711 holdInits <- askBehaviorHoldInits
670− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
671713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
672714 parents <- liftIO $ readIORef parentsRef
673715 let subscribed = PullSubscribed
@@ -702,42 +744,46 @@ readBehaviorUntracked b = do
702744-- Dynamic
703745--------------------------------------------------------------------------------
704746
705−data Dynamic x p = Dynamic
706− { dynamicCurrent :: !(Behavior x (PatchTarget p))
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
707751 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
708752 }
709753
710−dynamicHold :: Hold x p -> Dynamic x p
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
711760dynamicHold !h = Dynamic
712761 { dynamicCurrent = behaviorHold h
713762 , dynamicUpdated = eventHold h
714763 }
715764
716−dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
717766dynamicHoldIdentity = dynamicHold
718767
719−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
720769dynamicConst !a = Dynamic
721770 { dynamicCurrent = behaviorConst a
722771 , dynamicUpdated = eventNever
723772 }
724773
725−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
726775dynamicDyn !d = Dynamic
727776 { dynamicCurrent = behaviorDyn d
728777 , dynamicUpdated = eventDyn d
729778 }
730779
731−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
732781dynamicDynIdentity = dynamicDyn
733782
734783--------------------------------------------------------------------------------
735784-- Combinators
736785--------------------------------------------------------------------------------
737786
738−--TODO: Figure out why certain things are not 'representational', then make them
739−--representational so we can use coerce
740−
741787--type role Hold representational
742788data Hold x p
743789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -758,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
758804
759805-- | Stores all global data relevant to a particular Spider timeline; only one
760806-- value should exist for each type @x@
761−data SpiderTimelineEnv x = SpiderTimelineEnv
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
762813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
763814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
764815#ifdef DEBUG
765816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
766817#endif
767818 }
768−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
769820
770821instance Eq (SpiderTimelineEnv x) where
771822 _ == _ = True -- Since only one exists of each type
772823
773824instance GEq SpiderTimelineEnv where
774− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
775826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
776827 else Nothing
777828
@@ -794,7 +845,7 @@ runEventM :: EventM x a -> IO a
794845runEventM = unEventM
795846
796847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
797−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
798849
799850class MonadIO m => Defer a m where
800851 getDeferralQueue :: m (IORef [a])
@@ -932,9 +983,9 @@ getHoldEventSubscription h = do
932983
933984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
934985
935−--type role BehaviorM representational
936986-- BehaviorM can sample behaviors
937−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
987+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988+ deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
938989
939990instance Monad (BehaviorM x) where
940991 {-# INLINE (>>=) #-}
@@ -943,8 +994,10 @@ instance Monad (BehaviorM x) where
943994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
944995 {-# INLINE return #-}
945996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
946998 {-# INLINE fail #-}
947999 fail s = BehaviorM $ fail s
1000+#endif
9481001
9491002data BehaviorSubscribed x a
9501003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -985,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9851038#endif
9861039 }
9871040
988−data Root x (k :: * -> *)
1041+data Root x k
9891042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9901043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9911044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1004,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10041057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10051058
10061059-- EventM can do everything BehaviorM can, plus create holds
1007−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
10081061
10091062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10101063
@@ -1029,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10291082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10301083
10311084heightBagAdd :: Height -> HeightBag -> HeightBag
1032−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10331087
10341088heightBagRemove :: Height -> HeightBag -> HeightBag
10351089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1038,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10381092 0 -> IntMap.delete h c
10391093 _ -> IntMap.insert h (pred old) c
10401094
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+
10411102heightBagMax :: HeightBag -> Height
10421103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10431104 Just ((h, _), _) -> Height h
@@ -1055,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10551116heightBagVerify = id
10561117#endif
10571118
1058−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1059− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1060− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1061− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
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)))
10621123 }
10631124
1064−data FanSubscribed (x :: *) k
1065− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1066− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1067− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
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
10681129 , fanSubscribedParent :: !(EventSubscription x)
10691130#ifdef DEBUG_NODEIDS
10701131 , fanSubscribedNodeId :: Int
10711132#endif
10721133 }
10731134
1074−data Fan x k
1075− = Fan { fanParent :: !(Event x (DMap k Identity))
1076− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1135+data Fan x k v
1136+ = Fan { fanParent :: !(Event x (DMap k v))
1137+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
10771138 }
10781139
10791140data SwitchSubscribed x a
@@ -1135,19 +1196,27 @@ instance HasSpiderTimeline x => Align (Event x) where
11351196#if MIN_VERSION_these(0, 8, 0)
11361197instance HasSpiderTimeline x => Semialign (Event x) where
11371198#endif
1138− align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201+
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
11391208
11401209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
11411210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
11421211 | HoldDyn !(Hold x p)
11431212
1144−newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11451214
1146−newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1215+newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
11471216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11481217
11491218--TODO: Avoid the duplication between this and R.zipDynWith
1150−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1219+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
11511220zipDynWith f da db =
11521221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11531222 ec = flip push eab $ \o -> do
@@ -1170,18 +1239,12 @@ buildDynamic readV0 v' = do
11701239 return d
11711240
11721241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1173−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1174− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11751244
11761245-- ResultM can read behaviors and events
11771246type ResultM = EventM
11781247
1179−{-# NOINLINE unsafeNewIORef #-}
1180−unsafeNewIORef :: a -> b -> IORef b
1181−unsafeNewIORef a b = unsafePerformIO $ do
1182− touch a
1183− newIORef b
1184−
11851248instance HasSpiderTimeline x => Functor (Event x) where
11861249 fmap f = push $ return . Just . f
11871250
@@ -1194,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
11941257
11951258{-# INLINABLE pull #-}
11961259pull :: BehaviorM x a -> Behavior x a
1197−pull a = behaviorPull $ Pull
1198− { pullCompute = a
1199− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
12001262#ifdef DEBUG_NODEIDS
1201− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
12021264#endif
1203− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
12041272
12051273{-# INLINABLE switch #-}
12061274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1207−switch a = eventSwitch $ Switch
1208− { switchParent = a
1209− , switchSubscribed = unsafeNewIORef a Nothing
1210− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
12111281
12121282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1213−coincidence a = eventCoincidence $ Coincidence
1214− { coincidenceParent = a
1215− , coincidenceSubscribed = unsafeNewIORef a Nothing
1216− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
12171289
12181290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12191291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12201292run roots after = do
12211293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12221294 let t = spiderTimeline :: SpiderTimelineEnv x
1223− result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
12241296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12251297 occBefore <- liftIO $ do
12261298 occBefore <- readIORef occRef
@@ -1274,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12741346 x' <- evaluate x
12751347 mkWeakPtr x' $
12761348 if debugFinalize
1277− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12781350 else Nothing
12791351
12801352type WeakList a = [Weak a]
12811353
1282−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12831359#ifdef DEBUG
1284−withIncreasedDepth :: CanTrace x m => m a -> m a
1285−withIncreasedDepth a = do
1286− spiderTimeline <- askSpiderTimelineEnv
1287− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
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+
1381+{-# 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
12881385 result <- a
1289− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12901387 return result
1291−#else
1292−withIncreasedDepth :: m a -> m a
1293−withIncreasedDepth = id
1294−#endif
1295−
1296−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12971388
12981389{-# INLINE tracePropagate #-}
12991390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1300−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13011392
13021393{-# INLINE traceInvalidate #-}
13031394traceInvalidate :: String -> IO ()
1304−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
13051396
1306−{-# INLINE traceWhen #-}
1307−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1308−traceWhen p b message = traceMWhen p b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13091400
1310−{-# INLINE traceMWhen #-}
1311−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1312−traceMWhen _ b getMessage = when b $ do
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
13131408 message <- getMessage
1314−#ifdef DEBUG
1315− spiderTimeline <- askSpiderTimelineEnv
1316− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13171412#else
1318− let d = 0
1413+
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1417+
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1421+
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: 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+
1438+
1439+
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+
13191448#endif
1320− liftIO $ putStrLn $ replicate d ' ' <> message
13211449
13221450whoCreatedIORef :: IORef a -> IO [String]
13231451whoCreatedIORef (IORef a) = whoCreated $! a
13241452
1325−#ifdef DEBUG_CYCLES
13261453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13271454groupByHead = \case
13281455 [] -> []
@@ -1333,20 +1460,54 @@ groupByHead = \case
13331460 | otherwise -> (x, xs :| []) : l
13341461
13351462listsToForest :: Eq a => [[a]] -> Forest a
1336−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1463+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
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+
13371495#endif
13381496
1497+
13391498{-# INLINE propagateSubscriberHold #-}
13401499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13411500propagateSubscriberHold h a = do
1342− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13431502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13441503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13451505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13461506 case {-# SCC "apply" #-} apply a v of
13471507 Nothing -> return ()
13481508 Just v' -> do
1349− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13501511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13511512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13521513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1354,25 +1515,25 @@ propagateSubscriberHold h a = do
13541515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13551516
13561517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1357−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13581519
13591520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13601521askInvalidator = do
1361− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13621523 case m of
13631524 Nothing -> return Nothing
13641525 Just (!wi, _) -> return $ Just wi
13651526
13661527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13671528askParentsRef = do
1368− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13691530 case m of
13701531 Nothing -> return Nothing
13711532 Just (_, !p) -> return $ Just p
13721533
13731534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13741535askBehaviorHoldInits = do
1375− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13761537 return his
13771538
13781539{-# INLINE getDynHold #-}
@@ -1400,7 +1561,7 @@ getDynHold d = do
14001561zeroRef :: IORef Height
14011562zeroRef = unsafePerformIO $ newIORef zeroHeight
14021563
1403−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
14041565getRootSubscribed k r sub = do
14051566 mSubscribed <- readIORef $ rootSubscribed r
14061567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1414,9 +1575,14 @@ getRootSubscribed k r sub = do
14141575 let !cached = rootSubscribed r
14151576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14161577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1417− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14181581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14191582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14201586 let !subscribed = RootSubscribed
14211587 { rootSubscribedKey = k
14221588 , rootSubscribedCachedSubscribed = cached
@@ -1425,7 +1591,7 @@ getRootSubscribed k r sub = do
14251591 , rootSubscribedUninit = uninit
14261592 , rootSubscribedWeakSelf = weakSelf
14271593#ifdef DEBUG_NODEIDS
1428− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14291595#endif
14301596 }
14311597 -- If we die at the same moment that all our children die, they will
@@ -1461,6 +1627,9 @@ data FanInt x a = FanInt
14611627 { _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
14621628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14631629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14641633 }
14651634
14661635newFanInt :: IO (FanInt x a)
@@ -1468,38 +1637,39 @@ newFanInt = do
14681637 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
14691638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14701639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14711643 return $ FanInt
14721644 { _fanInt_subscribers = subscribers
14731645 , _fanInt_subscriptionRef = subscriptionRef
14741646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14751650 }
14761651
1477−{-# NOINLINE unsafeNewFanInt #-}
1478−unsafeNewFanInt :: b -> FanInt x a
1479−unsafeNewFanInt b = unsafePerformIO $ do
1480− touch b
1481− newFanInt
1482−
14831652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1484−fanInt p =
1485− let self = unsafeNewFanInt p
1486− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14871656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14881657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1489− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14901660 { subscriberPropagate = \m -> do
14911661 liftIO $ writeIORef (_fanInt_occRef self) m
14921662 scheduleIntClear $ _fanInt_occRef self
1493− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1494− FastWeakBag.traverse b $ \s -> do
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 ->
14951665 subscriberPropagate s v
1496− , subscriberInvalidateHeight = \old -> do
1497− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1498− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
14991669 subscriberInvalidateHeight s old
1500− , subscriberRecalculateHeight = \new -> do
1501− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1502− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15031673 subscriberRecalculateHeight s new
15041674 }
15051675 liftIO $ do
@@ -1513,13 +1683,28 @@ fanInt p =
15131683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15141684 return b
15151685 Just b -> return b
1516− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15171687 currentOcc <- readIORef (_fanInt_occRef self)
1518− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1519− return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
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+
15201705
15211706{-# INLINABLE getFanSubscribed #-}
1522−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
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))
15231708getFanSubscribed k f sub = do
15241709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15251710 case mSubscribed of
@@ -1537,13 +1722,16 @@ getFanSubscribed k f sub = do
15371722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15381723 occRef <- liftIO $ newIORef parentOcc
15391724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15401728 let subscribed = FanSubscribed
15411729 { fanSubscribedCachedSubscribed = fanSubscribed f
15421730 , fanSubscribedOccurrence = occRef
15431731 , fanSubscribedParent = subscription
15441732 , fanSubscribedSubscribers = subscribersRef
15451733#ifdef DEBUG_NODEIDS
1546− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15471735#endif
15481736 }
15491737 let !self = (k, subscribed)
@@ -1553,7 +1741,7 @@ getFanSubscribed k f sub = do
15531741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15541742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15551743
1556−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15571745cleanupFanSubscribed (k, subscribed) = do
15581746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15591747 let reducedSubscribers = DMap.delete k subscribers
@@ -1565,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15651753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15661754
15671755{-# INLINE subscribeFanSubscribed #-}
1568−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1756+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
15691757subscribeFanSubscribed k subscribed sub = do
15701758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15711759 case DMap.lookup k subscribers of
@@ -1603,6 +1791,9 @@ getSwitchSubscribed s sub = do
16031791 when (isJust parentOcc) $ scheduleClear occRef
16041792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16051793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16061797 let !subscribed = SwitchSubscribed
16071798 { switchSubscribedCachedSubscribed = switchSubscribed s
16081799 , switchSubscribedOccurrence = occRef
@@ -1615,7 +1806,7 @@ getSwitchSubscribed s sub = do
16151806 , switchSubscribedCurrentParent = subscriptionRef
16161807 , switchSubscribedWeakSelf = weakSelf
16171808#ifdef DEBUG_NODEIDS
1618− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16191810#endif
16201811 }
16211812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1660,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16601851 scheduleClear innerSubdRef
16611852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16621853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16631857 let subscribed = CoincidenceSubscribed
16641858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16651859 , coincidenceSubscribedOccurrence = occRef
@@ -1670,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16701864 , coincidenceSubscribedInnerParent = innerSubdRef
16711865 , coincidenceSubscribedWeakSelf = weakSelf
16721866#ifdef DEBUG_NODEIDS
1673− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16741868#endif
16751869 }
16761870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1687,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16871881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16881882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16891883
1690−{-# INLINE merge #-}
1691−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1692−merge d = cacheEvent (mergeCheap d)
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)
16931889
16941890{-# INLINE mergeWithMove #-}
1695−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1696−mergeWithMove d = cacheEvent (mergeCheapWithMove d)
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)
16971895
16981896{-# INLINE [1] mergeCheap #-}
1699−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1700−mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
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
17011903 where
1702− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17031905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
17041906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
17051907 (mOldSubd, newPs) <- case me of
17061908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
17071909 Just e -> do
17081910 let s = subscriber $ return k
1709− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
17101912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
17111913 let newParent = MergeSubscribedParent subscription
17121914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17131915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17141916 forM_ mOldSubd $ \oldSubd -> do
1715− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17161920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17171921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17181922 foldM f ([], oldParents) $ DMap.toList p
1719− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
17201925 getInitialSubscribers initialParents subscriber = do
17211926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17221927 let s = subscriber $ return k
1723− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17241929 height <- liftIO $ getEventSubscribedHeight parentSubd
1725− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17261931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17271932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17281933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17291934 )
1935+
17301936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
17311937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
17321938
17331939{-# INLINE [1] mergeCheapWithMove #-}
1734−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1735−mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
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
17361945 where
1737− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17381947 updateMe subscriber heightBagRef oldParents p = do
17391948 -- Prepare new parents for insertion
1740− let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
1949+ let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
17411950 subscribeParent k e = do
17421951 keyRef <- liftIO $ newIORef k
17431952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1746,73 +1955,82 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
17461955 newParentHeight <- getEventSubscribedHeight subd
17471956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17481957 return $ MergeSubscribedParentWithMove subscription keyRef
1749− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
17501959 -- Collect old parents for deletion and update the keys of moved parents
1751− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1960+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
17521961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17531962 Nothing -> do
1754− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17551966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17561967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17571968 Just toKey -> do
17581969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17591970 return Nothing
1760− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973+
17611974 return (toDelete, applyAlways p' oldParents)
1762− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17631976 getInitialSubscribers initialParents subscriber = do
17641977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17651978 keyRef <- liftIO $ newIORef k
17661979 let s = subscriber $ liftIO $ readIORef keyRef
1767− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17681981 height <- liftIO $ getEventSubscribedHeight parentSubd
1769− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17701983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17711984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17721985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17731986 )
1987+
17741988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
17751989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
17761990
1777−type MergeUpdateFunc k x p s
1778− = (forall a. EventM x (k a) -> Subscriber x a)
1991+type MergeUpdateFunc k v x p s
1992+ = (forall a. EventM x (k a) -> Subscriber x (v a))
17791993 -> IORef HeightBag
17801994 -> DMap k s
17811995 -> p
17821996 -> EventM x ([EventSubscription x], DMap k s)
17831997
1784−type MergeInitFunc k x s
1785− = DMap k (Event x)
1786− -> (forall a. EventM x (k a) -> Subscriber x a)
1787− -> EventM x (DMap k Identity, [Height], DMap k s)
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)
17882004
17892005type MergeDestroyFunc k s
17902006 = DMap k s
17912007 -> IO ()
17922008
1793−data Merge x k s = Merge
2009+data Merge x k v s = Merge
17942010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
17952011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
17962012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1797− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1798− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
17992015 }
18002016
1801−invalidateMergeHeight :: Merge x k s -> IO ()
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
18022018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
18032019
18042020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18052021invalidateMergeHeight' heightRef sub = do
18062022 oldHeight <- readIORef heightRef
1807− when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2023+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024+ when (oldHeight /= invalidHeight) $ do
18082025 writeIORef heightRef $! invalidHeight
18092026 subscriberInvalidateHeight sub oldHeight
18102027
1811−
1812−revalidateMergeHeight :: Merge x k s -> IO ()
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
18132029revalidateMergeHeight m = do
18142030 currentHeight <- readIORef $ _merge_heightRef m
1815− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
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
18162034 heights <- readIORef $ _merge_heightBagRef m
18172035 parents <- readIORef $ _merge_parentsRef m
18182036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1820,44 +2038,53 @@ revalidateMergeHeight m = do
18202038 LT -> return ()
18212039 EQ -> do
18222040 let height = succHeight $ heightBagMax heights
1823− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18242042 writeIORef (_merge_heightRef m) $! height
18252043 subscriberRecalculateHeight (_merge_sub m) height
18262044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
18272045
1828−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18292047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18302048 vals <- liftIO $ readIORef $ _merge_accumRef m
1831− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
18322052 --TODO: Assert that m is not empty
18332053 subscriberPropagate (_merge_sub m) vals
18342054
1835−mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1836−mergeSubscriber m getKey = Subscriber
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
18372078 { subscriberPropagate = \a -> do
18382079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18392080 k <- getKey
1840− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
18412082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18422083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18432084 when (DMap.null oldM) $ do -- Only schedule the firing once
18442085 height <- liftIO $ readIORef $ _merge_heightRef m
1845− --TODO: assertions about height
1846− currentHeight <- getCurrentHeight
1847− when (height <= currentHeight) $ do
1848− if height /= invalidHeight
1849− then do
1850− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1851− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1852− else liftIO $ do
1853−#ifdef DEBUG_CYCLES
1854− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1855− stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1856− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1857−#else
1858− let cycleInfo = ""
1859−#endif
1860− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18612088 scheduleMergeSelf m height
18622089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18632090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1868,30 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18682095 }
18692096
18702097--TODO: Be able to run as much of this as possible promptly
1871−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1872−updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
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)
18732100 where updateMe = do
18742101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1875− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18762103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18772104 return subscriptionsToKill
18782105
1879−{-# INLINE mergeCheap' #-}
1880−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)
1881−mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
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
18822110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
18832111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
18842112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
18852113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
18862114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1887− let m = Merge
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
18882130 { _merge_parentsRef = parentsRef
18892131 , _merge_heightBagRef = heightBagRef
18902132 , _merge_heightRef = heightRef
18912133 , _merge_sub = sub
18922134 , _merge_accumRef = accumRef
18932135 }
1894− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
18952137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
18962138 myHeight = if invalidHeight `elem` heights
18972139 then invalidHeight
@@ -1900,50 +2142,57 @@ mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19002142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19012143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19022144 else (Nothing, dm)
1903− unless (DMap.null accum) $ do
1904− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19052146 liftIO $ writeIORef accumRef $! accum
19062147 liftIO $ writeIORef heightRef $! myHeight
19072148 liftIO $ writeIORef heightBagRef $! myHeightBag
1908− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19092149 liftIO $ writeIORef parentsRef $! initialParentState
19102150 defer $ SomeMergeInit $ do
1911− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19122152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1913− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1914− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19152155 , subscriberInvalidateHeight = \_ -> return ()
19162156 , subscriberRecalculateHeight = \_ -> return ()
19172157 }
1918− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1919− forM_ change $ \c -> defer $ updateMerge m updateFunc c
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
19202160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19212161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19222162 -- its subscription.
1923− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19242164 let unsubscribeAll = destroy =<< readIORef parentsRef
1925− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1926− , occ
1927− )
19282165
1929−mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
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)
19302170mergeInt = cacheEvent . mergeIntCheap
19312171
19322172{-# INLINABLE mergeIntCheap #-}
1933−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2173+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
19342174mergeIntCheap d = Event $ \sub -> do
19352175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19362176 accum <- liftIO $ FastMutableIntMap.newEmpty
19372177 heightRef <- liftIO $ newIORef zeroHeight
19382178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19392179 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+ }
19402190 let scheduleSelf = do
19412191 height <- liftIO $ readIORef $ heightRef
19422192 scheduleMerge' height heightRef $ do
19432193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19442194 subscriberPropagate sub vals
1945− invalidateMyHeight = do
1946− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19472196 recalculateMyHeight = do
19482197 currentHeight <- readIORef heightRef
19492198 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?
@@ -1953,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19532202 LT -> return ()
19542203 EQ -> do
19552204 let height = succHeight $ heightBagMax heights
1956− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19572206 writeIORef heightRef $! height
19582207 subscriberRecalculateHeight sub height
19592208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19602209 mySubscriber k = Subscriber
19612210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19622213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19632214 liftIO $ FastMutableIntMap.insert accum k a
19642215 when wasEmpty scheduleSelf
@@ -1992,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
19922243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
19932244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
19942245 return Nothing
1995− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19962246 defer $ SomeMergeInit $ do
19972247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
19982248 where
@@ -2006,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
20062256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20072257 liftIO $ for_ oldParents $ \oldParent -> do
20082258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20092261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20102262 return $ IntMap.elems oldParents
2011− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20122264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20132265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20142266 defer $ updateMe a
20152267 , subscriberInvalidateHeight = \_ -> return ()
20162268 , subscriberRecalculateHeight = \_ -> return ()
20172269 }
2018− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20192271 forM_ change $ \c -> defer $ updateMe c
20202272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20212273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20222274 -- its subscription.
2023− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20242276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2025− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2026− , occ
2027− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20282280
20292281newtype 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) }
20302283
2031−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2032−fan e =
2284+fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285+fanG e = unsafePerformIO $ do
2286+ ref <- newIORef Nothing
20332287 let f = Fan
20342288 { fanParent = e
2035− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20362290 }
2037− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20382292
20392293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20402294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2088,7 +2342,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
20882342-- | Run an event action outside of a frame
20892343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
20902344runFrame a = SpiderHost $ do
2091− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
20922346 let go = do
20932347 result <- a
20942348 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
@@ -2105,19 +2359,19 @@ runFrame a = SpiderHost $ do
21052359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21062360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21072361 writeIORef vRef v
2108− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21092363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21102364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21112365 writeIORef (eventEnvMergeUpdates env) []
2112− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21132367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2114− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21152369 toReconnect <- readIORef toReconnectRef
21162370 clearEventEnv env
21172371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21182372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21192373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2120− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21212375 finalize wi
21222376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21232377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2131,7 +2385,7 @@ runFrame a = SpiderHost $ do
21312385 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
21322386 {-
21332387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2134− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21352389 EventRoot _ -> "EventRoot"
21362390 EventNever -> "EventNever"
21372391 _ -> "something else"
@@ -2146,7 +2400,7 @@ runFrame a = SpiderHost $ do
21462400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21472401 when (parentHeight /= myHeight) $ do
21482402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2149− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21502404 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
21512405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21522406 unsubscribe subscription
@@ -2187,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
21872441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
21882442 when (oldHeight /= invalidHeight) $ do
21892443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2190− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
21912445
21922446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
21932447updateSwitchHeight new subscribed = do
@@ -2195,7 +2449,7 @@ updateSwitchHeight new subscribed = do
21952449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21962450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21972451 writeIORef (switchSubscribedHeight subscribed) $! new
2198− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
21992453
22002454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22012455recalculateCoincidenceHeight subscribed = do
@@ -2204,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22042458 height <- calculateCoincidenceHeight subscribed
22052459 when (height /= invalidHeight) $ do
22062460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2207− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22082462
22092463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22102464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2266,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22662520 {-# INLINABLE headE #-}
22672521 headE = R.slowHeadE
22682522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22692525
22702526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22712527 {-# INLINABLE sample #-}
@@ -2287,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
22872543 {-# INLINABLE headE #-}
22882544 headE = R.slowHeadE
22892545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
22902549
22912550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
22922551 {-# INLINE return #-}
@@ -2295,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
22952554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
22962555 {-# INLINE (>>) #-}
22972556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
22982558 {-# INLINE fail #-}
22992559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
23002561
23012562{-# INLINABLE newJoinDyn #-}
2302−newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2563+newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
23032564newJoinDyn d =
23042565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
23052566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2348,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23482609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23492610 {-# INLINABLE headE #-}
23502611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23512615
23522616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23532617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2364,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23642628 {-# INLINABLE headE #-}
23652629 headE = R.slowHeadE
23662630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23672633
23682634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23692635 {-# INLINABLE sample #-}
@@ -2384,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
23842650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
23852651 {-# INLINABLE headE #-}
23862652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
23872655
23882656--------------------------------------------------------------------------------
23892657-- Deprecated items
@@ -2421,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24212689 touch h
24222690 return result
24232691
2424−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
24252693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
24262694 newFanEventWithTrigger f = SpiderHost $ do
24272695 es <- newFanEventWithTriggerIO f
24282696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24292697
2430−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24312699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24322700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24332701 es <- newFanEventWithTriggerIO f
@@ -2449,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24492717#ifdef DEBUG
24502718 depthRef <- newIORef 0
24512719#endif
2452− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24532721 { _spiderTimeline_lock = lock
24542722 , _spiderTimeline_eventEnv = env
24552723#ifdef DEBUG
@@ -2461,17 +2729,17 @@ unsafeNewSpiderTimelineEnv = do
24612729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
24622730newSpiderTimeline = withSpiderTimeline (pure . Some)
24632731
2464−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
24652733
24662734instance Reifies s (SpiderTimelineEnv x) =>
24672735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2468− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24692737
24702738localSpiderTimeline
2471− :: Proxy s
2739+ :: proxy s
24722740 -> SpiderTimelineEnv x
24732741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2474−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
24752743
24762744-- | Pass a new timeline to the given function.
24772745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2479,18 +2747,18 @@ withSpiderTimeline k = do
24792747 env <- unsafeNewSpiderTimelineEnv
24802748 reify env $ \s -> k $ localSpiderTimeline s env
24812749
2482−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2750+newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
24832751
24842752type ComputeM = EventM
24852753
2486−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2754+newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
24872755
24882756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24892757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
24902758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
24912759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2492− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2493− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
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 }
24942762 type PullM (SpiderTimeline x) = SpiderPullM x
24952763 type PushM (SpiderTimeline x) = SpiderPushM x
24962764 {-# INLINABLE never #-}
@@ -2503,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25032771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
25042772 {-# INLINABLE pull #-}
25052773 pull = SpiderBehavior . pull . coerce
2506− {-# INLINABLE merge #-}
2507− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2508− {-# INLINABLE fan #-}
2509− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
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
25102783 {-# INLINABLE switch #-}
25112784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
25122785 {-# INLINABLE coincidence #-}
@@ -2514,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25142787 {-# INLINABLE current #-}
25152788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
25162789 {-# INLINABLE updated #-}
2517− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
25182791 {-# INLINABLE unsafeBuildDynamic #-}
25192792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
25202793 {-# INLINABLE unsafeBuildIncremental #-}
25212794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2522− {-# INLINABLE mergeIncremental #-}
2523− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2524− {-# INLINABLE mergeIncrementalWithMove #-}
2525− mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
2795+ {-# INLINABLE mergeIncrementalG #-}
2796+ mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797+ {-# INLINABLE mergeIncrementalWithMoveG #-}
2798+ mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
25262799 {-# INLINABLE currentIncremental #-}
25272800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
25282801 {-# INLINABLE updatedIncremental #-}
@@ -2533,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25332806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25342807 eventCoercion Coercion = Coercion
25352808 behaviorCoercion Coercion = Coercion
2536− dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2809+ dynamicCoercion Coercion = Coercion
2810+ incrementalCoercion Coercion Coercion = Coercion
25372811 {-# INLINABLE mergeIntIncremental #-}
2538− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25392813 {-# INLINABLE fanInt #-}
25402814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25412815
@@ -2560,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
25602834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
25612835
25622836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2563−newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2837+newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25642838
25652839instance Monad (SpiderHost x) where
25662840 {-# INLINABLE (>>=) #-}
@@ -2569,8 +2843,14 @@ instance Monad (SpiderHost x) where
25692843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25702844 {-# INLINABLE return #-}
25712845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
25722847 {-# INLINABLE fail #-}
2573− fail s = SpiderHost $ fail s
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2853+ fail s = SpiderHost $ MonadFail.fail s
25742854
25752855-- | Run an action affecting the global Spider timeline; this will be guarded by
25762856-- a mutex for that timeline
@@ -2582,7 +2862,7 @@ runSpiderHost (SpiderHost a) = a
25822862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
25832863runSpiderHostForTimeline (SpiderHost a) _ = a
25842864
2585−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
25862866 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25872867
25882868instance Monad (SpiderHostFrame x) where
@@ -2592,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
25922872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
25932873 {-# INLINABLE return #-}
25942874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
25952876 {-# INLINABLE fail #-}
25962877 fail s = SpiderHostFrame $ fail s
2878+#endif
25972879
25982880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
25992881 notReadyUntil _ = pure ()
26002882 notReady = pure ()
26012883
2602−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
26032885newEventWithTriggerIO f = do
26042886 es <- newFanEventWithTriggerIO $ \Refl -> f
26052887 return $ select es Refl
26062888
2607−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
26082890newFanEventWithTriggerIO f = do
26092891 occRef <- newIORef DMap.empty
26102892 subscribedRef <- newIORef DMap.empty
@@ -2638,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26382920instance PrimMonad (SpiderHostFrame x) where
26392921 type PrimState (SpiderHostFrame x) = PrimState IO
26402922 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 ()