@@ -9,39 +9,49 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MagicHash #-}
13−{-# LANGUAGE MultiParamTypeClasses #-}
14−{-# LANGUAGE MultiWayIf #-}
1512{-# LANGUAGE RankNTypes #-}
1613{-# LANGUAGE RoleAnnotations #-}
1714{-# LANGUAGE ScopedTypeVariables #-}
1815{-# LANGUAGE TypeFamilies #-}
1916{-# LANGUAGE TypeOperators #-}
2017{-# LANGUAGE UndecidableInstances #-}
18+{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
21+{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
23+
2124#ifdef USE_REFLEX_OPTIMIZER
2225{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2326#endif
27+{-# OPTIONS_GHC -Wunused-binds #-}
2428-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2529-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
2630module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
2731
28−import Control.Applicative
32+#if MIN_VERSION_base(4,10,0)
33+import Control.Applicative (liftA2)
34+#endif
2935import Control.Concurrent
3036import Control.Exception
31−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
3238import Control.Monad.Exception
33−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3440import Control.Monad.Primitive
35−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
41+import Control.Monad.Reader.Class
42+import Control.Monad.IO.Class
43+import Control.Monad.ReaderIO
3644import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
3747import Data.Align
3848import Data.Coerce
39−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4050import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
4152import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
4253import qualified Data.FastMutableIntMap as FastMutableIntMap
4354import Data.Foldable hiding (concat, elem, sequence_)
44−import Data.Function
4555import Data.Functor.Constant
4656import Data.Functor.Misc
4757import Data.Functor.Product
@@ -49,59 +59,73 @@ import Data.GADT.Compare
4959import Data.IntMap.Strict (IntMap)
5060import qualified Data.IntMap.Strict as IntMap
5161import Data.IORef
52−import Data.List hiding (foldl')
53−import Data.Maybe
54−import Data.Monoid ((<>))
62+import Data.Kind (Type)
63+import Data.Maybe hiding (mapMaybe)
64+import Data.Monoid (mempty, (<>))
5565import Data.Proxy
5666import Data.These
5767import Data.Traversable
58−import Data.Word
59−import GHC.Exts
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
6071import GHC.IORef (IORef (..))
6172import GHC.Stack
6273import Reflex.FastWeak
63−import Reflex.FunctorMaybe
6474import System.IO.Unsafe
6575import System.Mem.Weak
6676import Unsafe.Coerce
6777
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+
6887#ifdef DEBUG_CYCLES
6988import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7091import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7192import qualified Data.List.NonEmpty as NonEmpty
72−import Data.Monoid (mempty)
7393import Data.Tree (Forest, Tree (..), drawForest)
74−#endif
94+import Data.List (isPrefixOf)
7595
76−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
7797import qualified Data.FastWeakBag as FastWeakBag
98+
7899import Data.Reflection
79−import Data.Some (Some)
80−import qualified Data.Some as Some
100+import Data.Some (Some(Some))
81101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
82103import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
83104import qualified Data.WeakBag as WeakBag
84105import qualified Reflex.Class
85106import qualified Reflex.Class as R
86107import qualified Reflex.Host.Class
87108import Reflex.NotReady.Class
88−import Reflex.Patch
89−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
90−
91−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
92−import Prelude hiding (any, concat, mapM, mapM_, sequence)
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
93112
94113#ifdef DEBUG_TRACE_EVENTS
95114import qualified Data.ByteString.Char8 as BS8
96115import System.IO (stderr)
116+import Data.List (isPrefixOf)
97117#endif
98118
99−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
100122
123+#ifdef DEBUG_TRACE_EVENTS
101124withStackOneLine :: (BS8.ByteString -> a) -> a
102125withStackOneLine expr = unsafePerformIO $ do
103126 stack <- currentCallStack
104− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
105129
106130#endif
107131
@@ -112,28 +136,42 @@ debugInvalidateHeight :: Bool
112136debugInvalidate :: Bool
113137
114138#ifdef DEBUG
115−
116139#define DEBUG_NODEIDS
117140
141+#ifdef DEBUG_TRACE_PROPAGATION
118142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
119146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
120150debugInvalidateHeight = False
151+#endif
121152
153+#ifdef DEBUG_TRACE_INVALIDATION
122154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
123158
124159class HasNodeId a where
125160 getNodeId :: a -> Int
126161
127−instance HasNodeId (Hold x p a) where
128− 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
129167
130−instance HasNodeId (PushSubscribed x a b) where
131− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
132170
133171instance HasNodeId (SwitchSubscribed x a) where
134172 getNodeId = switchSubscribedNodeId
135173
136−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
137175 getNodeId = fanSubscribedNodeId
138176
139177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -147,41 +185,16 @@ instance HasNodeId (Pull x a) where
147185
148186{-# INLINE showNodeId #-}
149187showNodeId :: HasNodeId a => a -> String
150−showNodeId = ("#"<>) . show . getNodeId
151−
152−showSubscriberType :: Subscriber x a -> String
153−showSubscriberType = \case
154− SubscriberPush _ _ -> "SubscriberPush"
155− SubscriberMerge _ _ -> "SubscriberMerge"
156− SubscriberFan _ -> "SubscriberFan"
157− SubscriberMergeChange _ -> "SubscriberMergeChange"
158− SubscriberHold _ -> "SubscriberHold"
159− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
160− SubscriberSwitch _ -> "SubscriberSwitch"
161− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
162− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
163− SubscriberHandle -> "SubscriberHandle"
164−
165−showEventType :: Event x a -> String
166−showEventType = \case
167− EventRoot _ _ -> "EventRoot"
168− EventNever -> "EventNever"
169− EventPush _ -> "EventPush"
170− EventMerge _ -> "EventMerge"
171− EventFan _ _ -> "EventFan"
172− EventSwitch _ -> "EventSwitch"
173− EventCoincidence _ -> "EventCoincidence"
174− EventHold _ -> "EventHold"
175− EventDyn _ -> "EventDyn"
176− EventHoldIdentity _ -> "EventHoldIdentity"
177− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
178193
179194#else
180195
181196debugPropagate = False
182−
183197debugInvalidateHeight = False
184−
185198debugInvalidate = False
186199
187200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -189,6 +202,10 @@ debugInvalidate = False
189202showNodeId :: a -> String
190203showNodeId _ = ""
191204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
192209#endif
193210
194211#ifdef DEBUG_NODEIDS
@@ -198,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
198215
199216newNodeId :: IO Int
200217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
201−
202−{-# NOINLINE unsafeNodeId #-}
203−unsafeNodeId :: a -> Int
204−unsafeNodeId a = unsafePerformIO $ do
205− touch a
206− newNodeId
207218#endif
208219
209220--------------------------------------------------------------------------------
@@ -242,7 +253,7 @@ subscribeAndRead = unEvent
242253{-# INLINE [1] pushCheap #-}
243254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
244255pushCheap !f e = Event $ \sub -> do
245− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
246257 { subscriberPropagate = \a -> do
247258 mb <- f a
248259 mapM_ (subscriberPropagate sub) mb
@@ -261,10 +272,10 @@ terminalSubscriber p = Subscriber
261272
262273-- | Subscribe to an Event only for the duration of one occurrence
263274{-# INLINE subscribeAndReadHead #-}
264−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)
265276subscribeAndReadHead e sub = do
266277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
267− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
268279 { subscriberPropagate = \a -> do
269280 liftIO $ unsubscribe =<< readIORef subscriptionRef
270281 subscriberPropagate sub a
@@ -275,24 +286,42 @@ subscribeAndReadHead e sub = do
275286 return (subscription, occ)
276287
277288--TODO: Make this lazy in its input event
278−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)
279290headE originalE = do
280291 parent <- liftIO $ newIORef $ Just originalE
281292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
282293 let clearParent = liftIO $ writeIORef parent Nothing
283− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
284295 when (isJust occ) clearParent
285− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
286297 liftIO (readIORef parent) >>= \case
287− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
288299 Just e -> subscribeAndReadHead e sub
289300
290301data CacheSubscribed x a
291302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
292303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
293304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
294308 }
295309
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+
296325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
297326-- repeatedly
298327--
@@ -307,27 +336,33 @@ cacheEvent e =
307336#else
308337 Event $
309338#endif
310− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
311− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
312− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
313343#ifdef DEBUG_TRACE_EVENTS
314344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
315345#endif
316346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
317347 Just subscribedTicket -> return subscribedTicket
318348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
319352 subscribers <- liftIO FastWeakBag.empty
320353 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
321357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
322− { subscriberPropagate = \a -> do
323− liftIO $ writeIORef occRef $ Just a
324− scheduleClear occRef
325− propagateFast a subscribers
326− , subscriberInvalidateHeight = \old -> do
327− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
328− , subscriberRecalculateHeight = \new -> do
329− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
330− }
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+ }
331366 when (isJust occ) $ do
332367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
333368 scheduleClear occRef
@@ -335,29 +370,45 @@ cacheEvent e =
335370 { _cacheSubscribed_subscribers = subscribers
336371 , _cacheSubscribed_parent = parentSub
337372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
338376 }
339377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
340378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
341379 return subscribedTicket
342− liftIO $ do
343− subscribed <- getFastWeakTicketValue subscribedTicket
344− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
345− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
346− let es = EventSubscription
347− { _eventSubscription_unsubscribe = do
348− FastWeakBag.remove ticket
349− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
350− when isEmpty $ do
351− writeIORef mSubscribedRef emptyFastWeak
352− unsubscribe $ _cacheSubscribed_parent subscribed
353− touch ticket
354− touch subscribedTicket
355− , _eventSubscription_subscribed = EventSubscribed
356− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
357− , eventSubscribedRetained = toAny subscribedTicket
358− }
359− }
360− 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+
361412
362413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
363414subscribe e s = fst <$> subscribeAndRead e s
@@ -369,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
369420 let es = tag subd
370421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
371422
372−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
373424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
374425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
375429eventNever :: Event x a
376−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
377431
378−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)
379433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
380434
381435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -384,7 +438,7 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
384438eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
385439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
386440
387−eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
441+eventHold :: Hold x p -> Event x p
388442eventHold !h = Event $ subscribeHoldEvent h
389443
390444eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
@@ -410,16 +464,6 @@ data Subscriber x a = Subscriber
410464 , subscriberRecalculateHeight :: !(Height -> IO ())
411465 }
412466
413−--TODO: Move this comment to WeakBag
414−-- These function are constructor functions that are marked NOINLINE so they are
415−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
416−-- so any weak references that are attached to the constructors will have their
417−-- finalizer run. Using the opaque constructor, does not see the
418−-- constructor application, so it behaves like an IORef and cannot be fused away.
419−--
420−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
421−-- the weak pointer to it in some cases.
422−
423467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
424468newSubscriberHold h = return $ Subscriber
425469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -427,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
427471 , subscriberRecalculateHeight = \_ -> return ()
428472 }
429473
430−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
431−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
432476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
433477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
434− 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"
435479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
436480 scheduleClear $ fanSubscribedOccurrence subscribed
437− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
438482 propagate v $ _fanSubscribedChildren_list subsubs
439483 return $ Constant ()
440484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
441485 return ()
442486 , subscriberInvalidateHeight = \old -> do
443− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
444487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
445− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
447489 , subscriberRecalculateHeight = \new -> do
448− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
449490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
450− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
452492 }
453493
454494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
455−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
456496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
457− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
458497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
459498 scheduleClear $ switchSubscribedOccurrence subscribed
460499 propagate a $ switchSubscribedSubscribers subscribed
461500 , subscriberInvalidateHeight = \_ -> do
462− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
463501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
464502 when (oldHeight /= invalidHeight) $ do
465503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
466− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
467− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
468− , subscriberRecalculateHeight = \new -> do
469− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
470− updateSwitchHeight new subscribed
471− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
472− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
473507
474508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
475−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
476510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
477− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
478511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
479512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
480513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
481514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
482515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
483517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
484518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
485519 case occ of
486− Nothing -> do
520+ Nothing ->
487521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
488522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
489− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
490− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
491525 Just o -> do -- Since it's already firing, no need to adjust height
492526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
493527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
494528 propagate o $ coincidenceSubscribedSubscribers subscribed
495− , subscriberInvalidateHeight = \_ -> do
496− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
497− invalidateCoincidenceHeight subscribed
498− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
499− , subscriberRecalculateHeight = \_ -> do
500− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
501− recalculateCoincidenceHeight subscribed
502− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
503531 }
504532
505533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
506−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
507535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
508− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
509536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
510537 case occ of
511538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -513,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
513540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
514541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
515542 propagate a $ coincidenceSubscribedSubscribers subscribed
516− , subscriberInvalidateHeight = \_ -> do
517− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
518− invalidateCoincidenceHeight subscribed
519− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
520− , subscriberRecalculateHeight = \_ -> do
521− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
522− recalculateCoincidenceHeight subscribed
523− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
524545 }
525546
526547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -530,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
530551recalculateSubscriberHeight = flip subscriberRecalculateHeight
531552
532553-- | Propagate everything at the current height
533−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
534−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) $
535556 -- 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
536557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
537− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
538559
539560-- | Propagate everything at the current height
540−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
541−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) $
542563 -- 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
543564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
544− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
545566
546567--------------------------------------------------------------------------------
547568-- EventSubscribed
@@ -550,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
550571toAny :: a -> Any
551572toAny = unsafeCoerce
552573
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.
553579data EventSubscribed x = EventSubscribed
554580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
555581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
556582#ifdef DEBUG_CYCLES
557− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
558584 , eventSubscribedHasOwnHeightRef :: !Bool
559585 , eventSubscribedWhoCreated :: !(IO [String])
560586#endif
@@ -581,13 +607,23 @@ eventSubscribedNever = EventSubscribed
581607 , eventSubscribedWhoCreated = return ["never"]
582608#endif
583609 }
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+ }
584620
585−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
586622eventSubscribedFan !subscribed = EventSubscribed
587623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
588624 , eventSubscribedRetained = toAny subscribed
589625#ifdef DEBUG_CYCLES
590− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
591627 , eventSubscribedHasOwnHeightRef = False
592628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
593629#endif
@@ -600,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
600636#ifdef DEBUG_CYCLES
601637 , eventSubscribedGetParents = do
602638 s <- readIORef $ switchSubscribedCurrentParent subscribed
603− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
604640 , eventSubscribedHasOwnHeightRef = True
605641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
606642#endif
@@ -613,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
613649#ifdef DEBUG_CYCLES
614650 , eventSubscribedGetParents = do
615651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
616− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
617− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
618654 return $ outerParent : innerParents
619655 , eventSubscribedHasOwnHeightRef = True
620656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -628,20 +664,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
628664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
629665whoCreatedEventSubscribed = eventSubscribedWhoCreated
630666
631−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
632668walkInvalidHeightParents s0 = do
633− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
634670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
635671 when (h == invalidHeight) $ do
636672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
637− modify (Some.This s :)
673+ modify (s :)
638674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
639− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
640676 return subscribers
641677#endif
642678
643679{-# INLINE subscribeHoldEvent #-}
644−subscribeHoldEvent :: HasSpiderTimeline x => Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
645681subscribeHoldEvent = subscribeAndRead . holdEvent
646682
647683--------------------------------------------------------------------------------
@@ -664,7 +700,7 @@ behaviorPull !p = Behavior $ do
664700 val <- liftIO $ readIORef $ pullValue p
665701 case val of
666702 Just subscribed -> do
667− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
668704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
669705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
670706 return $ pullSubscribedValue subscribed
@@ -673,7 +709,7 @@ behaviorPull !p = Behavior $ do
673709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
674710 parentsRef <- liftIO $ newIORef []
675711 holdInits <- askBehaviorHoldInits
676− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
677713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
678714 parents <- liftIO $ readIORef parentsRef
679715 let subscribed = PullSubscribed
@@ -683,7 +719,7 @@ behaviorPull !p = Behavior $ do
683719 , pullSubscribedParents = parents
684720 }
685721 liftIO $ writeIORef (pullValue p) $ Just subscribed
686− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
687723 return a
688724
689725behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -694,7 +730,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
694730readHoldTracked h = do
695731 result <- liftIO $ readIORef $ holdValue h
696732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
697− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
698734 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
699735 return result
700736
@@ -708,42 +744,46 @@ readBehaviorUntracked b = do
708744-- Dynamic
709745--------------------------------------------------------------------------------
710746
711−data Dynamic x p = Dynamic
712− { dynamicCurrent :: !(Behavior x (PatchTarget p))
713− , dynamicUpdated :: !(Event x p)
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
751+ , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
714752 }
715753
716−dynamicHold :: HasSpiderTimeline x => 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
717760dynamicHold !h = Dynamic
718761 { dynamicCurrent = behaviorHold h
719762 , dynamicUpdated = eventHold h
720763 }
721764
722−dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
723766dynamicHoldIdentity = dynamicHold
724767
725−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
726769dynamicConst !a = Dynamic
727770 { dynamicCurrent = behaviorConst a
728771 , dynamicUpdated = eventNever
729772 }
730773
731−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
732775dynamicDyn !d = Dynamic
733776 { dynamicCurrent = behaviorDyn d
734777 , dynamicUpdated = eventDyn d
735778 }
736779
737−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
738781dynamicDynIdentity = dynamicDyn
739782
740783--------------------------------------------------------------------------------
741784-- Combinators
742785--------------------------------------------------------------------------------
743786
744−--TODO: Figure out why certain things are not 'representational', then make them
745−--representational so we can use coerce
746−
747787--type role Hold representational
748788data Hold x p
749789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -764,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
764804
765805-- | Stores all global data relevant to a particular Spider timeline; only one
766806-- value should exist for each type @x@
767−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
768813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
769814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
770815#ifdef DEBUG
771816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
772817#endif
773818 }
774−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
775820
776821instance Eq (SpiderTimelineEnv x) where
777822 _ == _ = True -- Since only one exists of each type
778823
779824instance GEq SpiderTimelineEnv where
780− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
781826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
782827 else Nothing
783828
@@ -787,9 +832,9 @@ data EventEnv x
787832 , eventEnvDynInits :: !(IORef [SomeDynInit x])
788833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
789834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
790− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
791− , eventEnvIntClears :: !(IORef [SomeIntClear])
792− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
793838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
794839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
795840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -800,7 +845,7 @@ runEventM :: EventM x a -> IO a
800845runEventM = unEventM
801846
802847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
803−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
804849
805850class MonadIO m => Defer a m where
806851 getDeferralQueue :: m (IORef [a])
@@ -861,29 +906,29 @@ putCurrentHeight h = do
861906 heightRef <- asksEventEnv eventEnvCurrentHeight
862907 liftIO $ writeIORef heightRef $! h
863908
864−instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
865910 {-# INLINE getDeferralQueue #-}
866911 getDeferralQueue = asksEventEnv eventEnvClears
867912
868913{-# INLINE scheduleClear #-}
869−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
870−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
871916
872−instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
873918 {-# INLINE getDeferralQueue #-}
874919 getDeferralQueue = asksEventEnv eventEnvIntClears
875920
876921{-# INLINE scheduleIntClear #-}
877−scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
878−scheduleIntClear r = defer $ SomeIntClear r
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
879924
880−instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
881926 {-# INLINE getDeferralQueue #-}
882927 getDeferralQueue = asksEventEnv eventEnvRootClears
883928
884929{-# INLINE scheduleRootClear #-}
885−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
886−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
887932
888933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
889934 {-# INLINE getDeferralQueue #-}
@@ -938,9 +983,9 @@ getHoldEventSubscription h = do
938983
939984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
940985
941−--type role BehaviorM representational
942986-- BehaviorM can sample behaviors
943−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))
944989
945990instance Monad (BehaviorM x) where
946991 {-# INLINE (>>=) #-}
@@ -949,14 +994,16 @@ instance Monad (BehaviorM x) where
949994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
950995 {-# INLINE return #-}
951996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
952998 {-# INLINE fail #-}
953999 fail s = BehaviorM $ fail s
1000+#endif
9541001
9551002data BehaviorSubscribed x a
9561003 = forall p. BehaviorSubscribedHold (Hold x p)
9571004 | BehaviorSubscribedPull (PullSubscribed x a)
9581005
959−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
9601007
9611008--type role PullSubscribed representational
9621009data PullSubscribed x a
@@ -991,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9911038#endif
9921039 }
9931040
994−data Root x (k :: * -> *)
1041+data Root x k
9951042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9961043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9971044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1010,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10101057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10111058
10121059-- EventM can do everything BehaviorM can, plus create holds
1013−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)
10141061
10151062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10161063
@@ -1035,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10351082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10361083
10371084heightBagAdd :: Height -> HeightBag -> HeightBag
1038−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
10391087
10401088heightBagRemove :: Height -> HeightBag -> HeightBag
10411089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1044,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10441092 0 -> IntMap.delete h c
10451093 _ -> IntMap.insert h (pred old) c
10461094
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+
10471102heightBagMax :: HeightBag -> Height
10481103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10491104 Just ((h, _), _) -> Height h
@@ -1061,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10611116heightBagVerify = id
10621117#endif
10631118
1064−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1065− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1066− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1067− , _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)))
10681123 }
10691124
1070−data FanSubscribed (x :: *) k
1071− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1072− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1073− , 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
10741129 , fanSubscribedParent :: !(EventSubscription x)
10751130#ifdef DEBUG_NODEIDS
10761131 , fanSubscribedNodeId :: Int
10771132#endif
10781133 }
10791134
1080−data Fan x k
1081− = Fan { fanParent :: !(Event x (DMap k Identity))
1082− , 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)))
10831138 }
10841139
10851140data SwitchSubscribed x a
@@ -1133,20 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11331188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11341189newInvalidatorPull p = return $! InvalidatorPull p
11351190
1136−instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1137− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
11381193
11391194instance HasSpiderTimeline x => Align (Event x) where
11401195 nil = eventNever
1141− align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1196+#if MIN_VERSION_these(0, 8, 0)
1197+instance HasSpiderTimeline x => Semialign (Event x) where
1198+#endif
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
11421201
1143−newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
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
1208+
1209+data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210+ | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211+ | HoldDyn !(Hold x p)
1212+
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11441214
1145−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)
11461216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11471217
11481218--TODO: Avoid the duplication between this and R.zipDynWith
1149−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)
11501220zipDynWith f da db =
11511221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11521222 ec = flip push eab $ \o -> do
@@ -1161,26 +1231,20 @@ zipDynWith f da db =
11611231 return $ Just $ Identity $ f a b
11621232 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11631233
1164−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1234+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
11651235buildDynamic readV0 v' = do
1166− result <- liftIO $ newIORef $ Left (readV0, v')
1236+ result <- liftIO $ newIORef $ BuildDyn (readV0, v')
11671237 let !d = Dyn result
11681238 defer $ SomeDynInit d
11691239 return d
11701240
11711241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1172−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1173− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11741244
11751245-- ResultM can read behaviors and events
11761246type ResultM = EventM
11771247
1178−{-# NOINLINE unsafeNewIORef #-}
1179−unsafeNewIORef :: a -> b -> IORef b
1180−unsafeNewIORef a b = unsafePerformIO $ do
1181− touch a
1182− newIORef b
1183−
11841248instance HasSpiderTimeline x => Functor (Event x) where
11851249 fmap f = push $ return . Just . f
11861250
@@ -1193,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
11931257
11941258{-# INLINABLE pull #-}
11951259pull :: BehaviorM x a -> Behavior x a
1196−pull a = behaviorPull $ Pull
1197− { pullCompute = a
1198− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11991262#ifdef DEBUG_NODEIDS
1200− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
12011264#endif
1202− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
12031272
12041273{-# INLINABLE switch #-}
12051274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1206−switch a = eventSwitch $ Switch
1207− { switchParent = a
1208− , switchSubscribed = unsafeNewIORef a Nothing
1209− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
12101281
12111282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1212−coincidence a = eventCoincidence $ Coincidence
1213− { coincidenceParent = a
1214− , coincidenceSubscribed = unsafeNewIORef a Nothing
1215− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
12161289
12171290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12181291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12191292run roots after = do
12201293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1221− t <- SpiderHost ask
1222− result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
1294+ let t = spiderTimeline :: SpiderTimelineEnv x
1295+ result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
12231296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12241297 occBefore <- liftIO $ do
12251298 occBefore <- readIORef occRef
@@ -1257,11 +1330,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
12571330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
12581331 EQ -> a
12591332
1260−data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
1333+newtype Clear a = Clear (IORef (Maybe a))
12611334
1262−data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
1335+newtype IntClear a = IntClear (IORef (IntMap a))
12631336
1264−data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
12651338
12661339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12671340
@@ -1273,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12731346 x' <- evaluate x
12741347 mkWeakPtr x' $
12751348 if debugFinalize
1276− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12771350 else Nothing
12781351
12791352type WeakList a = [Weak a]
12801353
1281−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12821359#ifdef DEBUG
1283−withIncreasedDepth :: CanTrace x m => m a -> m a
1284−withIncreasedDepth a = do
1285− spiderTimeline <- askSpiderTimelineEnv
1286− 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
12871385 result <- a
1288− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12891387 return result
1290−#else
1291−withIncreasedDepth :: m a -> m a
1292−withIncreasedDepth = id
1293−#endif
1294−
1295−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12961388
12971389{-# INLINE tracePropagate #-}
12981390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1299−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13001392
13011393{-# INLINE traceInvalidate #-}
13021394traceInvalidate :: String -> IO ()
1303−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
13041400
1305−{-# INLINE traceWhen #-}
1306−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1307−traceWhen p b message = traceMWhen p b $ return message
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
13081404
1309−{-# INLINE traceMWhen #-}
1310−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1311−traceMWhen _ b getMessage = when b $ do
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
13121408 message <- getMessage
1313−#ifdef DEBUG
1314− spiderTimeline <- askSpiderTimelineEnv
1315− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13161412#else
1317− 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+
13181448#endif
1319− liftIO $ putStrLn $ replicate d ' ' <> message
13201449
13211450whoCreatedIORef :: IORef a -> IO [String]
13221451whoCreatedIORef (IORef a) = whoCreated $! a
13231452
1324−#ifdef DEBUG_CYCLES
13251453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13261454groupByHead = \case
13271455 [] -> []
@@ -1332,20 +1460,54 @@ groupByHead = \case
13321460 | otherwise -> (x, xs :| []) : l
13331461
13341462listsToForest :: Eq a => [[a]] -> Forest a
1335−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+
13361495#endif
13371496
1497+
13381498{-# INLINE propagateSubscriberHold #-}
13391499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13401500propagateSubscriberHold h a = do
1341− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13421502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13431503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13441505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13451506 case {-# SCC "apply" #-} apply a v of
13461507 Nothing -> return ()
13471508 Just v' -> do
1348− {-# 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)
13491511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13501512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13511513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1353,25 +1515,25 @@ propagateSubscriberHold h a = do
13531515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13541516
13551517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1356−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13571519
13581520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13591521askInvalidator = do
1360− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13611523 case m of
13621524 Nothing -> return Nothing
13631525 Just (!wi, _) -> return $ Just wi
13641526
13651527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13661528askParentsRef = do
1367− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13681530 case m of
13691531 Nothing -> return Nothing
13701532 Just (_, !p) -> return $ Just p
13711533
13721534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13731535askBehaviorHoldInits = do
1374− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13751537 return his
13761538
13771539{-# INLINE getDynHold #-}
@@ -1379,20 +1541,27 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
13791541getDynHold d = do
13801542 mh <- liftIO $ readIORef $ unDyn d
13811543 case mh of
1382− Right h -> return h
1383− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13841546 holdInits <- getDeferralQueue
13851547 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1548+ hold' v0 v'
1549+ BuildDyn (readV0, v') -> do
1550+ v0 <- liftIO $ runEventM readV0
1551+ hold' v0 v'
1552+ where
1553+ hold' v0 v' = do
13861554 h <- hold v0 v'
1387− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13881556 return h
13891557
1558+
13901559-- Always refers to 0
13911560{-# NOINLINE zeroRef #-}
13921561zeroRef :: IORef Height
13931562zeroRef = unsafePerformIO $ newIORef zeroHeight
13941563
1395−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)
13961565getRootSubscribed k r sub = do
13971566 mSubscribed <- readIORef $ rootSubscribed r
13981567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1406,9 +1575,14 @@ getRootSubscribed k r sub = do
14061575 let !cached = rootSubscribed r
14071576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14081577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1409− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14101581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14111582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14121586 let !subscribed = RootSubscribed
14131587 { rootSubscribedKey = k
14141588 , rootSubscribedCachedSubscribed = cached
@@ -1417,7 +1591,7 @@ getRootSubscribed k r sub = do
14171591 , rootSubscribedUninit = uninit
14181592 , rootSubscribedWeakSelf = weakSelf
14191593#ifdef DEBUG_NODEIDS
1420− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14211595#endif
14221596 }
14231597 -- If we die at the same moment that all our children die, they will
@@ -1453,6 +1627,9 @@ data FanInt x a = FanInt
14531627 { _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
14541628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14551629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14561633 }
14571634
14581635newFanInt :: IO (FanInt x a)
@@ -1460,38 +1637,39 @@ newFanInt = do
14601637 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
14611638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14621639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14631643 return $ FanInt
14641644 { _fanInt_subscribers = subscribers
14651645 , _fanInt_subscriptionRef = subscriptionRef
14661646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14671650 }
14681651
1469−{-# NOINLINE unsafeNewFanInt #-}
1470−unsafeNewFanInt :: b -> FanInt x a
1471−unsafeNewFanInt b = unsafePerformIO $ do
1472− touch b
1473− newFanInt
1474−
14751652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1476−fanInt p =
1477− let self = unsafeNewFanInt p
1478− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14791656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14801657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1481− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14821660 { subscriberPropagate = \m -> do
14831661 liftIO $ writeIORef (_fanInt_occRef self) m
14841662 scheduleIntClear $ _fanInt_occRef self
1485− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1486− 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 ->
14871665 subscriberPropagate s v
1488− , subscriberInvalidateHeight = \old -> do
1489− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1490− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
14911669 subscriberInvalidateHeight s old
1492− , subscriberRecalculateHeight = \new -> do
1493− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1494− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
14951673 subscriberRecalculateHeight s new
14961674 }
14971675 liftIO $ do
@@ -1505,13 +1683,28 @@ fanInt p =
15051683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15061684 return b
15071685 Just b -> return b
1508− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15091687 currentOcc <- readIORef (_fanInt_occRef self)
1510− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1511− 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+
15121705
15131706{-# INLINABLE getFanSubscribed #-}
1514−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))
15151708getFanSubscribed k f sub = do
15161709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15171710 case mSubscribed of
@@ -1529,13 +1722,16 @@ getFanSubscribed k f sub = do
15291722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15301723 occRef <- liftIO $ newIORef parentOcc
15311724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15321728 let subscribed = FanSubscribed
15331729 { fanSubscribedCachedSubscribed = fanSubscribed f
15341730 , fanSubscribedOccurrence = occRef
15351731 , fanSubscribedParent = subscription
15361732 , fanSubscribedSubscribers = subscribersRef
15371733#ifdef DEBUG_NODEIDS
1538− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15391735#endif
15401736 }
15411737 let !self = (k, subscribed)
@@ -1545,7 +1741,7 @@ getFanSubscribed k f sub = do
15451741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15461742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15471743
1548−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15491745cleanupFanSubscribed (k, subscribed) = do
15501746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15511747 let reducedSubscribers = DMap.delete k subscribers
@@ -1557,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15571753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15581754
15591755{-# INLINE subscribeFanSubscribed #-}
1560−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
15611757subscribeFanSubscribed k subscribed sub = do
15621758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15631759 case DMap.lookup k subscribers of
@@ -1595,6 +1791,9 @@ getSwitchSubscribed s sub = do
15951791 when (isJust parentOcc) $ scheduleClear occRef
15961792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
15971793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
15981797 let !subscribed = SwitchSubscribed
15991798 { switchSubscribedCachedSubscribed = switchSubscribed s
16001799 , switchSubscribedOccurrence = occRef
@@ -1607,7 +1806,7 @@ getSwitchSubscribed s sub = do
16071806 , switchSubscribedCurrentParent = subscriptionRef
16081807 , switchSubscribedWeakSelf = weakSelf
16091808#ifdef DEBUG_NODEIDS
1610− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16111810#endif
16121811 }
16131812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1652,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16521851 scheduleClear innerSubdRef
16531852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16541853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16551857 let subscribed = CoincidenceSubscribed
16561858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16571859 , coincidenceSubscribedOccurrence = occRef
@@ -1662,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16621864 , coincidenceSubscribedInnerParent = innerSubdRef
16631865 , coincidenceSubscribedWeakSelf = weakSelf
16641866#ifdef DEBUG_NODEIDS
1665− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16661868#endif
16671869 }
16681870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1679,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16791881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16801882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16811883
1682−{-# INLINE merge #-}
1683−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1684−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)
16851889
16861890{-# INLINE mergeWithMove #-}
1687−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1688−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)
16891895
16901896{-# INLINE [1] mergeCheap #-}
1691−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1692−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
16931903 where
1694− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
16951905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
16961906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
16971907 (mOldSubd, newPs) <- case me of
16981908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
16991909 Just e -> do
17001910 let s = subscriber $ return k
1701− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
17021912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
17031913 let newParent = MergeSubscribedParent subscription
17041914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17051915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17061916 forM_ mOldSubd $ \oldSubd -> do
1707− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17081920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17091921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17101922 foldM f ([], oldParents) $ DMap.toList p
1711− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
17121925 getInitialSubscribers initialParents subscriber = do
17131926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17141927 let s = subscriber $ return k
1715− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17161929 height <- liftIO $ getEventSubscribedHeight parentSubd
1717− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17181931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17191932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17201933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17211934 )
1935+
17221936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
17231937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
17241938
17251939{-# INLINE [1] mergeCheapWithMove #-}
1726−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1727−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
17281945 where
1729− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17301947 updateMe subscriber heightBagRef oldParents p = do
17311948 -- Prepare new parents for insertion
1732− 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)
17331950 subscribeParent k e = do
17341951 keyRef <- liftIO $ newIORef k
17351952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1738,73 +1955,82 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
17381955 newParentHeight <- getEventSubscribedHeight subd
17391956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17401957 return $ MergeSubscribedParentWithMove subscription keyRef
1741− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
17421959 -- Collect old parents for deletion and update the keys of moved parents
1743− 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
17441961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17451962 Nothing -> do
1746− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17471966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17481967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17491968 Just toKey -> do
17501969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17511970 return Nothing
1752− 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+
17531974 return (toDelete, applyAlways p' oldParents)
1754− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17551976 getInitialSubscribers initialParents subscriber = do
17561977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17571978 keyRef <- liftIO $ newIORef k
17581979 let s = subscriber $ liftIO $ readIORef keyRef
1759− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17601981 height <- liftIO $ getEventSubscribedHeight parentSubd
1761− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17621983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17631984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17641985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17651986 )
1987+
17661988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
17671989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
17681990
1769−type MergeUpdateFunc k x p s
1770− = (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))
17711993 -> IORef HeightBag
17721994 -> DMap k s
17731995 -> p
17741996 -> EventM x ([EventSubscription x], DMap k s)
17751997
1776−type MergeInitFunc k x s
1777− = DMap k (Event x)
1778− -> (forall a. EventM x (k a) -> Subscriber x a)
1779− -> 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)
17802004
17812005type MergeDestroyFunc k s
17822006 = DMap k s
17832007 -> IO ()
17842008
1785−data Merge x k s = Merge
2009+data Merge x k v s = Merge
17862010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
17872011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
17882012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1789− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1790− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
17912015 }
17922016
1793−invalidateMergeHeight :: Merge x k s -> IO ()
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
17942018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
17952019
17962020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
17972021invalidateMergeHeight' heightRef sub = do
17982022 oldHeight <- readIORef heightRef
1799− 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
18002025 writeIORef heightRef $! invalidHeight
18012026 subscriberInvalidateHeight sub oldHeight
18022027
1803−
1804−revalidateMergeHeight :: Merge x k s -> IO ()
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
18052029revalidateMergeHeight m = do
18062030 currentHeight <- readIORef $ _merge_heightRef m
1807− 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
18082034 heights <- readIORef $ _merge_heightBagRef m
18092035 parents <- readIORef $ _merge_parentsRef m
18102036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1812,44 +2038,53 @@ revalidateMergeHeight m = do
18122038 LT -> return ()
18132039 EQ -> do
18142040 let height = succHeight $ heightBagMax heights
1815− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18162042 writeIORef (_merge_heightRef m) $! height
18172043 subscriberRecalculateHeight (_merge_sub m) height
18182044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
18192045
1820−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18212047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18222048 vals <- liftIO $ readIORef $ _merge_accumRef m
1823− 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
18242052 --TODO: Assert that m is not empty
18252053 subscriberPropagate (_merge_sub m) vals
18262054
1827−mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1828−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
18292078 { subscriberPropagate = \a -> do
18302079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18312080 k <- getKey
1832− 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
18332082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18342083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18352084 when (DMap.null oldM) $ do -- Only schedule the firing once
18362085 height <- liftIO $ readIORef $ _merge_heightRef m
1837− --TODO: assertions about height
1838− currentHeight <- getCurrentHeight
1839− when (height <= currentHeight) $ do
1840− if height /= invalidHeight
1841− then do
1842− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1843− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1844− else liftIO $ do
1845−#ifdef DEBUG_CYCLES
1846− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1847− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1848− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1849−#else
1850− let cycleInfo = ""
1851−#endif
1852− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18532088 scheduleMergeSelf m height
18542089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18552090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1860,30 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18602095 }
18612096
18622097--TODO: Be able to run as much of this as possible promptly
1863−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1864−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)
18652100 where updateMe = do
18662101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1867− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18682103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18692104 return subscriptionsToKill
18702105
1871−{-# INLINE mergeCheap' #-}
1872−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)
1873−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
18742110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
18752111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
18762112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
18772113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
18782114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1879− 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
18802130 { _merge_parentsRef = parentsRef
18812131 , _merge_heightBagRef = heightBagRef
18822132 , _merge_heightRef = heightRef
18832133 , _merge_sub = sub
18842134 , _merge_accumRef = accumRef
18852135 }
1886− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
18872137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
18882138 myHeight = if invalidHeight `elem` heights
18892139 then invalidHeight
@@ -1892,50 +2142,57 @@ mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
18922142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
18932143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
18942144 else (Nothing, dm)
1895− unless (DMap.null accum) $ do
1896− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
18972146 liftIO $ writeIORef accumRef $! accum
18982147 liftIO $ writeIORef heightRef $! myHeight
18992148 liftIO $ writeIORef heightBagRef $! myHeightBag
1900− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19012149 liftIO $ writeIORef parentsRef $! initialParentState
19022150 defer $ SomeMergeInit $ do
1903− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19042152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1905− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1906− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19072155 , subscriberInvalidateHeight = \_ -> return ()
19082156 , subscriberRecalculateHeight = \_ -> return ()
19092157 }
1910− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1911− 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
19122160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19132161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19142162 -- its subscription.
1915− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19162164 let unsubscribeAll = destroy =<< readIORef parentsRef
1917− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1918− , occ
1919− )
19202165
1921−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)
19222170mergeInt = cacheEvent . mergeIntCheap
19232171
19242172{-# INLINABLE mergeIntCheap #-}
1925−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)
19262174mergeIntCheap d = Event $ \sub -> do
19272175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19282176 accum <- liftIO $ FastMutableIntMap.newEmpty
19292177 heightRef <- liftIO $ newIORef zeroHeight
19302178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19312179 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+ }
19322190 let scheduleSelf = do
19332191 height <- liftIO $ readIORef $ heightRef
19342192 scheduleMerge' height heightRef $ do
19352193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19362194 subscriberPropagate sub vals
1937− invalidateMyHeight = do
1938− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19392196 recalculateMyHeight = do
19402197 currentHeight <- readIORef heightRef
19412198 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?
@@ -1945,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19452202 LT -> return ()
19462203 EQ -> do
19472204 let height = succHeight $ heightBagMax heights
1948− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19492206 writeIORef heightRef $! height
19502207 subscriberRecalculateHeight sub height
19512208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19522209 mySubscriber k = Subscriber
19532210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19542213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19552214 liftIO $ FastMutableIntMap.insert accum k a
19562215 when wasEmpty scheduleSelf
@@ -1984,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
19842243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
19852244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
19862245 return Nothing
1987− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19882246 defer $ SomeMergeInit $ do
19892247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
19902248 where
@@ -1998,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
19982256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
19992257 liftIO $ for_ oldParents $ \oldParent -> do
20002258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20012261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20022262 return $ IntMap.elems oldParents
2003− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20042264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20052265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20062266 defer $ updateMe a
20072267 , subscriberInvalidateHeight = \_ -> return ()
20082268 , subscriberRecalculateHeight = \_ -> return ()
20092269 }
2010− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20112271 forM_ change $ \c -> defer $ updateMe c
20122272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20132273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20142274 -- its subscription.
2015− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20162276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2017− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2018− , occ
2019− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20202280
20212281newtype 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) }
20222283
2023−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2024−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
20252287 let f = Fan
20262288 { fanParent = e
2027− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20282290 }
2029− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20302292
20312293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20322294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2079,37 +2341,37 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
20792341
20802342-- | Run an event action outside of a frame
20812343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2082−runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2083− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2344+runFrame a = SpiderHost $ do
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
20842346 let go = do
20852347 result <- a
20862348 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
20872349 return result
20882350 result <- runEventM go
20892351 toClear <- readIORef $ eventEnvClears env
2090− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
2352+ forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
20912353 toClearInt <- readIORef $ eventEnvIntClears env
2092− forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2354+ forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
20932355 toClearRoot <- readIORef $ eventEnvRootClears env
2094− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2356+ forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
20952357 toAssign <- readIORef $ eventEnvAssignments env
20962358 toReconnectRef <- newIORef []
20972359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
20982360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
20992361 writeIORef vRef v
2100− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21012363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21022364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21032365 writeIORef (eventEnvMergeUpdates env) []
2104− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21052367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2106− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21072369 toReconnect <- readIORef toReconnectRef
21082370 clearEventEnv env
21092371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21102372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21112373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2112− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21132375 finalize wi
21142376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21152377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2120,10 +2382,10 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
21202382 runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
21212383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
21222384 sub <- newSubscriberSwitch subscribed
2123− subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderTimeline --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2385+ subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
21242386 {-
21252387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2126− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21272389 EventRoot _ -> "EventRoot"
21282390 EventNever -> "EventNever"
21292391 _ -> "something else"
@@ -2138,7 +2400,7 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
21382400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21392401 when (parentHeight /= myHeight) $ do
21402402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2141− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21422404 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
21432405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21442406 unsubscribe subscription
@@ -2179,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
21792441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
21802442 when (oldHeight /= invalidHeight) $ do
21812443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2182− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
21832445
21842446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
21852447updateSwitchHeight new subscribed = do
@@ -2187,7 +2449,7 @@ updateSwitchHeight new subscribed = do
21872449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21882450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21892451 writeIORef (switchSubscribedHeight subscribed) $! new
2190− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
21912453
21922454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
21932455recalculateCoincidenceHeight subscribed = do
@@ -2196,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
21962458 height <- calculateCoincidenceHeight subscribed
21972459 when (height /= invalidHeight) $ do
21982460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2199− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22002462
22012463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22022464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2235,9 +2497,6 @@ invalidate toReconnectRef wis = do
22352497-- Reflex integration
22362498--------------------------------------------------------------------------------
22372499
2238−-- When we're specializing, we include this from Reflex.Class instead, because
2239−-- it needs access to these types; when we're not, we want them here, so our
2240−-- instance isn't an orphan instance.
22412500-- | Designates the default, global Spider timeline
22422501data SpiderTimeline x
22432502type role SpiderTimeline nominal
@@ -2261,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
22612520 {-# INLINABLE headE #-}
22622521 headE = R.slowHeadE
22632522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
22642525
22652526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
22662527 {-# INLINABLE sample #-}
@@ -2282,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
22822543 {-# INLINABLE headE #-}
22832544 headE = R.slowHeadE
22842545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
22852549
22862550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
22872551 {-# INLINE return #-}
@@ -2290,11 +2554,13 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
22902554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
22912555 {-# INLINE (>>) #-}
22922556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
22932558 {-# INLINE fail #-}
22942559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
22952561
22962562{-# INLINABLE newJoinDyn #-}
2297−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)
22982564newJoinDyn d =
22992565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
23002566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2304,9 +2570,13 @@ newJoinDyn d =
23042570 in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
23052571
23062572instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2307− fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2573+ fmap = mapDynamicSpider
23082574 x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
23092575
2576+mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577+mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578+{-# INLINE [1] mapDynamicSpider #-}
2579+
23102580instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
23112581 pure = SpiderDynamic . dynamicConst
23122582#if MIN_VERSION_base(4,10,0)
@@ -2325,7 +2595,7 @@ holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.S
23252595holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
23262596holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
23272597
2328−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPullM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2598+buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
23292599buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
23302600
23312601instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
@@ -2339,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23392609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
23402610 {-# INLINABLE headE #-}
23412611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
23422615
23432616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
23442617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2355,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
23552628 {-# INLINABLE headE #-}
23562629 headE = R.slowHeadE
23572630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
23582633
23592634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
23602635 {-# INLINABLE sample #-}
@@ -2375,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
23752650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
23762651 {-# INLINABLE headE #-}
23772652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
23782655
23792656--------------------------------------------------------------------------------
23802657-- Deprecated items
@@ -2412,13 +2689,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
24122689 touch h
24132690 return result
24142691
2415−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2416− newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2417− newFanEventWithTrigger f = SpiderHost $ lift $ do
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693+ newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694+ newFanEventWithTrigger f = SpiderHost $ do
24182695 es <- newFanEventWithTriggerIO f
24192696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
24202697
2421−instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
24222699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
24232700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
24242701 es <- newFanEventWithTriggerIO f
@@ -2440,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
24402717#ifdef DEBUG
24412718 depthRef <- newIORef 0
24422719#endif
2443− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
24442721 { _spiderTimeline_lock = lock
24452722 , _spiderTimeline_eventEnv = env
24462723#ifdef DEBUG
@@ -2450,19 +2727,19 @@ unsafeNewSpiderTimelineEnv = do
24502727
24512728-- | Create a new SpiderTimelineEnv
24522729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2453−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
24542731
2455−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
24562733
24572734instance Reifies s (SpiderTimelineEnv x) =>
24582735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2459− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
24602737
24612738localSpiderTimeline
2462− :: Proxy s
2739+ :: proxy s
24632740 -> SpiderTimelineEnv x
24642741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2465−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
24662743
24672744-- | Pass a new timeline to the given function.
24682745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2470,18 +2747,18 @@ withSpiderTimeline k = do
24702747 env <- unsafeNewSpiderTimelineEnv
24712748 reify env $ \s -> k $ localSpiderTimeline s env
24722749
2473−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)
24742751
24752752type ComputeM = EventM
24762753
2477−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)
24782755
24792756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24802757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
24812758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
24822759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2483− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2484− 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 }
24852762 type PullM (SpiderTimeline x) = SpiderPullM x
24862763 type PushM (SpiderTimeline x) = SpiderPushM x
24872764 {-# INLINABLE never #-}
@@ -2494,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
24942771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
24952772 {-# INLINABLE pull #-}
24962773 pull = SpiderBehavior . pull . coerce
2497− {-# INLINABLE merge #-}
2498− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2499− {-# INLINABLE fan #-}
2500− 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
25012783 {-# INLINABLE switch #-}
25022784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
25032785 {-# INLINABLE coincidence #-}
@@ -2505,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25052787 {-# INLINABLE current #-}
25062788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
25072789 {-# INLINABLE updated #-}
2508− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
25092791 {-# INLINABLE unsafeBuildDynamic #-}
25102792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
25112793 {-# INLINABLE unsafeBuildIncremental #-}
25122794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2513− {-# INLINABLE mergeIncremental #-}
2514− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2515− {-# INLINABLE mergeIncrementalWithMove #-}
2516− 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
25172799 {-# INLINABLE currentIncremental #-}
25182800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
25192801 {-# INLINABLE updatedIncremental #-}
@@ -2524,9 +2806,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
25242806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
25252807 eventCoercion Coercion = Coercion
25262808 behaviorCoercion Coercion = Coercion
2527− 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
25282811 {-# INLINABLE mergeIntIncremental #-}
2529− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
25302813 {-# INLINABLE fanInt #-}
25312814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
25322815
@@ -2551,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
25512834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
25522835
25532836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2554−newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) 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)
25552838
25562839instance Monad (SpiderHost x) where
25572840 {-# INLINABLE (>>=) #-}
@@ -2560,20 +2843,27 @@ instance Monad (SpiderHost x) where
25602843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
25612844 {-# INLINABLE return #-}
25622845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
25632847 {-# INLINABLE fail #-}
2564− 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
25652854
25662855-- | Run an action affecting the global Spider timeline; this will be guarded by
25672856-- a mutex for that timeline
25682857runSpiderHost :: SpiderHost Global a -> IO a
2569−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
2858+runSpiderHost (SpiderHost a) = a
25702859
25712860-- | Run an action affecting a given Spider timeline; this will be guarded by a
25722861-- mutex for that timeline
25732862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2574−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
25752864
2576−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866+ deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
25772867
25782868instance Monad (SpiderHostFrame x) where
25792869 {-# INLINABLE (>>=) #-}
@@ -2582,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
25822872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
25832873 {-# INLINABLE return #-}
25842874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
25852876 {-# INLINABLE fail #-}
25862877 fail s = SpiderHostFrame $ fail s
2878+#endif
25872879
25882880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
25892881 notReadyUntil _ = pure ()
25902882 notReady = pure ()
25912883
2592−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)
25932885newEventWithTriggerIO f = do
25942886 es <- newFanEventWithTriggerIO $ \Refl -> f
25952887 return $ select es Refl
25962888
2597−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)
25982890newFanEventWithTriggerIO f = do
25992891 occRef <- newIORef DMap.empty
26002892 subscribedRef <- newIORef DMap.empty
@@ -2628,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
26282920instance PrimMonad (SpiderHostFrame x) where
26292921 type PrimState (SpiderHostFrame x) = PrimState IO
26302922 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 ()