@@ -9,40 +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
24−#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
25−{-# OPTIONS_GHC -fno-warn-orphans #-}
26−#endif
27+{-# OPTIONS_GHC -Wunused-binds #-}
2728-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2829-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
2930module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
3031
31−import Control.Applicative
32+#if MIN_VERSION_base(4,10,0)
33+import Control.Applicative (liftA2)
34+#endif
3235import Control.Concurrent
3336import Control.Exception
34−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
3538import Control.Monad.Exception
36−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3740import Control.Monad.Primitive
38−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
3944import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4047import Data.Align
4148import Data.Coerce
42−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4350import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
52+import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53+import qualified Data.FastMutableIntMap as FastMutableIntMap
4454import Data.Foldable hiding (concat, elem, sequence_)
45−import Data.Function
4655import Data.Functor.Constant
4756import Data.Functor.Misc
4857import Data.Functor.Product
@@ -50,63 +59,73 @@ import Data.GADT.Compare
5059import Data.IntMap.Strict (IntMap)
5160import qualified Data.IntMap.Strict as IntMap
5261import Data.IORef
53−import Data.List hiding (foldl')
54−import Data.Maybe
55−import Data.Monoid ((<>))
62+import Data.Kind (Type)
63+import Data.Maybe hiding (mapMaybe)
64+import Data.Monoid (mempty, (<>))
5665import Data.Proxy
5766import Data.These
5867import Data.Traversable
59−import Data.Word
60−import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
61−import qualified Data.FastMutableIntMap as FastMutableIntMap
62−import GHC.Exts
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
6371import GHC.IORef (IORef (..))
6472import GHC.Stack
6573import Reflex.FastWeak
66−import Reflex.FunctorMaybe
6774import System.IO.Unsafe
6875import System.Mem.Weak
6976import Unsafe.Coerce
7077
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+
7187#ifdef DEBUG_CYCLES
7288import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7391import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7492import qualified Data.List.NonEmpty as NonEmpty
75−import Data.Monoid (mempty)
7693import Data.Tree (Forest, Tree (..), drawForest)
77−#endif
94+import Data.List (isPrefixOf)
7895
79−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
8097import qualified Data.FastWeakBag as FastWeakBag
81−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
82−import qualified Data.WeakBag as WeakBag
83−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
98+
8499import Data.Reflection
85−import Data.Some (Some)
86−import qualified Data.Some as Some
100+import Data.Some (Some(Some))
87101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
103+import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
104+import qualified Data.WeakBag as WeakBag
88105import qualified Reflex.Class
89106import qualified Reflex.Class as R
90107import qualified Reflex.Host.Class
91−#endif
92108import Reflex.NotReady.Class
93−import Reflex.Patch
94−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
95−
96−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
97−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)
98112
99113#ifdef DEBUG_TRACE_EVENTS
100−import System.IO (stderr)
101114import qualified Data.ByteString.Char8 as BS8
115+import System.IO (stderr)
116+import Data.List (isPrefixOf)
102117#endif
103118
104−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
105122
123+#ifdef DEBUG_TRACE_EVENTS
106124withStackOneLine :: (BS8.ByteString -> a) -> a
107125withStackOneLine expr = unsafePerformIO $ do
108126 stack <- currentCallStack
109− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
110129
111130#endif
112131
@@ -117,28 +136,42 @@ debugInvalidateHeight :: Bool
117136debugInvalidate :: Bool
118137
119138#ifdef DEBUG
120−
121139#define DEBUG_NODEIDS
122140
141+#ifdef DEBUG_TRACE_PROPAGATION
123142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
124146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
125150debugInvalidateHeight = False
151+#endif
126152
153+#ifdef DEBUG_TRACE_INVALIDATION
127154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
128158
129159class HasNodeId a where
130160 getNodeId :: a -> Int
131161
132−instance HasNodeId (Hold x p a) where
133− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
134164
135−instance HasNodeId (PushSubscribed x a b) where
136− getNodeId = pushSubscribedNodeId
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
137170
138171instance HasNodeId (SwitchSubscribed x a) where
139172 getNodeId = switchSubscribedNodeId
140173
141−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
142175 getNodeId = fanSubscribedNodeId
143176
144177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -152,41 +185,16 @@ instance HasNodeId (Pull x a) where
152185
153186{-# INLINE showNodeId #-}
154187showNodeId :: HasNodeId a => a -> String
155−showNodeId = ("#"<>) . show . getNodeId
156−
157−showSubscriberType :: Subscriber x a -> String
158−showSubscriberType = \case
159− SubscriberPush _ _ -> "SubscriberPush"
160− SubscriberMerge _ _ -> "SubscriberMerge"
161− SubscriberFan _ -> "SubscriberFan"
162− SubscriberMergeChange _ -> "SubscriberMergeChange"
163− SubscriberHold _ -> "SubscriberHold"
164− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
165− SubscriberSwitch _ -> "SubscriberSwitch"
166− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
167− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
168− SubscriberHandle -> "SubscriberHandle"
169−
170−showEventType :: Event x a -> String
171−showEventType = \case
172− EventRoot _ _ -> "EventRoot"
173− EventNever -> "EventNever"
174− EventPush _ -> "EventPush"
175− EventMerge _ -> "EventMerge"
176− EventFan _ _ -> "EventFan"
177− EventSwitch _ -> "EventSwitch"
178− EventCoincidence _ -> "EventCoincidence"
179− EventHold _ -> "EventHold"
180− EventDyn _ -> "EventDyn"
181− EventHoldIdentity _ -> "EventHoldIdentity"
182− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
183193
184194#else
185195
186196debugPropagate = False
187−
188197debugInvalidateHeight = False
189−
190198debugInvalidate = False
191199
192200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -194,6 +202,10 @@ debugInvalidate = False
194202showNodeId :: a -> String
195203showNodeId _ = ""
196204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
197209#endif
198210
199211#ifdef DEBUG_NODEIDS
@@ -203,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
203215
204216newNodeId :: IO Int
205217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
206−
207−{-# NOINLINE unsafeNodeId #-}
208−unsafeNodeId :: a -> Int
209−unsafeNodeId a = unsafePerformIO $ do
210− touch a
211− newNodeId
212218#endif
213219
214220--------------------------------------------------------------------------------
@@ -247,7 +253,7 @@ subscribeAndRead = unEvent
247253{-# INLINE [1] pushCheap #-}
248254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
249255pushCheap !f e = Event $ \sub -> do
250− (subscription, occ) <- subscribeAndRead e $ sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
251257 { subscriberPropagate = \a -> do
252258 mb <- f a
253259 mapM_ (subscriberPropagate sub) mb
@@ -266,10 +272,10 @@ terminalSubscriber p = Subscriber
266272
267273-- | Subscribe to an Event only for the duration of one occurrence
268274{-# INLINE subscribeAndReadHead #-}
269−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)
270276subscribeAndReadHead e sub = do
271277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
272− (subscription, occ) <- subscribeAndRead e $ sub
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
273279 { subscriberPropagate = \a -> do
274280 liftIO $ unsubscribe =<< readIORef subscriptionRef
275281 subscriberPropagate sub a
@@ -280,24 +286,42 @@ subscribeAndReadHead e sub = do
280286 return (subscription, occ)
281287
282288--TODO: Make this lazy in its input event
283−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)
284290headE originalE = do
285291 parent <- liftIO $ newIORef $ Just originalE
286292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
287293 let clearParent = liftIO $ writeIORef parent Nothing
288− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
289295 when (isJust occ) clearParent
290− return $ Event $ \sub -> do
296+ return $ Event $ \sub ->
291297 liftIO (readIORef parent) >>= \case
292− Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
298+ Nothing -> subscribeAndReadNever
293299 Just e -> subscribeAndReadHead e sub
294300
295301data CacheSubscribed x a
296302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
297303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
298304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
299308 }
300309
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+
301325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
302326-- repeatedly
303327--
@@ -312,27 +336,33 @@ cacheEvent e =
312336#else
313337 Event $
314338#endif
315− let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
316− !mSubscribedRef = unsafeNewIORef e emptyFastWeak
317− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
318343#ifdef DEBUG_TRACE_EVENTS
319344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
320345#endif
321346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
322347 Just subscribedTicket -> return subscribedTicket
323348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
324352 subscribers <- liftIO FastWeakBag.empty
325353 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
326357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
327− { subscriberPropagate = \a -> do
328− liftIO $ writeIORef occRef $ Just a
329− scheduleClear occRef
330− propagateFast a subscribers
331− , subscriberInvalidateHeight = \old -> do
332− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
333− , subscriberRecalculateHeight = \new -> do
334− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
335− }
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+ }
336366 when (isJust occ) $ do
337367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
338368 scheduleClear occRef
@@ -340,29 +370,45 @@ cacheEvent e =
340370 { _cacheSubscribed_subscribers = subscribers
341371 , _cacheSubscribed_parent = parentSub
342372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
343376 }
344377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
345378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
346379 return subscribedTicket
347− liftIO $ do
348− subscribed <- getFastWeakTicketValue subscribedTicket
349− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
350− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
351− let es = EventSubscription
352− { _eventSubscription_unsubscribe = do
353− FastWeakBag.remove ticket
354− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
355− when isEmpty $ do
356− writeIORef mSubscribedRef emptyFastWeak
357− unsubscribe $ _cacheSubscribed_parent subscribed
358− touch ticket
359− touch subscribedTicket
360− , _eventSubscription_subscribed = EventSubscribed
361− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
362− , eventSubscribedRetained = toAny subscribedTicket
363− }
364− }
365− 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+
366412
367413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
368414subscribe e s = fst <$> subscribeAndRead e s
@@ -374,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
374420 let es = tag subd
375421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
376422
377−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
378424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
379425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
380429eventNever :: Event x a
381−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
382431
383−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)
384433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
385434
386435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -389,7 +438,7 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
389438eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
390439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
391440
392−eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
441+eventHold :: Hold x p -> Event x p
393442eventHold !h = Event $ subscribeHoldEvent h
394443
395444eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
@@ -415,16 +464,6 @@ data Subscriber x a = Subscriber
415464 , subscriberRecalculateHeight :: !(Height -> IO ())
416465 }
417466
418−--TODO: Move this comment to WeakBag
419−-- These function are constructor functions that are marked NOINLINE so they are
420−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
421−-- so any weak references that are attached to the constructors will have their
422−-- finalizer run. Using the opaque constructor, does not see the
423−-- constructor application, so it behaves like an IORef and cannot be fused away.
424−--
425−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
426−-- the weak pointer to it in some cases.
427−
428467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
429468newSubscriberHold h = return $ Subscriber
430469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -432,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
432471 , subscriberRecalculateHeight = \_ -> return ()
433472 }
434473
435−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
436−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
437476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
438477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
439− 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"
440479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
441480 scheduleClear $ fanSubscribedOccurrence subscribed
442− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
443482 propagate v $ _fanSubscribedChildren_list subsubs
444483 return $ Constant ()
445484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
446485 return ()
447486 , subscriberInvalidateHeight = \old -> do
448− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
449487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
450− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
451− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
452489 , subscriberRecalculateHeight = \new -> do
453− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
454490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
455− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
456− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
457492 }
458493
459494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
460−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
461496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
462− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
463497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
464498 scheduleClear $ switchSubscribedOccurrence subscribed
465499 propagate a $ switchSubscribedSubscribers subscribed
466500 , subscriberInvalidateHeight = \_ -> do
467− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
468501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
469502 when (oldHeight /= invalidHeight) $ do
470503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
471− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
472− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
473− , subscriberRecalculateHeight = \new -> do
474− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
475− updateSwitchHeight new subscribed
476− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
477− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
478507
479508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
480−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
481510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
482− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
483511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
484512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
485513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
486514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
487515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
488517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
489518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
490519 case occ of
491− Nothing -> do
520+ Nothing ->
492521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
493522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
494− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
495− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
496525 Just o -> do -- Since it's already firing, no need to adjust height
497526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
498527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
499528 propagate o $ coincidenceSubscribedSubscribers subscribed
500− , subscriberInvalidateHeight = \_ -> do
501− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
502− invalidateCoincidenceHeight subscribed
503− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
504− , subscriberRecalculateHeight = \_ -> do
505− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
506− recalculateCoincidenceHeight subscribed
507− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
508531 }
509532
510533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
511−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
512535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
513− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
514536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
515537 case occ of
516538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -518,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
518540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
519541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
520542 propagate a $ coincidenceSubscribedSubscribers subscribed
521− , subscriberInvalidateHeight = \_ -> do
522− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
523− invalidateCoincidenceHeight subscribed
524− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
525− , subscriberRecalculateHeight = \_ -> do
526− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
527− recalculateCoincidenceHeight subscribed
528− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
529545 }
530546
531547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -535,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
535551recalculateSubscriberHeight = flip subscriberRecalculateHeight
536552
537553-- | Propagate everything at the current height
538−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
539−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) $
540556 -- 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
541557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
542− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
543559
544560-- | Propagate everything at the current height
545−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
546−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) $
547563 -- 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
548564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
549− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
550566
551567--------------------------------------------------------------------------------
552568-- EventSubscribed
@@ -555,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
555571toAny :: a -> Any
556572toAny = unsafeCoerce
557573
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.
558579data EventSubscribed x = EventSubscribed
559580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
560581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
561582#ifdef DEBUG_CYCLES
562− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
563584 , eventSubscribedHasOwnHeightRef :: !Bool
564585 , eventSubscribedWhoCreated :: !(IO [String])
565586#endif
@@ -586,13 +607,23 @@ eventSubscribedNever = EventSubscribed
586607 , eventSubscribedWhoCreated = return ["never"]
587608#endif
588609 }
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+ }
589620
590−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
591622eventSubscribedFan !subscribed = EventSubscribed
592623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
593624 , eventSubscribedRetained = toAny subscribed
594625#ifdef DEBUG_CYCLES
595− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
596627 , eventSubscribedHasOwnHeightRef = False
597628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
598629#endif
@@ -605,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
605636#ifdef DEBUG_CYCLES
606637 , eventSubscribedGetParents = do
607638 s <- readIORef $ switchSubscribedCurrentParent subscribed
608− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
609640 , eventSubscribedHasOwnHeightRef = True
610641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
611642#endif
@@ -618,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
618649#ifdef DEBUG_CYCLES
619650 , eventSubscribedGetParents = do
620651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
621− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
622− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
623654 return $ outerParent : innerParents
624655 , eventSubscribedHasOwnHeightRef = True
625656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -633,20 +664,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
633664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
634665whoCreatedEventSubscribed = eventSubscribedWhoCreated
635666
636−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
637668walkInvalidHeightParents s0 = do
638− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
639670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
640671 when (h == invalidHeight) $ do
641672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
642− modify (Some.This s :)
673+ modify (s :)
643674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
644− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
645676 return subscribers
646677#endif
647678
648679{-# INLINE subscribeHoldEvent #-}
649−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)
650681subscribeHoldEvent = subscribeAndRead . holdEvent
651682
652683--------------------------------------------------------------------------------
@@ -669,7 +700,7 @@ behaviorPull !p = Behavior $ do
669700 val <- liftIO $ readIORef $ pullValue p
670701 case val of
671702 Just subscribed -> do
672− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
673704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
674705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
675706 return $ pullSubscribedValue subscribed
@@ -678,7 +709,7 @@ behaviorPull !p = Behavior $ do
678709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
679710 parentsRef <- liftIO $ newIORef []
680711 holdInits <- askBehaviorHoldInits
681− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
682713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
683714 parents <- liftIO $ readIORef parentsRef
684715 let subscribed = PullSubscribed
@@ -688,7 +719,7 @@ behaviorPull !p = Behavior $ do
688719 , pullSubscribedParents = parents
689720 }
690721 liftIO $ writeIORef (pullValue p) $ Just subscribed
691− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
692723 return a
693724
694725behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -699,7 +730,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
699730readHoldTracked h = do
700731 result <- liftIO $ readIORef $ holdValue h
701732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
702− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
703734 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
704735 return result
705736
@@ -713,42 +744,46 @@ readBehaviorUntracked b = do
713744-- Dynamic
714745--------------------------------------------------------------------------------
715746
716−data Dynamic x p = Dynamic
717− { dynamicCurrent :: !(Behavior x (PatchTarget p))
718− , 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`?
719752 }
720753
721−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
722760dynamicHold !h = Dynamic
723761 { dynamicCurrent = behaviorHold h
724762 , dynamicUpdated = eventHold h
725763 }
726764
727−dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
728766dynamicHoldIdentity = dynamicHold
729767
730−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
731769dynamicConst !a = Dynamic
732770 { dynamicCurrent = behaviorConst a
733771 , dynamicUpdated = eventNever
734772 }
735773
736−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
737775dynamicDyn !d = Dynamic
738776 { dynamicCurrent = behaviorDyn d
739777 , dynamicUpdated = eventDyn d
740778 }
741779
742−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
743781dynamicDynIdentity = dynamicDyn
744782
745783--------------------------------------------------------------------------------
746784-- Combinators
747785--------------------------------------------------------------------------------
748786
749−--TODO: Figure out why certain things are not 'representational', then make them
750−--representational so we can use coerce
751−
752787--type role Hold representational
753788data Hold x p
754789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -760,9 +795,7 @@ data Hold x p
760795#endif
761796 }
762797
763−-- | A statically allocated 'SpiderTimeline'; this is the only instance of
764−-- 'SpiderTimeline' that can used when using
765−-- -fspecialize-to-spidertimeline-global.
798+-- | A statically allocated 'SpiderTimeline'
766799data Global
767800
768801{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -771,20 +804,25 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
771804
772805-- | Stores all global data relevant to a particular Spider timeline; only one
773806-- value should exist for each type @x@
774−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
775813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
776814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
777815#ifdef DEBUG
778816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
779817#endif
780818 }
781−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
782820
783821instance Eq (SpiderTimelineEnv x) where
784822 _ == _ = True -- Since only one exists of each type
785823
786824instance GEq SpiderTimelineEnv where
787− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
788826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
789827 else Nothing
790828
@@ -794,9 +832,9 @@ data EventEnv x
794832 , eventEnvDynInits :: !(IORef [SomeDynInit x])
795833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
796834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
797− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
798− , eventEnvIntClears :: !(IORef [SomeIntClear])
799− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
800838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
801839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
802840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -807,7 +845,7 @@ runEventM :: EventM x a -> IO a
807845runEventM = unEventM
808846
809847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
810−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
811849
812850class MonadIO m => Defer a m where
813851 getDeferralQueue :: m (IORef [a])
@@ -856,11 +894,7 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
856894 delayedRef <- asksEventEnv eventEnvDelayedMerges
857895 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
858896
859−#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
860−class x ~ Global => HasSpiderTimeline x where
861−#else
862897class HasSpiderTimeline x where
863−#endif
864898 -- | Retrieve the current SpiderTimelineEnv
865899 spiderTimeline :: SpiderTimelineEnv x
866900
@@ -872,29 +906,29 @@ putCurrentHeight h = do
872906 heightRef <- asksEventEnv eventEnvCurrentHeight
873907 liftIO $ writeIORef heightRef $! h
874908
875−instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
876910 {-# INLINE getDeferralQueue #-}
877911 getDeferralQueue = asksEventEnv eventEnvClears
878912
879913{-# INLINE scheduleClear #-}
880−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
881−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
882916
883−instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
884918 {-# INLINE getDeferralQueue #-}
885919 getDeferralQueue = asksEventEnv eventEnvIntClears
886920
887921{-# INLINE scheduleIntClear #-}
888−scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
889−scheduleIntClear r = defer $ SomeIntClear r
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
890924
891−instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
892926 {-# INLINE getDeferralQueue #-}
893927 getDeferralQueue = asksEventEnv eventEnvRootClears
894928
895929{-# INLINE scheduleRootClear #-}
896−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
897−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
898932
899933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
900934 {-# INLINE getDeferralQueue #-}
@@ -949,9 +983,9 @@ getHoldEventSubscription h = do
949983
950984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
951985
952−--type role BehaviorM representational
953986-- BehaviorM can sample behaviors
954−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))
955989
956990instance Monad (BehaviorM x) where
957991 {-# INLINE (>>=) #-}
@@ -960,14 +994,16 @@ instance Monad (BehaviorM x) where
960994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
961995 {-# INLINE return #-}
962996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
963998 {-# INLINE fail #-}
964999 fail s = BehaviorM $ fail s
1000+#endif
9651001
9661002data BehaviorSubscribed x a
9671003 = forall p. BehaviorSubscribedHold (Hold x p)
9681004 | BehaviorSubscribedPull (PullSubscribed x a)
9691005
970−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
9711007
9721008--type role PullSubscribed representational
9731009data PullSubscribed x a
@@ -1002,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
10021038#endif
10031039 }
10041040
1005−data Root x (k :: * -> *)
1041+data Root x k
10061042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
10071043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
10081044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1021,7 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10211057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10221058
10231059-- EventM can do everything BehaviorM can, plus create holds
1024−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)
10251061
10261062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10271063
@@ -1046,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10461082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10471083
10481084heightBagAdd :: Height -> HeightBag -> HeightBag
1049−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
10501087
10511088heightBagRemove :: Height -> HeightBag -> HeightBag
10521089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1055,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10551092 0 -> IntMap.delete h c
10561093 _ -> IntMap.insert h (pred old) c
10571094
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+
10581102heightBagMax :: HeightBag -> Height
10591103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10601104 Just ((h, _), _) -> Height h
@@ -1072,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10721116heightBagVerify = id
10731117#endif
10741118
1075−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1076− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1077− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1078− , _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)))
10791123 }
10801124
1081−data FanSubscribed (x :: *) k
1082− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1083− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1084− , 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
10851129 , fanSubscribedParent :: !(EventSubscription x)
10861130#ifdef DEBUG_NODEIDS
10871131 , fanSubscribedNodeId :: Int
10881132#endif
10891133 }
10901134
1091−data Fan x k
1092− = Fan { fanParent :: !(Event x (DMap k Identity))
1093− , 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)))
10941138 }
10951139
10961140data SwitchSubscribed x a
@@ -1144,20 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11441188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11451189newInvalidatorPull p = return $! InvalidatorPull p
11461190
1147−instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1148− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
11491193
11501194instance HasSpiderTimeline x => Align (Event x) where
11511195 nil = eventNever
1152− 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]
1201+
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
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)
11531212
1154−newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
11551214
1156−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)
11571216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11581217
11591218--TODO: Avoid the duplication between this and R.zipDynWith
1160−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)
11611220zipDynWith f da db =
11621221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11631222 ec = flip push eab $ \o -> do
@@ -1172,26 +1231,20 @@ zipDynWith f da db =
11721231 return $ Just $ Identity $ f a b
11731232 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11741233
1175−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)
11761235buildDynamic readV0 v' = do
1177− result <- liftIO $ newIORef $ Left (readV0, v')
1236+ result <- liftIO $ newIORef $ BuildDyn (readV0, v')
11781237 let !d = Dyn result
11791238 defer $ SomeDynInit d
11801239 return d
11811240
11821241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1183−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1184− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11851244
11861245-- ResultM can read behaviors and events
11871246type ResultM = EventM
11881247
1189−{-# NOINLINE unsafeNewIORef #-}
1190−unsafeNewIORef :: a -> b -> IORef b
1191−unsafeNewIORef a b = unsafePerformIO $ do
1192− touch a
1193− newIORef b
1194−
11951248instance HasSpiderTimeline x => Functor (Event x) where
11961249 fmap f = push $ return . Just . f
11971250
@@ -1204,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
12041257
12051258{-# INLINABLE pull #-}
12061259pull :: BehaviorM x a -> Behavior x a
1207−pull a = behaviorPull $ Pull
1208− { pullCompute = a
1209− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
12101262#ifdef DEBUG_NODEIDS
1211− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
12121264#endif
1213− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
12141272
12151273{-# INLINABLE switch #-}
12161274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1217−switch a = eventSwitch $ Switch
1218− { switchParent = a
1219− , switchSubscribed = unsafeNewIORef a Nothing
1220− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
12211281
12221282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1223−coincidence a = eventCoincidence $ Coincidence
1224− { coincidenceParent = a
1225− , coincidenceSubscribed = unsafeNewIORef a Nothing
1226− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
12271289
12281290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12291291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12301292run roots after = do
12311293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1232− t <- SpiderHost ask
1233− 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
12341296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12351297 occBefore <- liftIO $ do
12361298 occBefore <- readIORef occRef
@@ -1268,11 +1330,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
12681330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
12691331 EQ -> a
12701332
1271−data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
1333+newtype Clear a = Clear (IORef (Maybe a))
12721334
1273−data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
1335+newtype IntClear a = IntClear (IORef (IntMap a))
12741336
1275−data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
12761338
12771339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12781340
@@ -1284,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12841346 x' <- evaluate x
12851347 mkWeakPtr x' $
12861348 if debugFinalize
1287− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12881350 else Nothing
12891351
12901352type WeakList a = [Weak a]
12911353
1292−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12931359#ifdef DEBUG
1294−withIncreasedDepth :: CanTrace x m => m a -> m a
1295−withIncreasedDepth a = do
1296− spiderTimeline <- askSpiderTimelineEnv
1297− 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
12981385 result <- a
1299− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
13001387 return result
1301−#else
1302−withIncreasedDepth :: m a -> m a
1303−withIncreasedDepth = id
1304−#endif
1305−
1306−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13071388
13081389{-# INLINE tracePropagate #-}
13091390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1310−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
13111392
13121393{-# INLINE traceInvalidate #-}
13131394traceInvalidate :: String -> IO ()
1314−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
13151400
1316−{-# INLINE traceWhen #-}
1317−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1318−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
13191404
1320−{-# INLINE traceMWhen #-}
1321−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1322−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
13231408 message <- getMessage
1324−#ifdef DEBUG
1325− spiderTimeline <- askSpiderTimelineEnv
1326− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
13271412#else
1328− 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+
13291448#endif
1330− liftIO $ putStrLn $ replicate d ' ' <> message
13311449
13321450whoCreatedIORef :: IORef a -> IO [String]
13331451whoCreatedIORef (IORef a) = whoCreated $! a
13341452
1335−#ifdef DEBUG_CYCLES
13361453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13371454groupByHead = \case
13381455 [] -> []
@@ -1343,20 +1460,54 @@ groupByHead = \case
13431460 | otherwise -> (x, xs :| []) : l
13441461
13451462listsToForest :: Eq a => [[a]] -> Forest a
1346−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
13471474#endif
13481475
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+
1495+#endif
1496+
1497+
13491498{-# INLINE propagateSubscriberHold #-}
13501499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13511500propagateSubscriberHold h a = do
1352− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13531502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13541503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13551505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13561506 case {-# SCC "apply" #-} apply a v of
13571507 Nothing -> return ()
13581508 Just v' -> do
1359− {-# 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)
13601511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13611512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13621513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1364,25 +1515,25 @@ propagateSubscriberHold h a = do
13641515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13651516
13661517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1367−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13681519
13691520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13701521askInvalidator = do
1371− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13721523 case m of
13731524 Nothing -> return Nothing
13741525 Just (!wi, _) -> return $ Just wi
13751526
13761527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13771528askParentsRef = do
1378− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13791530 case m of
13801531 Nothing -> return Nothing
13811532 Just (_, !p) -> return $ Just p
13821533
13831534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13841535askBehaviorHoldInits = do
1385− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13861537 return his
13871538
13881539{-# INLINE getDynHold #-}
@@ -1390,20 +1541,27 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
13901541getDynHold d = do
13911542 mh <- liftIO $ readIORef $ unDyn d
13921543 case mh of
1393− Right h -> return h
1394− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13951546 holdInits <- getDeferralQueue
13961547 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
13971554 h <- hold v0 v'
1398− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13991556 return h
14001557
1558+
14011559-- Always refers to 0
14021560{-# NOINLINE zeroRef #-}
14031561zeroRef :: IORef Height
14041562zeroRef = unsafePerformIO $ newIORef zeroHeight
14051563
1406−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)
14071565getRootSubscribed k r sub = do
14081566 mSubscribed <- readIORef $ rootSubscribed r
14091567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1417,9 +1575,14 @@ getRootSubscribed k r sub = do
14171575 let !cached = rootSubscribed r
14181576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
14191577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1420− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
14211581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
14221582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14231586 let !subscribed = RootSubscribed
14241587 { rootSubscribedKey = k
14251588 , rootSubscribedCachedSubscribed = cached
@@ -1428,7 +1591,7 @@ getRootSubscribed k r sub = do
14281591 , rootSubscribedUninit = uninit
14291592 , rootSubscribedWeakSelf = weakSelf
14301593#ifdef DEBUG_NODEIDS
1431− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14321595#endif
14331596 }
14341597 -- If we die at the same moment that all our children die, they will
@@ -1464,6 +1627,9 @@ data FanInt x a = FanInt
14641627 { _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
14651628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
14661629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
14671633 }
14681634
14691635newFanInt :: IO (FanInt x a)
@@ -1471,38 +1637,39 @@ newFanInt = do
14711637 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
14721638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
14731639 occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
14741643 return $ FanInt
14751644 { _fanInt_subscribers = subscribers
14761645 , _fanInt_subscriptionRef = subscriptionRef
14771646 , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
14781650 }
14791651
1480−{-# NOINLINE unsafeNewFanInt #-}
1481−unsafeNewFanInt :: b -> FanInt x a
1482−unsafeNewFanInt b = unsafePerformIO $ do
1483− touch b
1484− newFanInt
1485−
14861652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1487−fanInt p =
1488− let self = unsafeNewFanInt p
1489− in EventSelectorInt $ \k -> Event $ \sub -> do
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
14901656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
14911657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1492− (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
14931660 { subscriberPropagate = \m -> do
14941661 liftIO $ writeIORef (_fanInt_occRef self) m
14951662 scheduleIntClear $ _fanInt_occRef self
1496− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1497− 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 ->
14981665 subscriberPropagate s v
1499− , subscriberInvalidateHeight = \old -> do
1500− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1501− FastWeakBag.traverse b $ \s -> do
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
15021669 subscriberInvalidateHeight s old
1503− , subscriberRecalculateHeight = \new -> do
1504− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1505− FastWeakBag.traverse b $ \s -> do
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
15061673 subscriberRecalculateHeight s new
15071674 }
15081675 liftIO $ do
@@ -1516,13 +1683,28 @@ fanInt p =
15161683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
15171684 return b
15181685 Just b -> return b
1519− t <- liftIO $ FastWeakBag.insert sub b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
15201687 currentOcc <- readIORef (_fanInt_occRef self)
1521− (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1522− 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+
15231705
15241706{-# INLINABLE getFanSubscribed #-}
1525−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))
15261708getFanSubscribed k f sub = do
15271709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15281710 case mSubscribed of
@@ -1540,13 +1722,16 @@ getFanSubscribed k f sub = do
15401722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15411723 occRef <- liftIO $ newIORef parentOcc
15421724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15431728 let subscribed = FanSubscribed
15441729 { fanSubscribedCachedSubscribed = fanSubscribed f
15451730 , fanSubscribedOccurrence = occRef
15461731 , fanSubscribedParent = subscription
15471732 , fanSubscribedSubscribers = subscribersRef
15481733#ifdef DEBUG_NODEIDS
1549− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15501735#endif
15511736 }
15521737 let !self = (k, subscribed)
@@ -1556,7 +1741,7 @@ getFanSubscribed k f sub = do
15561741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15571742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15581743
1559−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15601745cleanupFanSubscribed (k, subscribed) = do
15611746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15621747 let reducedSubscribers = DMap.delete k subscribers
@@ -1568,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15681753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15691754
15701755{-# INLINE subscribeFanSubscribed #-}
1571−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
15721757subscribeFanSubscribed k subscribed sub = do
15731758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15741759 case DMap.lookup k subscribers of
@@ -1606,6 +1791,9 @@ getSwitchSubscribed s sub = do
16061791 when (isJust parentOcc) $ scheduleClear occRef
16071792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16081793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16091797 let !subscribed = SwitchSubscribed
16101798 { switchSubscribedCachedSubscribed = switchSubscribed s
16111799 , switchSubscribedOccurrence = occRef
@@ -1618,7 +1806,7 @@ getSwitchSubscribed s sub = do
16181806 , switchSubscribedCurrentParent = subscriptionRef
16191807 , switchSubscribedWeakSelf = weakSelf
16201808#ifdef DEBUG_NODEIDS
1621− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16221810#endif
16231811 }
16241812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1663,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16631851 scheduleClear innerSubdRef
16641852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16651853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16661857 let subscribed = CoincidenceSubscribed
16671858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16681859 , coincidenceSubscribedOccurrence = occRef
@@ -1673,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16731864 , coincidenceSubscribedInnerParent = innerSubdRef
16741865 , coincidenceSubscribedWeakSelf = weakSelf
16751866#ifdef DEBUG_NODEIDS
1676− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16771868#endif
16781869 }
16791870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1690,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16901881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16911882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16921883
1693−{-# INLINE merge #-}
1694−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1695−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)
16961889
16971890{-# INLINE mergeWithMove #-}
1698−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1699−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)
17001895
17011896{-# INLINE [1] mergeCheap #-}
1702−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1703−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
17041903 where
1705− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
17061905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
17071906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
17081907 (mOldSubd, newPs) <- case me of
17091908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
17101909 Just e -> do
17111910 let s = subscriber $ return k
1712− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
17131912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
17141913 let newParent = MergeSubscribedParent subscription
17151914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17161915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
17171916 forM_ mOldSubd $ \oldSubd -> do
1718− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
17191920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17201921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
17211922 foldM f ([], oldParents) $ DMap.toList p
1722− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
17231925 getInitialSubscribers initialParents subscriber = do
17241926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17251927 let s = subscriber $ return k
1726− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17271929 height <- liftIO $ getEventSubscribedHeight parentSubd
1728− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
17291931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17301932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17311933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17321934 )
1935+
17331936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
17341937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
17351938
17361939{-# INLINE [1] mergeCheapWithMove #-}
1737−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1738−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
17391945 where
1740− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
17411947 updateMe subscriber heightBagRef oldParents p = do
17421948 -- Prepare new parents for insertion
1743− 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)
17441950 subscribeParent k e = do
17451951 keyRef <- liftIO $ newIORef k
17461952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1749,73 +1955,82 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
17491955 newParentHeight <- getEventSubscribedHeight subd
17501956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
17511957 return $ MergeSubscribedParentWithMove subscription keyRef
1752− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
17531959 -- Collect old parents for deletion and update the keys of moved parents
1754− 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
17551961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
17561962 Nothing -> do
1757− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
17581966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
17591967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
17601968 Just toKey -> do
17611969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
17621970 return Nothing
1763− 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+
17641974 return (toDelete, applyAlways p' oldParents)
1765− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
17661976 getInitialSubscribers initialParents subscriber = do
17671977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
17681978 keyRef <- liftIO $ newIORef k
17691979 let s = subscriber $ liftIO $ readIORef keyRef
1770− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
17711981 height <- liftIO $ getEventSubscribedHeight parentSubd
1772− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
17731983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
17741984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
17751985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
17761986 )
1987+
17771988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
17781989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
17791990
1780−type MergeUpdateFunc k x p s
1781− = (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))
17821993 -> IORef HeightBag
17831994 -> DMap k s
17841995 -> p
17851996 -> EventM x ([EventSubscription x], DMap k s)
17861997
1787−type MergeInitFunc k x s
1788− = DMap k (Event x)
1789− -> (forall a. EventM x (k a) -> Subscriber x a)
1790− -> 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)
17912004
17922005type MergeDestroyFunc k s
17932006 = DMap k s
17942007 -> IO ()
17952008
1796−data Merge x k s = Merge
2009+data Merge x k v s = Merge
17972010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
17982011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
17992012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1800− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1801− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
18022015 }
18032016
1804−invalidateMergeHeight :: Merge x k s -> IO ()
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
18052018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
18062019
18072020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
18082021invalidateMergeHeight' heightRef sub = do
18092022 oldHeight <- readIORef heightRef
1810− 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
18112025 writeIORef heightRef $! invalidHeight
18122026 subscriberInvalidateHeight sub oldHeight
18132027
1814−
1815−revalidateMergeHeight :: Merge x k s -> IO ()
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
18162029revalidateMergeHeight m = do
18172030 currentHeight <- readIORef $ _merge_heightRef m
1818− 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
18192034 heights <- readIORef $ _merge_heightBagRef m
18202035 parents <- readIORef $ _merge_parentsRef m
18212036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -1823,44 +2038,53 @@ revalidateMergeHeight m = do
18232038 LT -> return ()
18242039 EQ -> do
18252040 let height = succHeight $ heightBagMax heights
1826− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
18272042 writeIORef (_merge_heightRef m) $! height
18282043 subscriberRecalculateHeight (_merge_sub m) height
18292044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
18302045
1831−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
18322047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
18332048 vals <- liftIO $ readIORef $ _merge_accumRef m
1834− 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
18352052 --TODO: Assert that m is not empty
18362053 subscriberPropagate (_merge_sub m) vals
18372054
1838−mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1839−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
18402078 { subscriberPropagate = \a -> do
18412079 oldM <- liftIO $ readIORef $ _merge_accumRef m
18422080 k <- getKey
1843− 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
18442082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
18452083 liftIO $ writeIORef (_merge_accumRef m) $! newM
18462084 when (DMap.null oldM) $ do -- Only schedule the firing once
18472085 height <- liftIO $ readIORef $ _merge_heightRef m
1848− --TODO: assertions about height
1849− currentHeight <- getCurrentHeight
1850− when (height <= currentHeight) $ do
1851− if height /= invalidHeight
1852− then do
1853− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1854− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1855− else liftIO $ do
1856−#ifdef DEBUG_CYCLES
1857− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1858− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1859− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1860−#else
1861− let cycleInfo = ""
1862−#endif
1863− error $ "Causality loop found" <> cycleInfo
2086+ checkCycle subscribed
2087+
18642088 scheduleMergeSelf m height
18652089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
18662090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -1871,30 +2095,45 @@ mergeSubscriber m getKey = Subscriber
18712095 }
18722096
18732097--TODO: Be able to run as much of this as possible promptly
1874−updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1875−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)
18762100 where updateMe = do
18772101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1878− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
18792103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
18802104 return subscriptionsToKill
18812105
1882−{-# INLINE mergeCheap' #-}
1883−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)
1884−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
18852110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
18862111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
18872112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
18882113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
18892114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1890− 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
18912130 { _merge_parentsRef = parentsRef
18922131 , _merge_heightBagRef = heightBagRef
18932132 , _merge_heightRef = heightRef
18942133 , _merge_sub = sub
18952134 , _merge_accumRef = accumRef
18962135 }
1897− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
18982137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
18992138 myHeight = if invalidHeight `elem` heights
19002139 then invalidHeight
@@ -1903,50 +2142,57 @@ mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
19032142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
19042143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
19052144 else (Nothing, dm)
1906− unless (DMap.null accum) $ do
1907− scheduleMergeSelf m myHeight
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
19082146 liftIO $ writeIORef accumRef $! accum
19092147 liftIO $ writeIORef heightRef $! myHeight
19102148 liftIO $ writeIORef heightBagRef $! myHeightBag
1911− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19122149 liftIO $ writeIORef parentsRef $! initialParentState
19132150 defer $ SomeMergeInit $ do
1914− let s = Subscriber
2151+ let changeSubscriber = Subscriber
19152152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1916− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1917− defer $ updateMerge m updateFunc a
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
19182155 , subscriberInvalidateHeight = \_ -> return ()
19192156 , subscriberRecalculateHeight = \_ -> return ()
19202157 }
1921− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1922− 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
19232160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
19242161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
19252162 -- its subscription.
1926− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
19272164 let unsubscribeAll = destroy =<< readIORef parentsRef
1928− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1929− , occ
1930− )
19312165
1932−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)
19332170mergeInt = cacheEvent . mergeIntCheap
19342171
19352172{-# INLINABLE mergeIntCheap #-}
1936−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)
19372174mergeIntCheap d = Event $ \sub -> do
19382175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
19392176 accum <- liftIO $ FastMutableIntMap.newEmpty
19402177 heightRef <- liftIO $ newIORef zeroHeight
19412178 heightBagRef <- liftIO $ newIORef heightBagEmpty
19422179 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+ }
19432190 let scheduleSelf = do
19442191 height <- liftIO $ readIORef $ heightRef
19452192 scheduleMerge' height heightRef $ do
19462193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
19472194 subscriberPropagate sub vals
1948− invalidateMyHeight = do
1949− invalidateMergeHeight' heightRef sub
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
19502196 recalculateMyHeight = do
19512197 currentHeight <- readIORef heightRef
19522198 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?
@@ -1956,12 +2202,14 @@ mergeIntCheap d = Event $ \sub -> do
19562202 LT -> return ()
19572203 EQ -> do
19582204 let height = succHeight $ heightBagMax heights
1959− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
19602206 writeIORef heightRef $! height
19612207 subscriberRecalculateHeight sub height
19622208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
19632209 mySubscriber k = Subscriber
19642210 { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
19652213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
19662214 liftIO $ FastMutableIntMap.insert accum k a
19672215 when wasEmpty scheduleSelf
@@ -1995,7 +2243,6 @@ mergeIntCheap d = Event $ \sub -> do
19952243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
19962244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
19972245 return Nothing
1998− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
19992246 defer $ SomeMergeInit $ do
20002247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
20012248 where
@@ -2009,35 +2256,39 @@ mergeIntCheap d = Event $ \sub -> do
20092256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
20102257 liftIO $ for_ oldParents $ \oldParent -> do
20112258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
20122261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
20132262 return $ IntMap.elems oldParents
2014− let s = Subscriber
2263+ let changeSubscriber = Subscriber
20152264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
20162265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
20172266 defer $ updateMe a
20182267 , subscriberInvalidateHeight = \_ -> return ()
20192268 , subscriberRecalculateHeight = \_ -> return ()
20202269 }
2021− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
20222271 forM_ change $ \c -> defer $ updateMe c
20232272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
20242273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
20252274 -- its subscription.
2026− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
20272276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2028− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2029− , occ
2030− )
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
20312280
20322281newtype 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) }
20332283
2034−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2035−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
20362287 let f = Fan
20372288 { fanParent = e
2038− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
20392290 }
2040− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
20412292
20422293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
20432294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2090,37 +2341,37 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
20902341
20912342-- | Run an event action outside of a frame
20922343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2093−runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2094− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2344+runFrame a = SpiderHost $ do
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
20952346 let go = do
20962347 result <- a
20972348 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
20982349 return result
20992350 result <- runEventM go
21002351 toClear <- readIORef $ eventEnvClears env
2101− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
2352+ forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
21022353 toClearInt <- readIORef $ eventEnvIntClears env
2103− forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2354+ forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
21042355 toClearRoot <- readIORef $ eventEnvRootClears env
2105− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2356+ forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
21062357 toAssign <- readIORef $ eventEnvAssignments env
21072358 toReconnectRef <- newIORef []
21082359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
21092360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
21102361 writeIORef vRef v
2111− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
21122363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
21132364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
21142365 writeIORef (eventEnvMergeUpdates env) []
2115− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
21162367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2117− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
21182369 toReconnect <- readIORef toReconnectRef
21192370 clearEventEnv env
21202371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
21212372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
21222373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2123− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
21242375 finalize wi
21252376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
21262377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2131,10 +2382,10 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
21312382 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
21322383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
21332384 sub <- newSubscriberSwitch subscribed
2134− 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
21352386 {-
21362387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2137− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
21382389 EventRoot _ -> "EventRoot"
21392390 EventNever -> "EventNever"
21402391 _ -> "something else"
@@ -2149,7 +2400,7 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
21492400 myHeight <- readIORef $ switchSubscribedHeight subscribed
21502401 when (parentHeight /= myHeight) $ do
21512402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2152− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
21532404 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
21542405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
21552406 unsubscribe subscription
@@ -2190,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
21902441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
21912442 when (oldHeight /= invalidHeight) $ do
21922443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2193− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
21942445
21952446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
21962447updateSwitchHeight new subscribed = do
@@ -2198,7 +2449,7 @@ updateSwitchHeight new subscribed = do
21982449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
21992450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
22002451 writeIORef (switchSubscribedHeight subscribed) $! new
2201− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
22022453
22032454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
22042455recalculateCoincidenceHeight subscribed = do
@@ -2207,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
22072458 height <- calculateCoincidenceHeight subscribed
22082459 when (height /= invalidHeight) $ do
22092460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2210− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
22112462
22122463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
22132464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2246,13 +2497,218 @@ invalidate toReconnectRef wis = do
22462497-- Reflex integration
22472498--------------------------------------------------------------------------------
22482499
2249−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2250−-- When we're specializing, we include this from Reflex.Class instead, because
2251−-- it needs access to these types; when we're not, we want them here, so our
2252−-- instance isn't an orphan instance.
2253−#include "SpiderTimeline.include.hs"
2254−#include "SpiderTimelineHost.include.hs"
2500+-- | Designates the default, global Spider timeline
2501+data SpiderTimeline x
2502+type role SpiderTimeline nominal
2503+
2504+-- | The default, global Spider environment
2505+type Spider = SpiderTimeline Global
2506+
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508+ {-# INLINABLE sample #-}
2509+ sample (SpiderBehavior b) = readBehaviorUntracked b
2510+
2511+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512+ {-# INLINABLE hold #-}
2513+ hold = holdSpiderEventM
2514+ {-# INLINABLE holdDyn #-}
2515+ holdDyn = holdDynSpiderEventM
2516+ {-# INLINABLE holdIncremental #-}
2517+ holdIncremental = holdIncrementalSpiderEventM
2518+ {-# INLINABLE buildDynamic #-}
2519+ buildDynamic = buildDynamicSpiderEventM
2520+ {-# INLINABLE headE #-}
2521+ headE = R.slowHeadE
2522+-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2525+
2526+instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527+ {-# INLINABLE sample #-}
2528+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2529+
2530+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531+ {-# INLINABLE sample #-}
2532+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533+
2534+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535+ {-# INLINABLE hold #-}
2536+ hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537+ {-# INLINABLE holdDyn #-}
2538+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539+ {-# INLINABLE holdIncremental #-}
2540+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541+ {-# INLINABLE buildDynamic #-}
2542+ buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543+ {-# INLINABLE headE #-}
2544+ headE = R.slowHeadE
2545+-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
2549+
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551+ {-# INLINE return #-}
2552+ return = pure
2553+ {-# INLINE (>>=) #-}
2554+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555+ {-# INLINE (>>) #-}
2556+ (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2558+ {-# INLINE fail #-}
2559+ fail _ = error "Dynamic does not support 'fail'"
2560+#endif
2561+
2562+{-# INLINABLE newJoinDyn #-}
2563+newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564+newJoinDyn d =
2565+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566+ eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567+ eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568+ eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569+ v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570+ in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571+
2572+instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573+ fmap = mapDynamicSpider
2574+ x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575+
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+
2580+instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581+ pure = SpiderDynamic . dynamicConst
2582+#if MIN_VERSION_base(4,10,0)
2583+ liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
22552584#endif
2585+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586+ a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587+ (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588+
2589+holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2591+
2592+holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594+
2595+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597+
2598+buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599+buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600+
2601+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602+ {-# INLINABLE hold #-}
2603+ hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604+ {-# INLINABLE holdDyn #-}
2605+ holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606+ {-# INLINABLE holdIncremental #-}
2607+ holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608+ {-# INLINABLE buildDynamic #-}
2609+ buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610+ {-# INLINABLE headE #-}
2611+ headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
2615+
2616+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618+
2619+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620+ {-# INLINABLE hold #-}
2621+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622+ {-# INLINABLE holdDyn #-}
2623+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624+ {-# INLINABLE holdIncremental #-}
2625+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626+ {-# INLINABLE buildDynamic #-}
2627+ buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628+ {-# INLINABLE headE #-}
2629+ headE = R.slowHeadE
2630+-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2633+
2634+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635+ {-# INLINABLE sample #-}
2636+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637+
2638+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639+ {-# INLINABLE sample #-}
2640+ sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2641+
2642+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643+ {-# INLINABLE hold #-}
2644+ hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645+ {-# INLINABLE holdDyn #-}
2646+ holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647+ {-# INLINABLE holdIncremental #-}
2648+ holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649+ {-# INLINABLE buildDynamic #-}
2650+ buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651+ {-# INLINABLE headE #-}
2652+ headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655+
2656+--------------------------------------------------------------------------------
2657+-- Deprecated items
2658+--------------------------------------------------------------------------------
2659+
2660+-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661+{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662+type SpiderEnv = SpiderTimeline
2663+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664+ {-# INLINABLE subscribeEvent #-}
2665+ subscribeEvent e = SpiderHostFrame $ do
2666+ --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667+ val <- liftIO $ newIORef Nothing
2668+ subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669+ { subscriberPropagate = \a -> do
2670+ liftIO $ writeIORef val $ Just a
2671+ scheduleClear val
2672+ , subscriberInvalidateHeight = \_ -> return ()
2673+ , subscriberRecalculateHeight = \_ -> return ()
2674+ }
2675+ return $ SpiderEventHandle
2676+ { spiderEventHandleSubscription = subscription
2677+ , spiderEventHandleValue = val
2678+ }
2679+
2680+instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681+ type EventTrigger (SpiderTimeline x) = RootTrigger x
2682+ type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684+
2685+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686+ {-# NOINLINE readEvent #-}
2687+ readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688+ result <- readIORef $ spiderEventHandleValue h
2689+ touch h
2690+ return result
2691+
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693+ newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694+ newFanEventWithTrigger f = SpiderHost $ do
2695+ es <- newFanEventWithTriggerIO f
2696+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697+
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701+ es <- newFanEventWithTriggerIO f
2702+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703+
2704+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705+ {-# INLINABLE subscribeEvent #-}
2706+ subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2707+
2708+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709+ type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710+ fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711+ runHostFrame = runFrame . runSpiderHostFrame
22562712
22572713unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
22582714unsafeNewSpiderTimelineEnv = do
@@ -2261,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
22612717#ifdef DEBUG
22622718 depthRef <- newIORef 0
22632719#endif
2264− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
22652721 { _spiderTimeline_lock = lock
22662722 , _spiderTimeline_eventEnv = env
22672723#ifdef DEBUG
@@ -2269,43 +2725,40 @@ unsafeNewSpiderTimelineEnv = do
22692725#endif
22702726 }
22712727
2272−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
22732728-- | Create a new SpiderTimelineEnv
22742729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2275−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
22762731
2277−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
22782733
22792734instance Reifies s (SpiderTimelineEnv x) =>
22802735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2281− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
22822737
22832738localSpiderTimeline
2284− :: Proxy s
2739+ :: proxy s
22852740 -> SpiderTimelineEnv x
22862741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2287−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
22882743
22892744-- | Pass a new timeline to the given function.
22902745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
22912746withSpiderTimeline k = do
22922747 env <- unsafeNewSpiderTimelineEnv
22932748 reify env $ \s -> k $ localSpiderTimeline s env
2294−#endif
22952749
2296−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)
22972751
22982752type ComputeM = EventM
22992753
2300−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)
23012755
2302−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
23032756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
23042757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
23052758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
23062759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2307− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2308− 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 }
23092762 type PullM (SpiderTimeline x) = SpiderPullM x
23102763 type PushM (SpiderTimeline x) = SpiderPushM x
23112764 {-# INLINABLE never #-}
@@ -2318,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
23182771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
23192772 {-# INLINABLE pull #-}
23202773 pull = SpiderBehavior . pull . coerce
2321− {-# INLINABLE merge #-}
2322− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2323− {-# INLINABLE fan #-}
2324− 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
23252783 {-# INLINABLE switch #-}
23262784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
23272785 {-# INLINABLE coincidence #-}
@@ -2329,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
23292787 {-# INLINABLE current #-}
23302788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
23312789 {-# INLINABLE updated #-}
2332− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
23332791 {-# INLINABLE unsafeBuildDynamic #-}
23342792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
23352793 {-# INLINABLE unsafeBuildIncremental #-}
23362794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2337− {-# INLINABLE mergeIncremental #-}
2338− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2339− {-# INLINABLE mergeIncrementalWithMove #-}
2340− 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
23412799 {-# INLINABLE currentIncremental #-}
23422800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
23432801 {-# INLINABLE updatedIncremental #-}
@@ -2348,12 +2806,12 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
23482806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
23492807 eventCoercion Coercion = Coercion
23502808 behaviorCoercion Coercion = Coercion
2351− 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
23522811 {-# INLINABLE mergeIntIncremental #-}
2353− mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
23542813 {-# INLINABLE fanInt #-}
23552814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2356−#endif
23572815
23582816data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
23592817
@@ -2376,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
23762834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
23772835
23782836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2379−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)
23802838
23812839instance Monad (SpiderHost x) where
23822840 {-# INLINABLE (>>=) #-}
@@ -2385,22 +2843,27 @@ instance Monad (SpiderHost x) where
23852843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
23862844 {-# INLINABLE return #-}
23872845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
23882847 {-# INLINABLE fail #-}
2389− 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
23902854
23912855-- | Run an action affecting the global Spider timeline; this will be guarded by
23922856-- a mutex for that timeline
23932857runSpiderHost :: SpiderHost Global a -> IO a
2394−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
2858+runSpiderHost (SpiderHost a) = a
23952859
2396−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
23972860-- | Run an action affecting a given Spider timeline; this will be guarded by a
23982861-- mutex for that timeline
23992862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2400−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2401−#endif
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
24022864
2403−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)
24042867
24052868instance Monad (SpiderHostFrame x) where
24062869 {-# INLINABLE (>>=) #-}
@@ -2409,19 +2872,21 @@ instance Monad (SpiderHostFrame x) where
24092872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
24102873 {-# INLINABLE return #-}
24112874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
24122876 {-# INLINABLE fail #-}
24132877 fail s = SpiderHostFrame $ fail s
2878+#endif
24142879
24152880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
24162881 notReadyUntil _ = pure ()
24172882 notReady = pure ()
24182883
2419−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)
24202885newEventWithTriggerIO f = do
24212886 es <- newFanEventWithTriggerIO $ \Refl -> f
24222887 return $ select es Refl
24232888
2424−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)
24252890newFanEventWithTriggerIO f = do
24262891 occRef <- newIORef DMap.empty
24272892 subscribedRef <- newIORef DMap.empty
@@ -2455,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
24552920instance PrimMonad (SpiderHostFrame x) where
24562921 type PrimState (SpiderHostFrame x) = PrimState IO
24572922 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 ()