@@ -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,60 +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 GHC.Exts
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
6171import GHC.IORef (IORef (..))
6272import GHC.Stack
6373import Reflex.FastWeak
64−import Reflex.FunctorMaybe
6574import System.IO.Unsafe
6675import System.Mem.Weak
6776import Unsafe.Coerce
6877
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+
6987#ifdef DEBUG_CYCLES
7088import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7191import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7292import qualified Data.List.NonEmpty as NonEmpty
73−import Data.Monoid (mempty)
7493import Data.Tree (Forest, Tree (..), drawForest)
75−#endif
94+import Data.List (isPrefixOf)
7695
77−import Data.FastWeakBag (FastWeakBag)
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
7897import qualified Data.FastWeakBag as FastWeakBag
79−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
80−import qualified Data.WeakBag as WeakBag
81−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
98+
8299import Data.Reflection
83−import Data.Some (Some)
84−import qualified Data.Some as Some
100+import Data.Some (Some(Some))
85101import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
103+import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
104+import qualified Data.WeakBag as WeakBag
86105import qualified Reflex.Class
87106import qualified Reflex.Class as R
88107import qualified Reflex.Host.Class
89−#endif
90−import Reflex.Patch
91−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
92−
93−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
94−import Prelude hiding (any, concat, mapM, mapM_, sequence)
108+import Reflex.NotReady.Class
109+import Data.Patch
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111+import Reflex.PerformEvent.Base (PerformEventT)
95112
96113#ifdef DEBUG_TRACE_EVENTS
97−import System.IO (stderr)
98114import qualified Data.ByteString.Char8 as BS8
115+import System.IO (stderr)
116+import Data.List (isPrefixOf)
99117#endif
100118
101−#ifdef DEBUG_TRACE_EVENTS
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
102122
123+#ifdef DEBUG_TRACE_EVENTS
103124withStackOneLine :: (BS8.ByteString -> a) -> a
104125withStackOneLine expr = unsafePerformIO $ do
105126 stack <- currentCallStack
106− return (expr (BS8.pack (unwords (reverse stack))))
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
107129
108130#endif
109131
@@ -114,28 +136,42 @@ debugInvalidateHeight :: Bool
114136debugInvalidate :: Bool
115137
116138#ifdef DEBUG
117−
118139#define DEBUG_NODEIDS
119140
141+#ifdef DEBUG_TRACE_PROPAGATION
120142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
121146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
122150debugInvalidateHeight = False
151+#endif
123152
153+#ifdef DEBUG_TRACE_INVALIDATION
124154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
125158
126159class HasNodeId a where
127160 getNodeId :: a -> Int
128161
129−instance HasNodeId (Hold x p a) where
130− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
131164
132−instance HasNodeId (PushSubscribed x a b) where
133− getNodeId = pushSubscribedNodeId
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
134170
135171instance HasNodeId (SwitchSubscribed x a) where
136172 getNodeId = switchSubscribedNodeId
137173
138−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
139175 getNodeId = fanSubscribedNodeId
140176
141177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -149,41 +185,16 @@ instance HasNodeId (Pull x a) where
149185
150186{-# INLINE showNodeId #-}
151187showNodeId :: HasNodeId a => a -> String
152−showNodeId = ("#"<>) . show . getNodeId
153−
154−showSubscriberType :: Subscriber x a -> String
155−showSubscriberType = \case
156− SubscriberPush _ _ -> "SubscriberPush"
157− SubscriberMerge _ _ -> "SubscriberMerge"
158− SubscriberFan _ -> "SubscriberFan"
159− SubscriberMergeChange _ -> "SubscriberMergeChange"
160− SubscriberHold _ -> "SubscriberHold"
161− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
162− SubscriberSwitch _ -> "SubscriberSwitch"
163− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
164− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
165− SubscriberHandle -> "SubscriberHandle"
166−
167−showEventType :: Event x a -> String
168−showEventType = \case
169− EventRoot _ _ -> "EventRoot"
170− EventNever -> "EventNever"
171− EventPush _ -> "EventPush"
172− EventMerge _ -> "EventMerge"
173− EventFan _ _ -> "EventFan"
174− EventSwitch _ -> "EventSwitch"
175− EventCoincidence _ -> "EventCoincidence"
176− EventHold _ -> "EventHold"
177− EventDyn _ -> "EventDyn"
178− EventHoldIdentity _ -> "EventHoldIdentity"
179− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
180193
181194#else
182195
183196debugPropagate = False
184−
185197debugInvalidateHeight = False
186−
187198debugInvalidate = False
188199
189200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -191,6 +202,10 @@ debugInvalidate = False
191202showNodeId :: a -> String
192203showNodeId _ = ""
193204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
194209#endif
195210
196211#ifdef DEBUG_NODEIDS
@@ -200,12 +215,6 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
200215
201216newNodeId :: IO Int
202217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
203−
204−{-# NOINLINE unsafeNodeId #-}
205−unsafeNodeId :: a -> Int
206−unsafeNodeId a = unsafePerformIO $ do
207− touch a
208− newNodeId
209218#endif
210219
211220--------------------------------------------------------------------------------
@@ -241,31 +250,85 @@ subscribeAndRead = unEvent
241250-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
242251-- caching; if the computation function is very cheap, this is (much) more
243252-- efficient than 'push'
244−{-# NOINLINE pushCheap #-}
253+{-# INLINE [1] pushCheap #-}
245254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
246−pushCheap f e = Event $ \sub -> do
247− (subscription, occ) <- subscribeAndRead e $ sub
255+pushCheap !f e = Event $ \sub -> do
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
248257 { subscriberPropagate = \a -> do
249− mb <- runComputeM $ f a
258+ mb <- f a
250259 mapM_ (subscriberPropagate sub) mb
251260 }
252− occ' <- join <$> mapM (runComputeM . f) occ
261+ occ' <- join <$> mapM f occ
253262 return (subscription, occ')
254263
264+-- | A subscriber that never triggers other 'Event's
265+{-# INLINE terminalSubscriber #-}
266+terminalSubscriber :: (a -> EventM x ()) -> Subscriber x a
267+terminalSubscriber p = Subscriber
268+ { subscriberPropagate = p
269+ , subscriberInvalidateHeight = \_ -> return ()
270+ , subscriberRecalculateHeight = \_ -> return ()
271+ }
272+
273+-- | Subscribe to an Event only for the duration of one occurrence
274+{-# INLINE subscribeAndReadHead #-}
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276+subscribeAndReadHead e sub = do
277+ subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279+ { subscriberPropagate = \a -> do
280+ liftIO $ unsubscribe =<< readIORef subscriptionRef
281+ subscriberPropagate sub a
282+ }
283+ liftIO $ case occ of
284+ Nothing -> writeIORef subscriptionRef $! subscription
285+ Just _ -> unsubscribe subscription
286+ return (subscription, occ)
287+
288+--TODO: Make this lazy in its input event
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
290+headE originalE = do
291+ parent <- liftIO $ newIORef $ Just originalE
292+ defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293+ let clearParent = liftIO $ writeIORef parent Nothing
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295+ when (isJust occ) clearParent
296+ return $ Event $ \sub ->
297+ liftIO (readIORef parent) >>= \case
298+ Nothing -> subscribeAndReadNever
299+ Just e -> subscribeAndReadHead e sub
300+
255301data CacheSubscribed x a
256302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
257303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
258− , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (FastWeakTicket (CacheSubscribed x a))))
259304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
260308 }
261309
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+
262325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
263326-- repeatedly
264327--
265328--TODO: Try a caching strategy where we subscribe directly to the parent when
266329--there's only one subscriber, and then build our own FastWeakBag only when a second
267330--subscriber joins
268−{-# NOINLINE cacheEvent #-}
331+{-# NOINLINE [0] cacheEvent #-}
269332cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
270333cacheEvent e =
271334#ifdef DEBUG_TRACE_EVENTS
@@ -273,54 +336,79 @@ cacheEvent e =
273336#else
274337 Event $
275338#endif
276− let mSubscribedRef :: IORef (Maybe (FastWeakTicket (CacheSubscribed x a)))
277− !mSubscribedRef = unsafeNewIORef e Nothing
278− in \sub -> {-# SCC "cacheEvent" #-} do
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
279343#ifdef DEBUG_TRACE_EVENTS
280344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
281345#endif
282− subscribedTicket <- liftIO (readIORef mSubscribedRef) >>= \case
346+ subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
283347 Just subscribedTicket -> return subscribedTicket
284348 Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
285352 subscribers <- liftIO FastWeakBag.empty
286353 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
287357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
288− { subscriberPropagate = \a -> do
289− liftIO $ writeIORef occRef $ Just a
290− scheduleClear occRef
291− propagateFast a subscribers
292− , subscriberInvalidateHeight = \old -> do
293− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
294− , subscriberRecalculateHeight = \new -> do
295− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
296− }
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+ }
297366 when (isJust occ) $ do
298367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
299368 scheduleClear occRef
300369 let !subscribed = CacheSubscribed
301370 { _cacheSubscribed_subscribers = subscribers
302371 , _cacheSubscribed_parent = parentSub
303− , _cacheSubscribed_cached = mSubscribedRef
304372 , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
305376 }
306− !subscribedTicket = fastWeakTicket subscribed
307− liftIO $ writeIORef mSubscribedRef $ Just subscribedTicket
377+ subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378+ liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
308379 return subscribedTicket
309− liftIO $ do
310− let subscribed = fastWeakTicketValue subscribedTicket
311− subscribedWeak <- getFastWeakTicketWeak subscribedTicket
312− ticket <- FastWeakBag.insert sub (_cacheSubscribed_subscribers subscribed) subscribedWeak cleanupCacheSubscribed
313− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
314− let es = EventSubscribed
315− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
316− , eventSubscribedRetained = toAny subscribed
317− }
318− return (EventSubscription (FastWeakBag.remove ticket >> touch ticket) 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)
319411
320−cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
321−cleanupCacheSubscribed self = do
322− unsubscribe $ _cacheSubscribed_parent self
323− writeIORef (_cacheSubscribed_cached self) Nothing
324412
325413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
326414subscribe e s = fst <$> subscribeAndRead e s
@@ -332,13 +420,16 @@ wrap tag getSpecificSubscribed sub = do
332420 let es = tag subd
333421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
334422
335−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
336424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
337425
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428+
338429eventNever :: Event x a
339−eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
430+eventNever = Event $ const subscribeAndReadNever
340431
341−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)
342433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
343434
344435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -347,14 +438,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
347438eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
348439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
349440
350−eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
441+eventHold :: Hold x p -> Event x p
351442eventHold !h = Event $ subscribeHoldEvent h
352443
353444eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
354445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
355446
356447{-# INLINE subscribeCoincidenceInner #-}
357−subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
448+subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
358449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
359450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
360451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -373,16 +464,6 @@ data Subscriber x a = Subscriber
373464 , subscriberRecalculateHeight :: !(Height -> IO ())
374465 }
375466
376−--TODO: Move this comment to WeakBag
377−-- These function are constructor functions that are marked NOINLINE so they are
378−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
379−-- so any weak references that are attached to the constructors will have their
380−-- finalizer run. Using the opaque constructor, does not see the
381−-- constructor application, so it behaves like an IORef and cannot be fused away.
382−--
383−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
384−-- the weak pointer to it in some cases.
385−
386467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
387468newSubscriberHold h = return $ Subscriber
388469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -390,85 +471,68 @@ newSubscriberHold h = return $ Subscriber
390471 , subscriberRecalculateHeight = \_ -> return ()
391472 }
392473
393−newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
394−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
395476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
396477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
397− 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"
398479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
399480 scheduleClear $ fanSubscribedOccurrence subscribed
400− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
401482 propagate v $ _fanSubscribedChildren_list subsubs
402483 return $ Constant ()
403484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
404485 return ()
405486 , subscriberInvalidateHeight = \old -> do
406− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
407487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
408− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
409− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
410489 , subscriberRecalculateHeight = \new -> do
411− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
412490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
413− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
414− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
415492 }
416493
417494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
418−newSubscriberSwitch subscribed = return $ Subscriber
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
419496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
420− tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
421497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
422498 scheduleClear $ switchSubscribedOccurrence subscribed
423499 propagate a $ switchSubscribedSubscribers subscribed
424500 , subscriberInvalidateHeight = \_ -> do
425− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
426501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
427502 when (oldHeight /= invalidHeight) $ do
428503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
429− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
430− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
431− , subscriberRecalculateHeight = \new -> do
432− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
433− updateSwitchHeight new subscribed
434− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
435− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
436507
437508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
438−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
439510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
440− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
441511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
442512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
443513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
444514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
445515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
446517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
447518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
448519 case occ of
449− Nothing -> do
520+ Nothing ->
450521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
451522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
452− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
453− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
454525 Just o -> do -- Since it's already firing, no need to adjust height
455526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
456527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
457528 propagate o $ coincidenceSubscribedSubscribers subscribed
458− , subscriberInvalidateHeight = \_ -> do
459− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
460− invalidateCoincidenceHeight subscribed
461− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
462− , subscriberRecalculateHeight = \_ -> do
463− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
464− recalculateCoincidenceHeight subscribed
465− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
466531 }
467532
468533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
469−newSubscriberCoincidenceInner subscribed = return $ Subscriber
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
470535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
471− tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
472536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
473537 case occ of
474538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -476,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
476540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
477541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
478542 propagate a $ coincidenceSubscribedSubscribers subscribed
479− , subscriberInvalidateHeight = \_ -> do
480− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
481− invalidateCoincidenceHeight subscribed
482− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
483− , subscriberRecalculateHeight = \_ -> do
484− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
485− recalculateCoincidenceHeight subscribed
486− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
487545 }
488546
489547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -493,18 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
493551recalculateSubscriberHeight = flip subscriberRecalculateHeight
494552
495553-- | Propagate everything at the current height
496−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
497−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) $
498556 -- 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
499557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
500− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
558+ WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
501559
502560-- | Propagate everything at the current height
503−propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
504−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) $
505563 -- 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
506564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
507− FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
508566
509567--------------------------------------------------------------------------------
510568-- EventSubscribed
@@ -513,11 +571,16 @@ propagateFast a subscribers = withIncreasedDepth $ do
513571toAny :: a -> Any
514572toAny = unsafeCoerce
515573
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.
516579data EventSubscribed x = EventSubscribed
517580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
518581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
519582#ifdef DEBUG_CYCLES
520− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
521584 , eventSubscribedHasOwnHeightRef :: !Bool
522585 , eventSubscribedWhoCreated :: !(IO [String])
523586#endif
@@ -544,13 +607,23 @@ eventSubscribedNever = EventSubscribed
544607 , eventSubscribedWhoCreated = return ["never"]
545608#endif
546609 }
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+ }
547620
548−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
549622eventSubscribedFan !subscribed = EventSubscribed
550623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
551624 , eventSubscribedRetained = toAny subscribed
552625#ifdef DEBUG_CYCLES
553− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
554627 , eventSubscribedHasOwnHeightRef = False
555628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
556629#endif
@@ -563,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
563636#ifdef DEBUG_CYCLES
564637 , eventSubscribedGetParents = do
565638 s <- readIORef $ switchSubscribedCurrentParent subscribed
566− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
567640 , eventSubscribedHasOwnHeightRef = True
568641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
569642#endif
@@ -576,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
576649#ifdef DEBUG_CYCLES
577650 , eventSubscribedGetParents = do
578651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
579− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
580− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
581654 return $ outerParent : innerParents
582655 , eventSubscribedHasOwnHeightRef = True
583656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -591,20 +664,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
591664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
592665whoCreatedEventSubscribed = eventSubscribedWhoCreated
593666
594−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
595668walkInvalidHeightParents s0 = do
596− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
597670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
598671 when (h == invalidHeight) $ do
599672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
600− modify (Some.This s :)
673+ modify (s :)
601674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
602− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
603676 return subscribers
604677#endif
605678
606679{-# INLINE subscribeHoldEvent #-}
607−subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
608681subscribeHoldEvent = subscribeAndRead . holdEvent
609682
610683--------------------------------------------------------------------------------
@@ -627,7 +700,7 @@ behaviorPull !p = Behavior $ do
627700 val <- liftIO $ readIORef $ pullValue p
628701 case val of
629702 Just subscribed -> do
630− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
631704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
632705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
633706 return $ pullSubscribedValue subscribed
@@ -636,7 +709,7 @@ behaviorPull !p = Behavior $ do
636709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
637710 parentsRef <- liftIO $ newIORef []
638711 holdInits <- askBehaviorHoldInits
639− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
640713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
641714 parents <- liftIO $ readIORef parentsRef
642715 let subscribed = PullSubscribed
@@ -646,7 +719,7 @@ behaviorPull !p = Behavior $ do
646719 , pullSubscribedParents = parents
647720 }
648721 liftIO $ writeIORef (pullValue p) $ Just subscribed
649− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
650723 return a
651724
652725behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -657,7 +730,8 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
657730readHoldTracked h = do
658731 result <- liftIO $ readIORef $ holdValue h
659732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
660− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734+ liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
661735 return result
662736
663737{-# INLINABLE readBehaviorUntracked #-}
@@ -670,42 +744,46 @@ readBehaviorUntracked b = do
670744-- Dynamic
671745--------------------------------------------------------------------------------
672746
673−data Dynamic x p = Dynamic
674− { dynamicCurrent :: !(Behavior x (PatchTarget p))
675− , 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`?
676752 }
677753
678−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
679760dynamicHold !h = Dynamic
680761 { dynamicCurrent = behaviorHold h
681762 , dynamicUpdated = eventHold h
682763 }
683764
684−dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
685766dynamicHoldIdentity = dynamicHold
686767
687−dynamicConst :: PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
688769dynamicConst !a = Dynamic
689770 { dynamicCurrent = behaviorConst a
690771 , dynamicUpdated = eventNever
691772 }
692773
693−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
694775dynamicDyn !d = Dynamic
695776 { dynamicCurrent = behaviorDyn d
696777 , dynamicUpdated = eventDyn d
697778 }
698779
699−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
700781dynamicDynIdentity = dynamicDyn
701782
702783--------------------------------------------------------------------------------
703784-- Combinators
704785--------------------------------------------------------------------------------
705786
706−--TODO: Figure out why certain things are not 'representational', then make them
707−--representational so we can use coerce
708−
709787--type role Hold representational
710788data Hold x p
711789 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -717,9 +795,7 @@ data Hold x p
717795#endif
718796 }
719797
720−-- | A statically allocated 'SpiderTimeline'; this is the only instance of
721−-- 'SpiderTimeline' that can used when using
722−-- -fspecialize-to-spidertimeline-global.
798+-- | A statically allocated 'SpiderTimeline'
723799data Global
724800
725801{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -728,30 +804,27 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
728804
729805-- | Stores all global data relevant to a particular Spider timeline; only one
730806-- value should exist for each type @x@
731−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
732813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
733814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
734815#ifdef DEBUG
735816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
736817#endif
737818 }
738−type role SpiderTimelineEnv nominal
819+type role SpiderTimelineEnv' phantom
739820
740821instance Eq (SpiderTimelineEnv x) where
741822 _ == _ = True -- Since only one exists of each type
742823
743824instance GEq SpiderTimelineEnv where
744−#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
745− geqToEq _ = id
746− geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
747− then case unsafeCoerce Refl :: a :~: b of
748− Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
749− else different
750−#else
751− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
825+ a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
752826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
753827 else Nothing
754−#endif
755828
756829data EventEnv x
757830 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
@@ -759,8 +832,9 @@ data EventEnv x
759832 , eventEnvDynInits :: !(IORef [SomeDynInit x])
760833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
761834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
762− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
763− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
764838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
765839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
766840 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -771,7 +845,7 @@ runEventM :: EventM x a -> IO a
771845runEventM = unEventM
772846
773847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
774−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
848+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
775849
776850class MonadIO m => Defer a m where
777851 getDeferralQueue :: m (IORef [a])
@@ -820,11 +894,7 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
820894 delayedRef <- asksEventEnv eventEnvDelayedMerges
821895 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
822896
823−#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
824−class x ~ Global => HasSpiderTimeline x where
825−#else
826897class HasSpiderTimeline x where
827−#endif
828898 -- | Retrieve the current SpiderTimelineEnv
829899 spiderTimeline :: SpiderTimelineEnv x
830900
@@ -836,21 +906,29 @@ putCurrentHeight h = do
836906 heightRef <- asksEventEnv eventEnvCurrentHeight
837907 liftIO $ writeIORef heightRef $! h
838908
839−instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
840910 {-# INLINE getDeferralQueue #-}
841911 getDeferralQueue = asksEventEnv eventEnvClears
842912
843913{-# INLINE scheduleClear #-}
844−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
845−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
846916
847−instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918+ {-# INLINE getDeferralQueue #-}
919+ getDeferralQueue = asksEventEnv eventEnvIntClears
920+
921+{-# INLINE scheduleIntClear #-}
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
924+
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
848926 {-# INLINE getDeferralQueue #-}
849927 getDeferralQueue = asksEventEnv eventEnvRootClears
850928
851929{-# INLINE scheduleRootClear #-}
852−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
853−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
854932
855933instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
856934 {-# INLINE getDeferralQueue #-}
@@ -879,7 +957,7 @@ hold v0 e = do
879957 return h
880958
881959{-# INLINE getHoldEventSubscription #-}
882−getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Hold x p -> m (EventSubscription x)
960+getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
883961getHoldEventSubscription h = do
884962 ep <- liftIO $ readIORef $ holdParent h
885963 case ep of
@@ -905,9 +983,9 @@ getHoldEventSubscription h = do
905983
906984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
907985
908−--type role BehaviorM representational
909986-- BehaviorM can sample behaviors
910−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))
911989
912990instance Monad (BehaviorM x) where
913991 {-# INLINE (>>=) #-}
@@ -916,14 +994,16 @@ instance Monad (BehaviorM x) where
916994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
917995 {-# INLINE return #-}
918996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
919998 {-# INLINE fail #-}
920999 fail s = BehaviorM $ fail s
1000+#endif
9211001
9221002data BehaviorSubscribed x a
9231003 = forall p. BehaviorSubscribedHold (Hold x p)
9241004 | BehaviorSubscribedPull (PullSubscribed x a)
9251005
926−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
9271007
9281008--type role PullSubscribed representational
9291009data PullSubscribed x a
@@ -958,7 +1038,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9581038#endif
9591039 }
9601040
961−data Root x (k :: * -> *)
1041+data Root x k
9621042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9631043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9641044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -977,22 +1057,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
9771057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
9781058
9791059-- EventM can do everything BehaviorM can, plus create holds
980−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
981−
982−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x], IORef [SomeDynInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
983−
984−instance Defer (SomeHoldInit x) (ComputeM x) where
985− getDeferralQueue = ComputeM $ asks fst
986−
987−instance Defer (SomeDynInit x) (ComputeM x) where
988− getDeferralQueue = ComputeM $ asks snd
989−
990−{-# INLINABLE runComputeM #-}
991−runComputeM :: (Defer (SomeHoldInit x) m, Defer (SomeDynInit x) m) => ComputeM x a -> m a
992−runComputeM (ComputeM a) = do
993− holds <- getDeferralQueue
994− dyns <- getDeferralQueue
995− liftIO $ runReaderT a (holds, dyns)
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9961061
9971062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9981063
@@ -1017,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
10171082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10181083
10191084heightBagAdd :: Height -> HeightBag -> HeightBag
1020−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
10211087
10221088heightBagRemove :: Height -> HeightBag -> HeightBag
10231089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1026,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10261092 0 -> IntMap.delete h c
10271093 _ -> IntMap.insert h (pred old) c
10281094
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+
10291102heightBagMax :: HeightBag -> Height
10301103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
10311104 Just ((h, _), _) -> Height h
@@ -1043,25 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
10431116heightBagVerify = id
10441117#endif
10451118
1046−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1047− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1048− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1049− , _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)))
10501123 }
10511124
1052−data FanSubscribed (x :: *) k
1053− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1054− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1055− , 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
10561129 , fanSubscribedParent :: !(EventSubscription x)
10571130#ifdef DEBUG_NODEIDS
10581131 , fanSubscribedNodeId :: Int
10591132#endif
10601133 }
10611134
1062−data Fan x k
1063− = Fan { fanParent :: !(Event x (DMap k Identity))
1064− , 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)))
10651138 }
10661139
10671140data SwitchSubscribed x a
@@ -1115,20 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11151188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11161189newInvalidatorPull p = return $! InvalidatorPull p
11171190
1118−instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1119− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
11201193
11211194instance HasSpiderTimeline x => Align (Event x) where
11221195 nil = eventNever
1123− align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromList [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)
11241212
1125−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) }
11261214
1127−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)
11281216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
11291217
11301218--TODO: Avoid the duplication between this and R.zipDynWith
1131−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)
11321220zipDynWith f da db =
11331221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11341222 ec = flip push eab $ \o -> do
@@ -1143,24 +1231,20 @@ zipDynWith f da db =
11431231 return $ Just $ Identity $ f a b
11441232 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11451233
1146−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)
11471235buildDynamic readV0 v' = do
1148− result <- liftIO $ newIORef $ Left (readV0, v')
1236+ result <- liftIO $ newIORef $ BuildDyn (readV0, v')
11491237 let !d = Dyn result
11501238 defer $ SomeDynInit d
11511239 return d
11521240
11531241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1154−unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1155− where x = (readV0, v')
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11561244
11571245-- ResultM can read behaviors and events
11581246type ResultM = EventM
11591247
1160−{-# NOINLINE unsafeNewIORef #-}
1161−unsafeNewIORef :: a -> b -> IORef b
1162−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1163−
11641248instance HasSpiderTimeline x => Functor (Event x) where
11651249 fmap f = push $ return . Just . f
11661250
@@ -1173,33 +1257,42 @@ push f e = cacheEvent (pushCheap f e)
11731257
11741258{-# INLINABLE pull #-}
11751259pull :: BehaviorM x a -> Behavior x a
1176−pull a = behaviorPull $ Pull
1177− { pullCompute = a
1178− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11791262#ifdef DEBUG_NODEIDS
1180− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
11811264#endif
1182− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
11831272
11841273{-# INLINABLE switch #-}
11851274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1186−switch a = eventSwitch $ Switch
1187− { switchParent = a
1188− , switchSubscribed = unsafeNewIORef a Nothing
1189− }
1275+switch a = unsafePerformIO $ do
1276+ ref <- newIORef Nothing
1277+ pure $ eventSwitch $ Switch
1278+ { switchParent = a
1279+ , switchSubscribed = ref
1280+ }
11901281
11911282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1192−coincidence a = eventCoincidence $ Coincidence
1193− { coincidenceParent = a
1194− , coincidenceSubscribed = unsafeNewIORef a Nothing
1195− }
1283+coincidence a = unsafePerformIO $ do
1284+ ref <- newIORef Nothing
1285+ pure $ eventCoincidence $ Coincidence
1286+ { coincidenceParent = a
1287+ , coincidenceSubscribed = ref
1288+ }
11961289
11971290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
11981291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
11991292run roots after = do
12001293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1201− t <- SpiderHost ask
1202− 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
12031296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12041297 occBefore <- liftIO $ do
12051298 occBefore <- readIORef occRef
@@ -1237,9 +1330,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
12371330 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
12381331 EQ -> a
12391332
1240−data SomeClear = forall a. SomeClear (IORef (Maybe a))
1333+newtype Clear a = Clear (IORef (Maybe a))
12411334
1242−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1335+newtype IntClear a = IntClear (IORef (IntMap a))
1336+
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
12431338
12441339data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12451340
@@ -1251,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12511346 x' <- evaluate x
12521347 mkWeakPtr x' $
12531348 if debugFinalize
1254− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12551350 else Nothing
12561351
12571352type WeakList a = [Weak a]
12581353
1259−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12601359#ifdef DEBUG
1261−withIncreasedDepth :: CanTrace x m => m a -> m a
1262−withIncreasedDepth a = do
1263− spiderTimeline <- askSpiderTimelineEnv
1264− 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
12651385 result <- a
1266− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12671387 return result
1268−#else
1269−withIncreasedDepth :: m a -> m a
1270−withIncreasedDepth = id
1271−#endif
1272−
1273−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
12741388
12751389{-# INLINE tracePropagate #-}
12761390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1277−tracePropagate p = traceWhen p debugPropagate
1391+tracePropagate p = when debugPropagate . trace p
12781392
12791393{-# INLINE traceInvalidate #-}
12801394traceInvalidate :: String -> IO ()
1281−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
12821400
1283−{-# INLINE traceWhen #-}
1284−traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1285−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
12861404
1287−{-# INLINE traceMWhen #-}
1288−traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1289−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
12901408 message <- getMessage
1291−#ifdef DEBUG
1292− spiderTimeline <- askSpiderTimelineEnv
1293− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
12941412#else
1295− 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+
12961448#endif
1297− liftIO $ putStrLn $ replicate d ' ' <> message
12981449
12991450whoCreatedIORef :: IORef a -> IO [String]
13001451whoCreatedIORef (IORef a) = whoCreated $! a
13011452
1302−#ifdef DEBUG_CYCLES
13031453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
13041454groupByHead = \case
13051455 [] -> []
@@ -1310,20 +1460,54 @@ groupByHead = \case
13101460 | otherwise -> (x, xs :| []) : l
13111461
13121462listsToForest :: Eq a => [[a]] -> Forest a
1313−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
13141474#endif
13151475
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+
13161498{-# INLINE propagateSubscriberHold #-}
13171499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13181500propagateSubscriberHold h a = do
1319− {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13201502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13211503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13221505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
13231506 case {-# SCC "apply" #-} apply a v of
13241507 Nothing -> return ()
13251508 Just v' -> do
1326− {-# 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)
13271511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13281512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13291513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1331,25 +1515,25 @@ propagateSubscriberHold h a = do
13311515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13321516
13331517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1334−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13351519
13361520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13371521askInvalidator = do
1338− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13391523 case m of
13401524 Nothing -> return Nothing
13411525 Just (!wi, _) -> return $ Just wi
13421526
13431527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13441528askParentsRef = do
1345− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13461530 case m of
13471531 Nothing -> return Nothing
13481532 Just (_, !p) -> return $ Just p
13491533
13501534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13511535askBehaviorHoldInits = do
1352− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13531537 return his
13541538
13551539{-# INLINE getDynHold #-}
@@ -1357,30 +1541,27 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
13571541getDynHold d = do
13581542 mh <- liftIO $ readIORef $ unDyn d
13591543 case mh of
1360− Right h -> return h
1361− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13621546 holdInits <- getDeferralQueue
13631547 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
13641554 h <- hold v0 v'
1365− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13661556 return h
13671557
1558+
13681559-- Always refers to 0
13691560{-# NOINLINE zeroRef #-}
13701561zeroRef :: IORef Height
13711562zeroRef = unsafePerformIO $ newIORef zeroHeight
13721563
1373−type CanSubscribe x m =
1374− ( HasSpiderTimeline x
1375− , HasCurrentHeight x m
1376− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1377− , Defer SomeClear m -- Wiping out event firings
1378− , Defer (SomeAssignment x) m -- Updating state
1379− , Defer (SomeResetCoincidence x) m
1380− , m ~ EventM x
1381− )
1382−
1383−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)
13841565getRootSubscribed k r sub = do
13851566 mSubscribed <- readIORef $ rootSubscribed r
13861567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1394,9 +1575,14 @@ getRootSubscribed k r sub = do
13941575 let !cached = rootSubscribed r
13951576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
13961577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1397− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
13981581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13991582 writeIORef uninitRef $! uninit
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
14001586 let !subscribed = RootSubscribed
14011587 { rootSubscribedKey = k
14021588 , rootSubscribedCachedSubscribed = cached
@@ -1405,7 +1591,7 @@ getRootSubscribed k r sub = do
14051591 , rootSubscribedUninit = uninit
14061592 , rootSubscribedWeakSelf = weakSelf
14071593#ifdef DEBUG_NODEIDS
1408− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14091595#endif
14101596 }
14111597 -- If we die at the same moment that all our children die, they will
@@ -1435,8 +1621,90 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
14351621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
14361622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
14371623
1624+newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1625+
1626+data FanInt x a = FanInt
1627+ { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1628+ , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629+ , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630+#ifdef DEBUG_NODEIDS
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632+#endif
1633+ }
1634+
1635+newFanInt :: IO (FanInt x a)
1636+newFanInt = do
1637+ subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638+ subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639+ occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
1643+ return $ FanInt
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
1650+ }
1651+
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657+ when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660+ { subscriberPropagate = \m -> do
1661+ liftIO $ writeIORef (_fanInt_occRef self) m
1662+ scheduleIntClear $ _fanInt_occRef self
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664+ FastWeakBag.traverse_ b $ \s ->
1665+ subscriberPropagate s v
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
1669+ subscriberInvalidateHeight s old
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
1673+ subscriberRecalculateHeight s new
1674+ }
1675+ liftIO $ do
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1679+ liftIO $ do
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681+ Nothing -> do
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684+ return b
1685+ Just b -> return b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691+
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698+#ifdef DEBUG_CYCLES
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702+#endif
1703+ }
1704+
1705+
14381706{-# INLINABLE getFanSubscribed #-}
1439−getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (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))
14401708getFanSubscribed k f sub = do
14411709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
14421710 case mSubscribed of
@@ -1454,13 +1722,16 @@ getFanSubscribed k f sub = do
14541722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
14551723 occRef <- liftIO $ newIORef parentOcc
14561724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
14571728 let subscribed = FanSubscribed
14581729 { fanSubscribedCachedSubscribed = fanSubscribed f
14591730 , fanSubscribedOccurrence = occRef
14601731 , fanSubscribedParent = subscription
14611732 , fanSubscribedSubscribers = subscribersRef
14621733#ifdef DEBUG_NODEIDS
1463− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
14641735#endif
14651736 }
14661737 let !self = (k, subscribed)
@@ -1470,7 +1741,7 @@ getFanSubscribed k f sub = do
14701741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
14711742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
14721743
1473−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
14741745cleanupFanSubscribed (k, subscribed) = do
14751746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
14761747 let reducedSubscribers = DMap.delete k subscribers
@@ -1482,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
14821753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
14831754
14841755{-# INLINE subscribeFanSubscribed #-}
1485−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
14861757subscribeFanSubscribed k subscribed sub = do
14871758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
14881759 case DMap.lookup k subscribers of
@@ -1495,7 +1766,7 @@ subscribeFanSubscribed k subscribed sub = do
14951766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
14961767
14971768{-# INLINABLE getSwitchSubscribed #-}
1498−getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1769+getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
14991770getSwitchSubscribed s sub = do
15001771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
15011772 case mSubscribed of
@@ -1520,6 +1791,9 @@ getSwitchSubscribed s sub = do
15201791 when (isJust parentOcc) $ scheduleClear occRef
15211792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
15221793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
15231797 let !subscribed = SwitchSubscribed
15241798 { switchSubscribedCachedSubscribed = switchSubscribed s
15251799 , switchSubscribedOccurrence = occRef
@@ -1532,7 +1806,7 @@ getSwitchSubscribed s sub = do
15321806 , switchSubscribedCurrentParent = subscriptionRef
15331807 , switchSubscribedWeakSelf = weakSelf
15341808#ifdef DEBUG_NODEIDS
1535− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
15361810#endif
15371811 }
15381812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1551,7 +1825,7 @@ subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBa
15511825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
15521826
15531827{-# INLINABLE getCoincidenceSubscribed #-}
1554−getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1828+getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
15551829getCoincidenceSubscribed c sub = do
15561830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
15571831 case mSubscribed of
@@ -1577,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
15771851 scheduleClear innerSubdRef
15781852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
15791853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
15801857 let subscribed = CoincidenceSubscribed
15811858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
15821859 , coincidenceSubscribedOccurrence = occRef
@@ -1587,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
15871864 , coincidenceSubscribedInnerParent = innerSubdRef
15881865 , coincidenceSubscribedWeakSelf = weakSelf
15891866#ifdef DEBUG_NODEIDS
1590− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
15911868#endif
15921869 }
15931870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1604,57 +1881,72 @@ cleanupCoincidenceSubscribed subscribed = do
16041881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16051882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16061883
1607−{-# INLINE merge #-}
1608−merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1609−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)
16101889
16111890{-# INLINE mergeWithMove #-}
1612−mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1613−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)
16141895
16151896{-# INLINE [1] mergeCheap #-}
1616−mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1617−mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
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
16181903 where
1619− updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
16201905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
16211906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
16221907 (mOldSubd, newPs) <- case me of
16231908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
16241909 Just e -> do
16251910 let s = subscriber $ return k
1626− subscription@(EventSubscription _ subd) <- subscribe e s
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
16271912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
16281913 let newParent = MergeSubscribedParent subscription
16291914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
16301915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
16311916 forM_ mOldSubd $ \oldSubd -> do
1632− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
16331920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
16341921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
16351922 foldM f ([], oldParents) $ DMap.toList p
1636− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
16371925 getInitialSubscribers initialParents subscriber = do
16381926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
16391927 let s = subscriber $ return k
1640− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
16411929 height <- liftIO $ getEventSubscribedHeight parentSubd
1642− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
16431931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
16441932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
16451933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
16461934 )
1935+
16471936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
16481937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
16491938
16501939{-# INLINE [1] mergeCheapWithMove #-}
1651−mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1652−mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
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
16531945 where
1654− updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
16551947 updateMe subscriber heightBagRef oldParents p = do
16561948 -- Prepare new parents for insertion
1657− 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)
16581950 subscribeParent k e = do
16591951 keyRef <- liftIO $ newIORef k
16601952 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1663,122 +1955,185 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.siz
16631955 newParentHeight <- getEventSubscribedHeight subd
16641956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
16651957 return $ MergeSubscribedParentWithMove subscription keyRef
1666− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
16671959 -- Collect old parents for deletion and update the keys of moved parents
1668− 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
16691961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
16701962 Nothing -> do
1671− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
16721966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
16731967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
16741968 Just toKey -> do
16751969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
16761970 return Nothing
1677− 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+
16781974 return (toDelete, applyAlways p' oldParents)
1679− getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
16801976 getInitialSubscribers initialParents subscriber = do
16811977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
16821978 keyRef <- liftIO $ newIORef k
16831979 let s = subscriber $ liftIO $ readIORef keyRef
1684− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
16851981 height <- liftIO $ getEventSubscribedHeight parentSubd
1686− return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
16871983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
16881984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
16891985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
16901986 )
1987+
16911988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
16921989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
16931990
1694−type MergeUpdateFunc k x p s
1695− = (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))
16961993 -> IORef HeightBag
16971994 -> DMap k s
16981995 -> p
16991996 -> EventM x ([EventSubscription x], DMap k s)
17001997
1701−type MergeInitFunc k x s
1702− = DMap k (Event x)
1703− -> (forall a. EventM x (k a) -> Subscriber x a)
1704− -> 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)
17052004
17062005type MergeDestroyFunc k s
17072006 = DMap k s
17082007 -> IO ()
17092008
1710−{-# INLINE mergeCheap' #-}
1711−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 -> (DMap k s -> Int) -> Dynamic x p -> Event x (DMap k Identity)
1712−mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub -> do
2009+data Merge x k v s = Merge
2010+ { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011+ , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012+ , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
2015+ }
2016+
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
2018+invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2019+
2020+invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021+invalidateMergeHeight' heightRef sub = do
2022+ oldHeight <- readIORef heightRef
2023+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024+ when (oldHeight /= invalidHeight) $ do
2025+ writeIORef heightRef $! invalidHeight
2026+ subscriberInvalidateHeight sub oldHeight
2027+
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
2029+revalidateMergeHeight m = do
2030+ currentHeight <- readIORef $ _merge_heightRef m
2031+
2032+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033+ when (currentHeight == invalidHeight) $ do
2034+ heights <- readIORef $ _merge_heightBagRef m
2035+ parents <- readIORef $ _merge_parentsRef m
2036+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037+ case heightBagSize heights `compare` DMap.size parents of
2038+ LT -> return ()
2039+ EQ -> do
2040+ let height = succHeight $ heightBagMax heights
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042+ writeIORef (_merge_heightRef m) $! height
2043+ subscriberRecalculateHeight (_merge_sub m) height
2044+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2045+
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047+scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048+ vals <- liftIO $ readIORef $ _merge_accumRef m
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052+ --TODO: Assert that m is not empty
2053+ subscriberPropagate (_merge_sub m) vals
2054+
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
2078+ { subscriberPropagate = \a -> do
2079+ oldM <- liftIO $ readIORef $ _merge_accumRef m
2080+ k <- getKey
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083+ liftIO $ writeIORef (_merge_accumRef m) $! newM
2084+ when (DMap.null oldM) $ do -- Only schedule the firing once
2085+ height <- liftIO $ readIORef $ _merge_heightRef m
2086+ checkCycle subscribed
2087+
2088+ scheduleMergeSelf m height
2089+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090+ modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091+ invalidateMergeHeight m
2092+ , subscriberRecalculateHeight = \new -> do
2093+ modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094+ revalidateMergeHeight m
2095+ }
2096+
2097+--TODO: Be able to run as much of this as possible promptly
2098+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100+ where updateMe = do
2101+ oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103+ liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104+ return subscriptionsToKill
2105+
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
17132110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
17142111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
17152112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
17162113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
17172114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1718− let scheduleSelf height = scheduleMerge' height heightRef $ do
1719− m <- liftIO $ readIORef accumRef
1720− liftIO $ writeIORef accumRef $! DMap.empty
1721− --TODO: Assert that m is not empty
1722− subscriberPropagate sub m
1723− invalidateMyHeight = do
1724− oldHeight <- readIORef heightRef
1725− 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
1726− writeIORef heightRef $! invalidHeight
1727− subscriberInvalidateHeight sub oldHeight
1728− revalidateMyHeight = do
1729− currentHeight <- readIORef heightRef
1730− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1731− heights <- readIORef heightBagRef
1732− parents <- readIORef parentsRef
1733− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1734− case heightBagSize heights `compare` numParents parents of
1735− LT -> return ()
1736− EQ -> do
1737− let height = succHeight $ heightBagMax heights
1738− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1739− writeIORef heightRef $! height
1740− subscriberRecalculateHeight sub height
1741− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (numParents parents) <> ") for Merge"
1742− subscriber :: forall a. EventM x (k a) -> Subscriber x a
1743− subscriber getKey = Subscriber
1744− { subscriberPropagate = \a -> do
1745− oldM <- liftIO $ readIORef accumRef
1746− k <- getKey
1747− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1748− tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1749− liftIO $ writeIORef accumRef $! newM
1750− when (DMap.null oldM) $ do -- Only schedule the firing once
1751− height <- liftIO $ readIORef heightRef
1752− --TODO: assertions about height
1753− currentHeight <- getCurrentHeight
1754− when (height <= currentHeight) $ do
1755− if height /= invalidHeight
1756− then do
1757− myStack <- liftIO $ whoCreatedIORef undefined --TODO
1758− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1759− else liftIO $ do
2115+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116+
2117+ let subscribed = EventSubscribed
2118+ { eventSubscribedHeightRef = heightRef
2119+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
17602120#ifdef DEBUG_CYCLES
1761− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1762− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1763− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1764−#else
1765− let cycleInfo = ""
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
17662126#endif
1767− error $ "Causality loop found" <> cycleInfo
1768− scheduleSelf height
1769− , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1770− modifyIORef' heightBagRef $ heightBagRemove old
1771− invalidateMyHeight
1772− , subscriberRecalculateHeight = \new -> do
1773− modifyIORef' heightBagRef $ heightBagAdd new
1774− revalidateMyHeight
2127+ }
2128+
2129+ m = Merge
2130+ { _merge_parentsRef = parentsRef
2131+ , _merge_heightBagRef = heightBagRef
2132+ , _merge_heightRef = heightRef
2133+ , _merge_sub = sub
2134+ , _merge_accumRef = accumRef
17752135 }
1776− let updateMe x = do
1777− oldParents <- liftIO $ readIORef parentsRef
1778− (subscriptionsToKill, newParents) <- updateFunc subscriber heightBagRef oldParents x
1779− liftIO $ writeIORef parentsRef $! newParents
1780− return subscriptionsToKill
1781− (dm, heights, initialParentState) <- getInitialSubscribers initialParents subscriber
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
17822137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
17832138 myHeight = if invalidHeight `elem` heights
17842139 then invalidHeight
@@ -1787,43 +2142,153 @@ mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub
17872142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
17882143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
17892144 else (Nothing, dm)
1790− unless (DMap.null accum) $ do
1791− scheduleSelf myHeight
1792− occRef <- liftIO $ newIORef occ
1793− when (isJust occ) $ scheduleClear occRef
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
17942146 liftIO $ writeIORef accumRef $! accum
17952147 liftIO $ writeIORef heightRef $! myHeight
17962148 liftIO $ writeIORef heightBagRef $! myHeightBag
1797− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
17982149 liftIO $ writeIORef parentsRef $! initialParentState
17992150 defer $ SomeMergeInit $ do
1800− let s = Subscriber
2151+ let changeSubscriber = Subscriber
18012152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1802− tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1803− defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
18042155 , subscriberInvalidateHeight = \_ -> return ()
18052156 , subscriberRecalculateHeight = \_ -> return ()
18062157 }
1807− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1808− forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
18092160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
18102161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
18112162 -- its subscription.
1812− liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
18132164 let unsubscribeAll = destroy =<< readIORef parentsRef
1814− return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1815− , occ
1816− )
2165+
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)
2170+mergeInt = cacheEvent . mergeIntCheap
2171+
2172+{-# INLINABLE mergeIntCheap #-}
2173+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174+mergeIntCheap d = Event $ \sub -> do
2175+ initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176+ accum <- liftIO $ FastMutableIntMap.newEmpty
2177+ heightRef <- liftIO $ newIORef zeroHeight
2178+ heightBagRef <- liftIO $ newIORef heightBagEmpty
2179+ parents <- liftIO $ FastMutableIntMap.newEmpty
2180+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181+ let subscribed = EventSubscribed
2182+ { eventSubscribedHeightRef = heightRef
2183+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2184+#ifdef DEBUG_CYCLES
2185+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186+ , eventSubscribedHasOwnHeightRef = False
2187+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188+#endif
2189+ }
2190+ let scheduleSelf = do
2191+ height <- liftIO $ readIORef $ heightRef
2192+ scheduleMerge' height heightRef $ do
2193+ vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194+ subscriberPropagate sub vals
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196+ recalculateMyHeight = do
2197+ currentHeight <- readIORef heightRef
2198+ when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
2199+ heights <- readIORef heightBagRef
2200+ numParents <- FastMutableIntMap.size parents
2201+ case heightBagSize heights `compare` numParents of
2202+ LT -> return ()
2203+ EQ -> do
2204+ let height = succHeight $ heightBagMax heights
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206+ writeIORef heightRef $! height
2207+ subscriberRecalculateHeight sub height
2208+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209+ mySubscriber k = Subscriber
2210+ { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
2213+ wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214+ liftIO $ FastMutableIntMap.insert accum k a
2215+ when wasEmpty scheduleSelf
2216+ , subscriberInvalidateHeight = \old -> do
2217+ modifyIORef' heightBagRef $ heightBagRemove old
2218+ invalidateMyHeight
2219+ , subscriberRecalculateHeight = \new -> do
2220+ modifyIORef' heightBagRef $ heightBagAdd new
2221+ recalculateMyHeight
2222+ }
2223+ forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2225+ liftIO $ do
2226+ forM_ parentOcc $ FastMutableIntMap.insert accum k
2227+ FastMutableIntMap.insert parents k subscription
2228+ height <- getEventSubscribedHeight parentSubd
2229+ if height == invalidHeight
2230+ then writeIORef heightRef invalidHeight
2231+ else do
2232+ modifyIORef' heightBagRef $ heightBagAdd height
2233+ modifyIORef' heightRef $ \oldHeight ->
2234+ if oldHeight == invalidHeight
2235+ then invalidHeight
2236+ else max (succHeight height) oldHeight
2237+ myHeight <- liftIO $ readIORef heightRef
2238+ currentHeight <- getCurrentHeight
2239+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240+ occ <- if currentHeight >= myHeight -- If we should have fired by now
2241+ then if isEmpty
2242+ then return Nothing
2243+ else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244+ else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245+ return Nothing
2246+ defer $ SomeMergeInit $ do
2247+ let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2248+ where
2249+ u = do
2250+ let f k newParent = do
2251+ subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254+ return subscription
2255+ newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256+ oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257+ liftIO $ for_ oldParents $ \oldParent -> do
2258+ oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
2261+ modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262+ return $ IntMap.elems oldParents
2263+ let changeSubscriber = Subscriber
2264+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266+ defer $ updateMe a
2267+ , subscriberInvalidateHeight = \_ -> return ()
2268+ , subscriberRecalculateHeight = \_ -> return ()
2269+ }
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271+ forM_ change $ \c -> defer $ updateMe c
2272+ -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273+ -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274+ -- its subscription.
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276+ let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
18172280
18182281newtype 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) }
18192283
1820−fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1821−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
18222287 let f = Fan
18232288 { fanParent = e
1824− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
18252290 }
1826− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
18272292
18282293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
18292294runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -1854,13 +2319,14 @@ newEventEnv = do
18542319 mergeInitRef <- newIORef []
18552320 heightRef <- newIORef zeroHeight
18562321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
18572323 toClearRootRef <- newIORef []
18582324 coincidenceInfosRef <- newIORef []
18592325 delayedRef <- newIORef IntMap.empty
1860− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2326+ return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
18612327
18622328clearEventEnv :: EventEnv x -> IO ()
1863−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2329+clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
18642330 writeIORef toAssignRef []
18652331 writeIORef holdInitRef []
18662332 writeIORef dynInitRef []
@@ -1868,41 +2334,44 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
18682334 writeIORef mergeInitRef []
18692335 writeIORef heightRef zeroHeight
18702336 writeIORef toClearRef []
2337+ writeIORef toClearIntRef []
18712338 writeIORef toClearRootRef []
18722339 writeIORef coincidenceInfosRef []
18732340 writeIORef delayedRef IntMap.empty
18742341
18752342-- | Run an event action outside of a frame
18762343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1877−runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1878− let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2344+runFrame a = SpiderHost $ do
2345+ let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
18792346 let go = do
18802347 result <- a
18812348 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
18822349 return result
18832350 result <- runEventM go
18842351 toClear <- readIORef $ eventEnvClears env
1885− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
2352+ forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2353+ toClearInt <- readIORef $ eventEnvIntClears env
2354+ forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
18862355 toClearRoot <- readIORef $ eventEnvRootClears env
1887− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2356+ forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
18882357 toAssign <- readIORef $ eventEnvAssignments env
18892358 toReconnectRef <- newIORef []
18902359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
18912360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
18922361 writeIORef vRef v
1893− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
18942363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
18952364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
18962365 writeIORef (eventEnvMergeUpdates env) []
1897− when debugPropagate $ putStrLn "Updating merges"
2366+ tracePropagate (Proxy::Proxy x) $ "Updating merges"
18982367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
1899− when debugPropagate $ putStrLn "Updating merges done"
2368+ tracePropagate (Proxy::Proxy x) $ "Updating merges done"
19002369 toReconnect <- readIORef toReconnectRef
19012370 clearEventEnv env
19022371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
19032372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
19042373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1905− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
19062375 finalize wi
19072376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
19082377 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -1913,10 +2382,10 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
19132382 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
19142383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
19152384 sub <- newSubscriberSwitch subscribed
1916− 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
19172386 {-
19182387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1919− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
19202389 EventRoot _ -> "EventRoot"
19212390 EventNever -> "EventNever"
19222391 _ -> "something else"
@@ -1931,7 +2400,7 @@ runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
19312400 myHeight <- readIORef $ switchSubscribedHeight subscribed
19322401 when (parentHeight /= myHeight) $ do
19332402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1934− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2403+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
19352404 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
19362405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
19372406 unsubscribe subscription
@@ -1972,7 +2441,7 @@ invalidateCoincidenceHeight subscribed = do
19722441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
19732442 when (oldHeight /= invalidHeight) $ do
19742443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1975− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
19762445
19772446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
19782447updateSwitchHeight new subscribed = do
@@ -1980,7 +2449,7 @@ updateSwitchHeight new subscribed = do
19802449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19812450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19822451 writeIORef (switchSubscribedHeight subscribed) $! new
1983− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
19842453
19852454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19862455recalculateCoincidenceHeight subscribed = do
@@ -1989,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
19892458 height <- calculateCoincidenceHeight subscribed
19902459 when (height /= invalidHeight) $ do
19912460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1992− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
19932462
19942463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
19952464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2028,13 +2497,218 @@ invalidate toReconnectRef wis = do
20282497-- Reflex integration
20292498--------------------------------------------------------------------------------
20302499
2031−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2032−-- When we're specializing, we include this from Reflex.Class instead, because
2033−-- it needs access to these types; when we're not, we want them here, so our
2034−-- instance isn't an orphan instance.
2035−#include "SpiderTimeline.include.hs"
2036−#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)
20372584#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
20382712
20392713unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
20402714unsafeNewSpiderTimelineEnv = do
@@ -2043,7 +2717,7 @@ unsafeNewSpiderTimelineEnv = do
20432717#ifdef DEBUG
20442718 depthRef <- newIORef 0
20452719#endif
2046− return $ SpiderTimelineEnv
2720+ return $ STE $ SpiderTimelineEnv
20472721 { _spiderTimeline_lock = lock
20482722 , _spiderTimeline_eventEnv = env
20492723#ifdef DEBUG
@@ -2051,41 +2725,40 @@ unsafeNewSpiderTimelineEnv = do
20512725#endif
20522726 }
20532727
2054−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
20552728-- | Create a new SpiderTimelineEnv
20562729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2057−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
20582731
2059−data LocalSpiderTimeline x s
2732+data LocalSpiderTimeline (x :: Type) s
20602733
20612734instance Reifies s (SpiderTimelineEnv x) =>
20622735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2063− spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
20642737
20652738localSpiderTimeline
2066− :: Proxy s
2739+ :: proxy s
20672740 -> SpiderTimelineEnv x
20682741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2069−localSpiderTimeline _ = unsafeCoerce
2742+localSpiderTimeline _ = coerce
20702743
20712744-- | Pass a new timeline to the given function.
20722745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
20732746withSpiderTimeline k = do
20742747 env <- unsafeNewSpiderTimelineEnv
20752748 reify env $ \s -> k $ localSpiderTimeline s env
2076−#endif
20772749
2078−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)
2751+
2752+type ComputeM = EventM
20792753
2080−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)
20812755
2082−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
20832756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
20842757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
20852758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
20862759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2087− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2088− 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 }
20892762 type PullM (SpiderTimeline x) = SpiderPullM x
20902763 type PushM (SpiderTimeline x) = SpiderPushM x
20912764 {-# INLINABLE never #-}
@@ -2098,10 +2771,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
20982771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
20992772 {-# INLINABLE pull #-}
21002773 pull = SpiderBehavior . pull . coerce
2101− {-# INLINABLE merge #-}
2102− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2103− {-# INLINABLE fan #-}
2104− 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
21052783 {-# INLINABLE switch #-}
21062784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
21072785 {-# INLINABLE coincidence #-}
@@ -2109,15 +2787,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
21092787 {-# INLINABLE current #-}
21102788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
21112789 {-# INLINABLE updated #-}
2112− updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
21132791 {-# INLINABLE unsafeBuildDynamic #-}
21142792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
21152793 {-# INLINABLE unsafeBuildIncremental #-}
21162794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2117− {-# INLINABLE mergeIncremental #-}
2118− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2119− {-# INLINABLE mergeIncrementalWithMove #-}
2120− 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
21212799 {-# INLINABLE currentIncremental #-}
21222800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
21232801 {-# INLINABLE updatedIncremental #-}
@@ -2128,8 +2806,12 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
21282806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
21292807 eventCoercion Coercion = Coercion
21302808 behaviorCoercion Coercion = Coercion
2131− dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2132−#endif
2809+ dynamicCoercion Coercion = Coercion
2810+ incrementalCoercion Coercion Coercion = Coercion
2811+ {-# INLINABLE mergeIntIncremental #-}
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813+ {-# INLINABLE fanInt #-}
2814+ fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
21332815
21342816data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
21352817
@@ -2152,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
21522834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
21532835
21542836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2155−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)
21562838
21572839instance Monad (SpiderHost x) where
21582840 {-# INLINABLE (>>=) #-}
@@ -2161,22 +2843,27 @@ instance Monad (SpiderHost x) where
21612843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
21622844 {-# INLINABLE return #-}
21632845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
21642847 {-# INLINABLE fail #-}
2165− 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
21662854
21672855-- | Run an action affecting the global Spider timeline; this will be guarded by
21682856-- a mutex for that timeline
21692857runSpiderHost :: SpiderHost Global a -> IO a
2170−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
2858+runSpiderHost (SpiderHost a) = a
21712859
2172−#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
21732860-- | Run an action affecting a given Spider timeline; this will be guarded by a
21742861-- mutex for that timeline
21752862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2176−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2177−#endif
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
21782864
2179−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)
21802867
21812868instance Monad (SpiderHostFrame x) where
21822869 {-# INLINABLE (>>=) #-}
@@ -2185,15 +2872,21 @@ instance Monad (SpiderHostFrame x) where
21852872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
21862873 {-# INLINABLE return #-}
21872874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
21882876 {-# INLINABLE fail #-}
21892877 fail s = SpiderHostFrame $ fail s
2878+#endif
2879+
2880+instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881+ notReadyUntil _ = pure ()
2882+ notReady = pure ()
21902883
2191−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)
21922885newEventWithTriggerIO f = do
21932886 es <- newFanEventWithTriggerIO $ \Refl -> f
21942887 return $ select es Refl
21952888
2196−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)
21972890newFanEventWithTriggerIO f = do
21982891 occRef <- newIORef DMap.empty
21992892 subscribedRef <- newIORef DMap.empty
@@ -2227,3 +2920,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
22272920instance PrimMonad (SpiderHostFrame x) where
22282921 type PrimState (SpiderHostFrame x) = PrimState IO
22292922 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 ()