@@ -9,125 +9,71 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MagicHash #-}
13+{-# LANGUAGE MultiParamTypeClasses #-}
14+{-# LANGUAGE MultiWayIf #-}
1215{-# LANGUAGE RankNTypes #-}
1316{-# LANGUAGE RoleAnnotations #-}
1417{-# LANGUAGE ScopedTypeVariables #-}
1518{-# LANGUAGE TypeFamilies #-}
1619{-# LANGUAGE TypeOperators #-}
1720{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
24−#ifdef USE_REFLEX_OPTIMIZER
25−{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
26−#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2821-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2922-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30−module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
23+module Reflex.Spider.Internal where
3124
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
25+import Control.Applicative
3526import Control.Concurrent
3627import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
28+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3829import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
30+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4031import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
32+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4433import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4734import Data.Align
4835import Data.Coerce
49−import Data.Dependent.Map (DMap)
36+import Data.Dependent.Map (DMap, DSum (..))
5037import 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
5438import Data.Foldable hiding (concat, elem, sequence_)
39+import Data.Function
5540import Data.Functor.Constant
56−import Data.Functor.Misc
5741import Data.Functor.Product
5842import Data.GADT.Compare
5943import Data.IntMap.Strict (IntMap)
6044import qualified Data.IntMap.Strict as IntMap
6145import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
65−import Data.Proxy
46+import Data.List hiding (foldl')
47+import Data.Maybe
48+import Data.Monoid ((<>))
49+import Data.Some (Some)
50+import qualified Data.Some as Some
6651import Data.These
6752import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
53+import Data.Type.Coercion
54+import Data.Word
55+import GHC.Exts
7156import GHC.IORef (IORef (..))
7257import GHC.Stack
73−import Reflex.FastWeak
7458import System.IO.Unsafe
7559import System.Mem.Weak
7660import Unsafe.Coerce
7761
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−
8762#ifdef DEBUG_CYCLES
8863import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9164import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9265import qualified Data.List.NonEmpty as NonEmpty
66+import Data.Monoid (mempty)
9367import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
95−
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
68+#endif
9869
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
103−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
70+import Data.WeakBag (WeakBag, WeakBagTicket)
10471import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
10672import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
108−import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
112−
113−#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
115−import System.IO (stderr)
116−import Data.List (isPrefixOf)
117−#endif
73+import qualified Reflex.Host.Class as R
11874
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123−#ifdef DEBUG_TRACE_EVENTS
124−withStackOneLine :: (BS8.ByteString -> a) -> a
125−withStackOneLine expr = unsafePerformIO $ do
126− stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
129−
130−#endif
75+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
76+import Prelude hiding (any, concat, mapM, mapM_, sequence)
13177
13278debugPropagate :: Bool
13379
@@ -136,42 +82,31 @@ debugInvalidateHeight :: Bool
13682debugInvalidate :: Bool
13783
13884#ifdef DEBUG
85+
13986#define DEBUG_NODEIDS
14087
141−#ifdef DEBUG_TRACE_PROPAGATION
14288debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
14689
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
15090debugInvalidateHeight = False
151−#endif
15291
153−#ifdef DEBUG_TRACE_INVALIDATION
15492debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
15893
15994class HasNodeId a where
16095 getNodeId :: a -> Int
16196
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
97+instance HasNodeId (Hold x p a) where
16998 getNodeId = holdNodeId
17099
100+instance HasNodeId (PushSubscribed x a b) where
101+ getNodeId = pushSubscribedNodeId
102+
171103instance HasNodeId (SwitchSubscribed x a) where
172104 getNodeId = switchSubscribedNodeId
173105
174−instance HasNodeId (FanSubscribed x v a) where
106+instance HasNodeId (MergeSubscribed x a) where
107+ getNodeId = mergeSubscribedNodeId
108+
109+instance HasNodeId (FanSubscribed x a) where
175110 getNodeId = fanSubscribedNodeId
176111
177112instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +120,41 @@ instance HasNodeId (Pull x a) where
185120
186121{-# INLINE showNodeId #-}
187122showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
123+showNodeId = ("#"<>) . show . getNodeId
124+
125+showSubscriberType :: Subscriber x a -> String
126+showSubscriberType = \case
127+ SubscriberPush _ _ -> "SubscriberPush"
128+ SubscriberMerge _ _ -> "SubscriberMerge"
129+ SubscriberFan _ -> "SubscriberFan"
130+ SubscriberMergeChange _ -> "SubscriberMergeChange"
131+ SubscriberHold _ -> "SubscriberHold"
132+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
133+ SubscriberSwitch _ -> "SubscriberSwitch"
134+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
135+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
136+ SubscriberHandle -> "SubscriberHandle"
137+
138+showEventType :: Event x a -> String
139+showEventType = \case
140+ EventRoot _ _ -> "EventRoot"
141+ EventNever -> "EventNever"
142+ EventPush _ -> "EventPush"
143+ EventMerge _ -> "EventMerge"
144+ EventFan _ _ -> "EventFan"
145+ EventSwitch _ -> "EventSwitch"
146+ EventCoincidence _ -> "EventCoincidence"
147+ EventHold _ -> "EventHold"
148+ EventDyn _ -> "EventDyn"
149+ EventHoldIdentity _ -> "EventHoldIdentity"
150+ EventDynIdentity _ -> "EventDynIdentity"
193151
194152#else
195153
196154debugPropagate = False
155+
197156debugInvalidateHeight = False
157+
198158debugInvalidate = False
199159
200160-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +162,6 @@ debugInvalidate = False
202162showNodeId :: a -> String
203163showNodeId _ = ""
204164
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209165#endif
210166
211167#ifdef DEBUG_NODEIDS
@@ -215,200 +171,91 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215171
216172newNodeId :: IO Int
217173newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
218−#endif
219−
220−--------------------------------------------------------------------------------
221−-- EventSubscription
222−--------------------------------------------------------------------------------
223−
224−--NB: Once you subscribe to an Event, you must always hold on the the WHOLE EventSubscription you get back
225−-- If you do not retain the subscription, you may be prematurely unsubscribed from the parent event.
226−data EventSubscription x = EventSubscription
227− { _eventSubscription_unsubscribe :: !(IO ())
228− , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
229− }
230174
231−unsubscribe :: EventSubscription x -> IO ()
232−unsubscribe (EventSubscription u _) = u
175+{-# NOINLINE unsafeNodeId #-}
176+unsafeNodeId :: a -> Int
177+unsafeNodeId a = unsafePerformIO $ do
178+ touch a
179+ newNodeId
180+#endif
233181
234182--------------------------------------------------------------------------------
235183-- Event
236184--------------------------------------------------------------------------------
237185
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
239−
240−{-# INLINE subscribeAndRead #-}
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
242−subscribeAndRead = unEvent
243−
244−{-# RULES
245−"cacheEvent/cacheEvent" forall e. cacheEvent (cacheEvent e) = cacheEvent e
246−"cacheEvent/pushCheap" forall f e. pushCheap f (cacheEvent e) = cacheEvent (pushCheap f e)
247−"hold/cacheEvent" forall f e. hold f (cacheEvent e) = hold f e
248− #-}
186+newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
249187
250188-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251189-- caching; if the computation function is very cheap, this is (much) more
252190-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
191+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
192+pushCheap f e = Event $ \sub -> do
193+ (subscription, occ) <- subscribeAndRead e $ sub
257194 { subscriberPropagate = \a -> do
258− mb <- f a
195+ mb <- runComputeM $ f a
259196 mapM_ (subscriberPropagate sub) mb
260197 }
261− occ' <- join <$> mapM f occ
198+ occ' <- join <$> mapM (runComputeM . f) occ
262199 return (subscription, occ')
263200
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−
301201data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
202+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
203+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303204 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
205+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304206 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308207 }
309208
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−
325209-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326210-- repeatedly
327211--
328212--TODO: Try a caching strategy where we subscribe directly to the parent when
329−--there's only one subscriber, and then build our own FastWeakBag only when a second
213+--there's only one subscriber, and then build our own WeakBag only when a second
330214--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
333−cacheEvent e =
334−#ifdef DEBUG_TRACE_EVENTS
335− withStackOneLine $ \callSite -> Event $
336−#else
337− Event $
338−#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
343−#ifdef DEBUG_TRACE_EVENTS
344− unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345−#endif
346− subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347− Just subscribedTicket -> return subscribedTicket
348− Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352− subscribers <- liftIO FastWeakBag.empty
353− 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
357− (parentSub, occ) <- subscribeAndRead e $ Subscriber
358−#endif
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365− }
366− when (isJust occ) $ do
367− liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368− scheduleClear occRef
369− let !subscribed = CacheSubscribed
370− { _cacheSubscribed_subscribers = subscribers
371− , _cacheSubscribed_parent = parentSub
372− , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376− }
377− subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378− liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379− return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
215+cacheEvent :: Event x a -> Event x a
216+cacheEvent e = Event $ \sub -> do
217+ let !mSubscribedRef = unsafeNewIORef e Nothing
218+ mSubscribed <- liftIO $ readIORef mSubscribedRef
219+ case mSubscribed of
220+ Just subscribed -> liftIO $ do
221+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
222+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
223+ let es = EventSubscribed
224+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
225+ , eventSubscribedRetained = toAny subscribed
226+ }
227+ return (EventSubscription (Just ticket) es, occ)
228+ Nothing -> do
229+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
230+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
231+ occRef <- liftIO $ newIORef undefined
232+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
233+ { subscriberPropagate = \a -> do
234+ liftIO $ writeIORef occRef $ Just a
235+ scheduleClear occRef
236+ propagate a subscribers
237+ , subscriberInvalidateHeight = \old -> do
238+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
239+ , subscriberRecalculateHeight = \new -> do
240+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
409241 }
410− return (es, occ)
242+ liftIO $ writeIORef occRef occ
243+ when (isJust occ) $ scheduleClear occRef
244+ let !subscribed = CacheSubscribed
245+ { _cacheSubscribed_subscribers = subscribers
246+ , _cacheSubscribed_weakSelf = weakSelf
247+ , _cacheSubscribed_parent = parentSub
248+ , _cacheSubscribed_cached = mSubscribedRef
249+ , _cacheSubscribed_occurrence = occRef
250+ }
251+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
252+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
253+ return (EventSubscription (Just ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
411254
255+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
256+cleanupCacheSubscribed self = do
257+ unsubscribe $ _cacheSubscribed_parent self
258+ writeIORef (_cacheSubscribed_cached self) Nothing
412259
413260subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414261subscribe e s = fst <$> subscribeAndRead e s
@@ -418,34 +265,34 @@ wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTi
418265wrap tag getSpecificSubscribed sub = do
419266 (sln, subd, occ) <- getSpecificSubscribed sub
420267 let es = tag subd
421− return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
268+ return (EventSubscription (Just sln) es, occ)
422269
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
270+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424271eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425272
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429273eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
274+eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
275+
276+eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
277+eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
431278
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
279+eventFan :: GCompare k => k a -> Fan x k -> Event x a
433280eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434281
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
282+eventSwitch :: Switch x a -> Event x a
436283eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
437284
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
285+eventCoincidence :: Coincidence x a -> Event x a
439286eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440287
441288eventHold :: Hold x p -> Event x p
442289eventHold !h = Event $ subscribeHoldEvent h
443290
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
291+eventDyn :: R.Patch p => Dyn x p -> Event x p
445292eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446293
447294{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
295+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449296subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450297 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451298 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +311,150 @@ data Subscriber x a = Subscriber
464311 , subscriberRecalculateHeight :: !(Height -> IO ())
465312 }
466313
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
314+--TODO: Move this comment to WeakBag
315+-- These function are constructor functions that are marked NOINLINE so they are
316+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
317+-- so any weak references that are attached to the constructors will have their
318+-- finalizer run. Using the opaque constructor, does not see the
319+-- constructor application, so it behaves like an IORef and cannot be fused away.
320+--
321+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
322+-- the weak pointer to it in some cases.
323+
324+newSubscriberHold :: R.Patch p => Hold x p -> IO (Subscriber x p)
468325newSubscriberHold h = return $ Subscriber
469326 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470327 , subscriberInvalidateHeight = \_ -> return ()
471328 , subscriberRecalculateHeight = \_ -> return ()
472329 }
473330
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
331+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
332+newSubscriberMerge k subscribed = return $ Subscriber
333+ { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
334+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
335+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
336+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
337+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
338+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
339+ when (DMap.null oldM) $ do -- Only schedule the firing once
340+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
341+ --TODO: assertions about height
342+ currentHeight <- getCurrentHeight
343+ when (height <= currentHeight) $ do
344+ if height /= invalidHeight
345+ then do
346+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
347+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
348+ else liftIO $ do
349+#ifdef DEBUG_CYCLES
350+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
351+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
352+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
353+#else
354+ let cycleInfo = ""
355+#endif
356+ error $ "Causality loop found" <> cycleInfo
357+ scheduleMerge height subscribed
358+ , subscriberInvalidateHeight = \old -> do
359+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
360+ removeMergeHeight old subscribed
361+ invalidateMergeHeight subscribed
362+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
363+ , subscriberRecalculateHeight = \new -> do
364+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
365+ addMergeHeight new subscribed
366+ revalidateMergeHeight subscribed
367+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
368+ }
369+
370+newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap k (Event x)))
371+newSubscriberMergeChange subscribed = return $ Subscriber
372+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
373+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
374+ defer $ SomeMergeUpdate a subscribed
375+ , subscriberInvalidateHeight = \_ -> return ()
376+ , subscriberRecalculateHeight = \_ -> return ()
377+ }
378+
379+newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
380+newSubscriberFan subscribed = return $ Subscriber
476381 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477382 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
383+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479384 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480385 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
386+ let f _ (Pair (Identity v) subsubs) = do
482387 propagate v $ _fanSubscribedChildren_list subsubs
483388 return $ Constant ()
484389 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485390 return ()
486391 , subscriberInvalidateHeight = \old -> do
392+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487393 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
394+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
395+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489396 , subscriberRecalculateHeight = \new -> do
397+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490398 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
399+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
400+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492401 }
493402
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
403+newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
404+newSubscriberSwitch subscribed = return $ Subscriber
496405 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
406+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
497407 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498408 scheduleClear $ switchSubscribedOccurrence subscribed
499409 propagate a $ switchSubscribedSubscribers subscribed
500410 , subscriberInvalidateHeight = \_ -> do
411+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501412 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502413 when (oldHeight /= invalidHeight) $ do
503414 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
415+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
416+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
417+ , subscriberRecalculateHeight = \new -> do
418+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
419+ updateSwitchHeight new subscribed
420+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
421+ }
507422
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
423+newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
424+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510425 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
426+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511427 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
428+ tracePropagate $ " outerHeight = " <> show outerHeight
513429 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
430+ tracePropagate $ " isJust occ = " <> show (isJust occ)
431+ tracePropagate $ " innerHeight = " <> show innerHeight
517432 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518433 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519434 case occ of
520− Nothing ->
435+ Nothing -> do
521436 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522437 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
438+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
439+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525440 Just o -> do -- Since it's already firing, no need to adjust height
526441 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527442 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528443 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
444+ , subscriberInvalidateHeight = \_ -> do
445+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
446+ invalidateCoincidenceHeight subscribed
447+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
448+ , subscriberRecalculateHeight = \_ -> do
449+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
450+ recalculateCoincidenceHeight subscribed
451+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531452 }
532453
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
454+newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
455+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535456 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
457+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536458 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537459 case occ of
538460 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +462,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540462 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541463 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542464 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
465+ , subscriberInvalidateHeight = \_ -> do
466+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
467+ invalidateCoincidenceHeight subscribed
468+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
469+ , subscriberRecalculateHeight = \_ -> do
470+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
471+ recalculateCoincidenceHeight subscribed
472+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545473 }
546474
547475invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +479,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551479recalculateSubscriberHeight = flip subscriberRecalculateHeight
552480
553481-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
556− -- 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
557− --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
559−
560−-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
482+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
483+propagate a subscribers = withIncreasedDepth $ do
563484 -- 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
564485 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
486+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566487
567488--------------------------------------------------------------------------------
568489-- EventSubscribed
@@ -571,16 +492,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571492toAny :: a -> Any
572493toAny = unsafeCoerce
573494
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.
579495data EventSubscribed x = EventSubscribed
580496 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581497 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582498#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
499+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584500 , eventSubscribedHasOwnHeightRef :: !Bool
585501 , eventSubscribedWhoCreated :: !(IO [String])
586502#endif
@@ -607,23 +523,26 @@ eventSubscribedNever = EventSubscribed
607523 , eventSubscribedWhoCreated = return ["never"]
608524#endif
609525 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
526+
527+eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x
528+eventSubscribedMerge !subscribed = EventSubscribed
529+ { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
530+ , eventSubscribedRetained = toAny subscribed
614531#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
532+ , eventSubscribedGetParents = do
533+ ps <- readIORef $ mergeSubscribedParents subscribed
534+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
535+ , eventSubscribedHasOwnHeightRef = True
536+ , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
618537#endif
619538 }
620539
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
540+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622541eventSubscribedFan !subscribed = EventSubscribed
623542 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624543 , eventSubscribedRetained = toAny subscribed
625544#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
545+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627546 , eventSubscribedHasOwnHeightRef = False
628547 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629548#endif
@@ -636,7 +555,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636555#ifdef DEBUG_CYCLES
637556 , eventSubscribedGetParents = do
638557 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
558+ return [Some.This $ _eventSubscription_subscribed s]
640559 , eventSubscribedHasOwnHeightRef = True
641560 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642561#endif
@@ -649,8 +568,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649568#ifdef DEBUG_CYCLES
650569 , eventSubscribedGetParents = do
651570 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
571+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
572+ innerParents = maybeToList $ fmap Some.This innerSubscription
654573 return $ outerParent : innerParents
655574 , eventSubscribedHasOwnHeightRef = True
656575 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,29 +583,41 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664583whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665584whoCreatedEventSubscribed = eventSubscribedWhoCreated
666585
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
586+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668587walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
588+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670589 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671590 when (h == invalidHeight) $ do
672591 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
592+ modify (Some.This s :)
674593 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
594+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676595 return subscribers
677596#endif
678597
679598{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
599+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681600subscribeHoldEvent = subscribeAndRead . holdEvent
682601
602+--------------------------------------------------------------------------------
603+-- EventSubscription
604+--------------------------------------------------------------------------------
605+
606+data EventSubscription x = EventSubscription
607+ { _eventSubscription_ticket :: !(Maybe WeakBagTicket)
608+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
609+ }
610+
611+unsubscribe :: EventSubscription x -> IO ()
612+unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
613+
683614--------------------------------------------------------------------------------
684615-- Behavior
685616--------------------------------------------------------------------------------
686617
687618newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
688619
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
620+behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
690621behaviorHold !h = Behavior $ readHoldTracked h
691622
692623behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -700,7 +631,7 @@ behaviorPull !p = Behavior $ do
700631 val <- liftIO $ readIORef $ pullValue p
701632 case val of
702633 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
634+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704635 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705636 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706637 return $ pullSubscribedValue subscribed
@@ -709,7 +640,7 @@ behaviorPull !p = Behavior $ do
709640 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710641 parentsRef <- liftIO $ newIORef []
711642 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
643+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713644 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714645 parents <- liftIO $ readIORef parentsRef
715646 let subscribed = PullSubscribed
@@ -719,22 +650,22 @@ behaviorPull !p = Behavior $ do
719650 , pullSubscribedParents = parents
720651 }
721652 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
653+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723654 return a
724655
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
656+behaviorDyn :: R.Patch p => Dyn x p -> Behavior x (R.PatchTarget p)
726657behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
727658
728659{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
660+readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
730661readHoldTracked h = do
731662 result <- liftIO $ readIORef $ holdValue h
732663 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
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
664+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735665 return result
736666
737−{-# INLINABLE readBehaviorUntracked #-}
667+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
668+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
738669readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739670readBehaviorUntracked b = do
740671 holdInits <- getDeferralQueue
@@ -744,49 +675,45 @@ readBehaviorUntracked b = do
744675-- Dynamic
745676--------------------------------------------------------------------------------
746677
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`?
678+data Dynamic x p = Dynamic
679+ { dynamicCurrent :: !(Behavior x (R.PatchTarget p))
680+ , dynamicUpdated :: !(Event x p)
752681 }
753682
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
683+dynamicHold :: Hold x p -> Dynamic x p
760684dynamicHold !h = Dynamic
761685 { dynamicCurrent = behaviorHold h
762686 , dynamicUpdated = eventHold h
763687 }
764688
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
689+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766690dynamicHoldIdentity = dynamicHold
767691
768−dynamicConst :: PatchTarget p -> DynamicS x p
692+dynamicConst :: R.PatchTarget p -> Dynamic x p
769693dynamicConst !a = Dynamic
770694 { dynamicCurrent = behaviorConst a
771695 , dynamicUpdated = eventNever
772696 }
773697
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
698+dynamicDyn :: R.Patch p => Dyn x p -> Dynamic x p
775699dynamicDyn !d = Dynamic
776700 { dynamicCurrent = behaviorDyn d
777701 , dynamicUpdated = eventDyn d
778702 }
779703
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
704+dynamicDynIdentity :: Dyn x (Identity a) -> Dynamic x (Identity a)
781705dynamicDynIdentity = dynamicDyn
782706
783707--------------------------------------------------------------------------------
784708-- Combinators
785709--------------------------------------------------------------------------------
786710
711+--TODO: Figure out why certain things are not 'representational', then make them
712+--representational so we can use coerce
713+
787714--type role Hold representational
788715data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
716+ = Hold { holdValue :: !(IORef (R.PatchTarget p))
790717 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791718 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
792719 , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
@@ -795,57 +722,22 @@ data Hold x p
795722#endif
796723 }
797724
798−-- | A statically allocated 'SpiderTimeline'
799−data Global
800−
801−{-# NOINLINE globalSpiderTimelineEnv #-}
802−globalSpiderTimelineEnv :: SpiderTimelineEnv Global
803−globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804−
805−-- | Stores all global data relevant to a particular Spider timeline; only one
806−-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
811−
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
813− { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814− , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815−#ifdef DEBUG
816− , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817−#endif
818− }
819−type role SpiderTimelineEnv' phantom
820−
821−instance Eq (SpiderTimelineEnv x) where
822− _ == _ = True -- Since only one exists of each type
823−
824−instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
826− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827− else Nothing
828−
829725data EventEnv x
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
726+ = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
727+ , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831728 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833729 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834730 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
731+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
732+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838733 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839734 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
735+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
841736 }
842737
843738{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
845−runEventM = unEventM
846−
847−asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
739+runEventM :: EventM x a -> EventEnv x -> IO a
740+runEventM = runReaderT . unEventM
849741
850742class MonadIO m => Defer a m where
851743 getDeferralQueue :: m (IORef [a])
@@ -856,87 +748,81 @@ defer a = do
856748 q <- getDeferralQueue
857749 liftIO $ modifyIORef' q (a:)
858750
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
860− {-# INLINE getDeferralQueue #-}
861− getDeferralQueue = asksEventEnv eventEnvAssignments
862−
863−instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
751+instance Defer (SomeAssignment x) (EventM x) where
864752 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
753+ getDeferralQueue = EventM $ asks eventEnvAssignments
866754
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
755+instance Defer (SomeHoldInit x) (EventM x) where
868756 {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
757+ getDeferralQueue = EventM $ asks eventEnvHoldInits
870758
871759instance Defer (SomeHoldInit x) (BehaviorM x) where
872760 {-# INLINE getDeferralQueue #-}
873761 getDeferralQueue = BehaviorM $ asks snd
874762
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
763+instance Defer (SomeMergeUpdate x) (EventM x) where
876764 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
765+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
878766
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
767+instance Defer (SomeMergeInit x) (EventM x) where
880768 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
769+ getDeferralQueue = EventM $ asks eventEnvMergeInits
882770
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
771+class HasCurrentHeight x m | m -> x where
884772 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
773+ scheduleMerge :: Height -> MergeSubscribed x a -> m ()
886774
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
775+instance HasCurrentHeight x (EventM x) where
888776 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
777+ getCurrentHeight = EventM $ do
778+ heightRef <- asks eventEnvCurrentHeight
891779 liftIO $ readIORef heightRef
892780 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
781+ scheduleMerge height subscribed = EventM $ do
782+ delayedRef <- asks eventEnvDelayedMerges
783+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
896784
897−class HasSpiderTimeline x where
898− -- | Retrieve the current SpiderTimelineEnv
899− spiderTimeline :: SpiderTimelineEnv x
785+class HasSpiderTimeline x m | m -> x where
786+ -- | Retrieve the current SpiderTimeline
787+ askSpiderTimeline :: m (SpiderTimeline x)
900788
901−instance HasSpiderTimeline Global where
902− spiderTimeline = globalSpiderTimelineEnv
789+instance HasSpiderTimeline x (EventM x) where
790+ {-# INLINE askSpiderTimeline #-}
791+ askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
903792
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905−putCurrentHeight h = do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
793+instance HasSpiderTimeline x (SpiderHost x) where
794+ {-# INLINE askSpiderTimeline #-}
795+ askSpiderTimeline = SpiderHost ask
796+
797+putCurrentHeight :: Height -> EventM x ()
798+putCurrentHeight h = EventM $ do
799+ heightRef <- asks eventEnvCurrentHeight
907800 liftIO $ writeIORef heightRef $! h
908801
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
802+instance Defer SomeClear (EventM x) where
910803 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
804+ getDeferralQueue = EventM $ asks eventEnvClears
912805
913806{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
916−
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
807+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
808+scheduleClear r = defer $ SomeClear r
924809
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
810+instance Defer SomeRootClear (EventM x) where
926811 {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
812+ getDeferralQueue = EventM $ asks eventEnvRootClears
928813
929814{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
815+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
816+scheduleRootClear r = defer $ SomeRootClear r
932817
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
818+instance Defer (SomeResetCoincidence x) (EventM x) where
934819 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
820+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
936821
937822-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
939−hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
823+{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
824+{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> ComputeM x (Hold x p) #-}
825+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
940826hold v0 e = do
941827 valRef <- liftIO $ newIORef v0
942828 invsRef <- liftIO $ newIORef []
@@ -957,7 +843,7 @@ hold v0 e = do
957843 return h
958844
959845{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
846+getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, R.Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961847getHoldEventSubscription h = do
962848 ep <- liftIO $ readIORef $ holdParent h
963849 case ep of
@@ -971,7 +857,7 @@ getHoldEventSubscription h = do
971857 Nothing -> return ()
972858 Just o -> do
973859 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
860+ case R.apply o old of
975861 Nothing -> return ()
976862 Just new -> do
977863 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +869,9 @@ getHoldEventSubscription h = do
983869
984870type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985871
872+--type role BehaviorM representational
986873-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
874+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989875
990876instance Monad (BehaviorM x) where
991877 {-# INLINE (>>=) #-}
@@ -994,16 +880,14 @@ instance Monad (BehaviorM x) where
994880 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995881 {-# INLINE return #-}
996882 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998883 {-# INLINE fail #-}
999884 fail s = BehaviorM $ fail s
1000−#endif
1001885
1002886data BehaviorSubscribed x a
1003887 = forall p. BehaviorSubscribedHold (Hold x p)
1004888 | BehaviorSubscribedPull (PullSubscribed x a)
1005889
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
890+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007891
1008892--type role PullSubscribed representational
1009893data PullSubscribed x a
@@ -1038,33 +922,34 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038922#endif
1039923 }
1040924
1041−data Root x k
925+data Root x (k :: * -> *)
1042926 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043927 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044928 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1045929 }
1046930
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1048−
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
931+data SomeHoldInit x = forall p. R.Patch p => SomeHoldInit !(Hold x p)
1050932
1051−data SomeMergeUpdate x = SomeMergeUpdate
1052− { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053− , _someMergeUpdate_invalidateHeight :: !(IO ())
1054− , _someMergeUpdate_recalculateHeight :: !(IO ())
1055− }
933+data SomeMergeUpdate x = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap k (Event x)) (MergeSubscribed x k)
1056934
1057−newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
935+data SomeMergeInit x = forall k. GCompare k => SomeMergeInit !(MergeSubscribed x k) !(Event x (R.PatchDMap k (Event x)))
1058936
1059937-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
938+newtype EventM x (a :: *) = EventM { unEventM :: ReaderT (EventEnv x) 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
1061939
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
940+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1063941
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067− }
942+instance Defer (SomeHoldInit x) (ComputeM x) where
943+ getDeferralQueue = ComputeM ask
944+
945+{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
946+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
947+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
948+
949+data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x) !(Subscriber x a)
950+
951+mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x
952+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1068953
1069954data HeightBag = HeightBag
1070955 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +967,7 @@ heightBagFromList :: [Height] -> HeightBag
1082967heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083968
1084969heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
970+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087971
1088972heightBagRemove :: Height -> HeightBag -> HeightBag
1089973heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +976,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092976 0 -> IntMap.delete h c
1093977 _ -> IntMap.insert h (pred old) c
1094978
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−
1102979heightBagMax :: HeightBag -> Height
1103980heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104981 Just ((h, _), _) -> Height h
@@ -1116,25 +993,46 @@ heightBagVerify b@(HeightBag s c) = if
1116993heightBagVerify = id
1117994#endif
1118995
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)))
996+data MergeSubscribed x k
997+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
998+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
999+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
1000+ , mergeSubscribedHeight :: !(IORef Height)
1001+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
1002+ , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
1003+ , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap k (Event x)), EventSubscribed x))
1004+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
1005+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
1006+#ifdef DEBUG_NODEIDS
1007+ , mergeSubscribedNodeId :: Int
1008+#endif
1009+ }
1010+
1011+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
1012+data Merge x k
1013+ = Merge { mergeParents :: !(Dynamic x (R.PatchDMap k (Event x)))
1014+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1015+ }
1016+
1017+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1018+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1019+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1020+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231021 }
11241022
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
1023+data FanSubscribed (x :: *) k
1024+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1025+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1026+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291027 , fanSubscribedParent :: !(EventSubscription x)
11301028#ifdef DEBUG_NODEIDS
11311029 , fanSubscribedNodeId :: Int
11321030#endif
11331031 }
11341032
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1033+data Fan x k
1034+ = Fan { fanParent :: !(Event x (DMap k Identity))
1035+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381036 }
11391037
11401038data SwitchSubscribed x a
@@ -1158,9 +1056,7 @@ data Switch x a
11581056 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
11591057 }
11601058
1161−#ifdef USE_TEMPLATE_HASKELL
11621059{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163−#endif
11641060data CoincidenceSubscribed x a
11651061 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
11661062 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +1084,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881084newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891085newInvalidatorPull p = return $! InvalidatorPull p
11901086
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1087+instance R.FunctorMaybe (Event x) where
1088+ fmapMaybe f = push $ return . f
11931089
1194−instance HasSpiderTimeline x => Align (Event x) where
1090+instance Align (Event x) where
11951091 nil = eventNever
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)
1092+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
12121093
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1094+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (R.PatchTarget p), Event x p) (Hold x p)) }
12141095
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1216−newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1096+newMapDyn :: (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1097+newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171098
12181099--TODO: Avoid the duplication between this and R.zipDynWith
1219−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1100+zipDynWith :: (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201101zipDynWith f da db =
12211102 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221103 ec = flip push eab $ \o -> do
@@ -1229,70 +1110,75 @@ zipDynWith f da db =
12291110 return (a, b)
12301111 These (Identity a) (Identity b) -> return (a, b)
12311112 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1113+ in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331114
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1235−buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1237− let !d = Dyn result
1238− defer $ SomeDynInit d
1239− return d
1115+unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1116+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1117+ where x = (readV0, v')
12401118
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1119+newJoinDyn :: Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1120+newJoinDyn d =
1121+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1122+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1123+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1124+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1125+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1126+ in unsafeDyn readV0 v'
12441127
12451128-- ResultM can read behaviors and events
12461129type ResultM = EventM
12471130
1248−instance HasSpiderTimeline x => Functor (Event x) where
1131+{-# NOINLINE unsafeNewIORef #-}
1132+unsafeNewIORef :: a -> b -> IORef b
1133+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1134+
1135+instance Functor (Event x) where
12491136 fmap f = push $ return . Just . f
12501137
12511138instance Functor (Behavior x) where
12521139 fmap f = pull . fmap f . readBehaviorTracked
12531140
1254−{-# INLINE push #-}
1255−push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1141+{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1142+push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
12561143push f e = cacheEvent (pushCheap f e)
1144+{-
1145+push f e = eventPush $ Push
1146+ { pushCompute = f
1147+ , pushParent = e
1148+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1149+ }
1150+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1151+-}
12571152
1258−{-# INLINABLE pull #-}
1153+{-# NOINLINE pull #-}
12591154pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1155+pull a = behaviorPull $ Pull
1156+ { pullCompute = a
1157+ , pullValue = unsafeNewIORef a Nothing
12681158#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1159+ , pullNodeId = unsafeNodeId a
12701160#endif
1271− }
1161+ }
12721162
1273−{-# INLINABLE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
1163+{-# NOINLINE switch #-}
1164+switch :: Behavior x (Event x a) -> Event x a
1165+switch a = eventSwitch $ Switch
1166+ { switchParent = a
1167+ , switchSubscribed = unsafeNewIORef a Nothing
1168+ }
12811169
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
1170+coincidence :: Event x (Event x a) -> Event x a
1171+coincidence a = eventCoincidence $ Coincidence
1172+ { coincidenceParent = a
1173+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1174+ }
12891175
12901176-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1291−run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1177+run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921178run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1179+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1180+ spiderTimeline <- SpiderHost ask
1181+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ unSpiderHost $ runFrame $ do
12961182 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971183 occBefore <- liftIO $ do
12981184 occBefore <- readIORef occRef
@@ -1304,40 +1190,43 @@ run roots after = do
13041190 else return Nothing
13051191 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
13061192 propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
1193+ delayedRef <- EventM $ asks eventEnvDelayedMerges
13081194 let go = do
13091195 delayed <- liftIO $ readIORef delayedRef
13101196 case IntMap.minViewWithKey delayed of
13111197 Nothing -> return ()
13121198 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
1199+ tracePropagate $ "Running height " ++ show currentHeight
13141200 putCurrentHeight $ Height currentHeight
13151201 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
1202+ forM_ cur $ \d -> case d of
1203+ DelayedMerge subscribed -> do
1204+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1205+ case height `compare` Height currentHeight of
1206+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1207+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1208+ EQ -> do
1209+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1210+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1211+ --TODO: Assert that m is not empty
1212+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1213+ scheduleClear $ mergeSubscribedOccurrence subscribed
1214+ propagate m $ mergeSubscribedSubscribers subscribed
13171215 go
13181216 go
13191217 putCurrentHeight maxBound
13201218 after
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
1219+ tracePropagate "Done running an event frame"
13221220 return result
13231221
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1325−scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1326− height <- liftIO $ readIORef heightRef
1327− currentHeight <- getCurrentHeight
1328− case height `compare` currentHeight of
1329− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1330− GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1331− EQ -> a
1332−
1333−newtype Clear a = Clear (IORef (Maybe a))
1334−
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1222+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13361223
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1224+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381225
13391226data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401227
1228+data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1229+
13411230debugFinalize :: Bool
13421231debugFinalize = False
13431232
@@ -1346,110 +1235,55 @@ mkWeakPtrWithDebug x debugNote = do
13461235 x' <- evaluate x
13471236 mkWeakPtr x' $
13481237 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1238+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501239 else Nothing
13511240
13521241type WeakList a = [Weak a]
13531242
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
1360−
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1366− {
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378− }
1379−
1380−
13811243{-# 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
1244+#ifdef DEBUG
1245+withIncreasedDepth :: CanTrace x m => m a -> m a
1246+withIncreasedDepth a = do
1247+ spiderTimeline <- askSpiderTimeline
1248+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851249 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1250+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871251 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121252#else
1253+withIncreasedDepth :: m a -> m a
1254+withIncreasedDepth = id
1255+#endif
14131256
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1257+type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
14171258
14181259{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1260+tracePropagate :: (CanTrace x m) => String -> m ()
1261+tracePropagate = traceWhen debugPropagate
14211262
14221263{-# INLINE traceInvalidate #-}
14231264traceInvalidate :: 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
1265+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331266
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 ()
1267+{-# INLINE traceWhen #-}
1268+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1269+traceWhen b message = traceMWhen b $ return message
14471270
1271+{-# INLINE traceMWhen #-}
1272+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1273+traceMWhen b getMessage = when b $ do
1274+ message <- getMessage
1275+#ifdef DEBUG
1276+ spiderTimeline <- askSpiderTimeline
1277+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1278+#else
1279+ let d = 0
14481280#endif
1281+ liftIO $ putStrLn $ replicate d ' ' <> message
14491282
14501283whoCreatedIORef :: IORef a -> IO [String]
14511284whoCreatedIORef (IORef a) = whoCreated $! a
14521285
1286+#ifdef DEBUG_CYCLES
14531287groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541288groupByHead = \case
14551289 [] -> []
@@ -1460,54 +1294,20 @@ groupByHead = \case
14601294 | otherwise -> (x, xs :| []) : l
14611295
14621296listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1297+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951298#endif
14961299
1497−
14981300{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1301+propagateSubscriberHold :: R.Patch p => Hold x p -> p -> EventM x ()
15001302propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1303+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
15021304 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031305 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051306 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1307+ case {-# SCC "apply" #-} R.apply a v of
15071308 Nothing -> return ()
15081309 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1310+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111311 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121312 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131313 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,53 +1315,56 @@ propagateSubscriberHold h a = do
15151315data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161316
15171317runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1318+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191319
15201320askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211321askInvalidator = do
1522− (!m, _) <- ask
1322+ (!m, _) <- BehaviorM ask
15231323 case m of
15241324 Nothing -> return Nothing
15251325 Just (!wi, _) -> return $ Just wi
15261326
15271327askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281328askParentsRef = do
1529− (!m, _) <- ask
1329+ (!m, _) <- BehaviorM ask
15301330 case m of
15311331 Nothing -> return Nothing
15321332 Just (_, !p) -> return $ Just p
15331333
15341334askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351335askBehaviorHoldInits = do
1536− (_, !his) <- ask
1336+ (_, !his) <- BehaviorM ask
15371337 return his
15381338
15391339{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1340+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
15411341getDynHold d = do
15421342 mh <- liftIO $ readIORef $ unDyn d
15431343 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1344+ Right h -> return h
1345+ Left (readV0, v') -> do
15461346 holdInits <- getDeferralQueue
15471347 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
15541348 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1349+ liftIO $ writeIORef (unDyn d) $ Right h
15561350 return h
15571351
1558−
15591352-- Always refers to 0
15601353{-# NOINLINE zeroRef #-}
15611354zeroRef :: IORef Height
15621355zeroRef = unsafePerformIO $ newIORef zeroHeight
15631356
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)
1357+type CanSubscribe x m =
1358+ ( HasSpiderTimeline x m
1359+ , HasCurrentHeight x m
1360+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1361+ , Defer SomeClear m -- Wiping out event firings
1362+ , Defer (SomeAssignment x) m -- Updating state
1363+ , Defer (SomeResetCoincidence x) m
1364+ , m ~ EventM x
1365+ )
1366+
1367+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651368getRootSubscribed k r sub = do
15661369 mSubscribed <- readIORef $ rootSubscribed r
15671370 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1378,10 @@ getRootSubscribed k r sub = do
15751378 let !cached = rootSubscribed r
15761379 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771380 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1381+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811382 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821383 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
1586− let !subscribed = RootSubscribed
1384+ let subscribed = RootSubscribed
15871385 { rootSubscribedKey = k
15881386 , rootSubscribedCachedSubscribed = cached
15891387 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1389,17 @@ getRootSubscribed k r sub = do
15911389 , rootSubscribedUninit = uninit
15921390 , rootSubscribedWeakSelf = weakSelf
15931391#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1392+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951393#endif
15961394 }
1597− -- If we die at the same moment that all our children die, they will
1598− -- try to clean us up but will fail because their Weak reference to us
1599− -- will also be dead. So, if we are dying, check if there are any
1600− -- children; since children don't bother cleaning themselves up if
1601− -- their parents are already dead, I don't think there's a race
1602− -- condition here. However, if there are any children, then we can
1603− -- infer that we need to clean ourselves up, so we do.
1604− finalCleanup = do
1605− cs <- readIORef $ _weakBag_children subs
1606− when (not $ IntMap.null cs) (cleanupRootSubscribed subscribed)
1607− writeIORef weakSelf =<< evaluate =<< mkWeakPtr subscribed (Just finalCleanup)
1395+ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
16081396 modifyIORef' (rootSubscribed r) $ DMap.insertWith (error $ "getRootSubscribed: duplicate key inserted into Root") k subscribed --TODO: I think we can just write back mSubscribed rather than re-reading it
16091397 occ <- getOcc
16101398 return (sln, subscribed, occ)
16111399
1612−#ifdef USE_TEMPLATE_HASKELL
16131400{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614−#endif
16151401cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1402+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
16171403 rootSubscribedUninit self
16181404 modifyIORef' cached $ DMap.delete k
16191405
@@ -1621,90 +1407,78 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211407subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221408subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231409
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))
1410+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1411+getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity))
1412+getMergeSubscribed m sub = do
1413+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1414+ case mSubscribed of
1415+ Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1416+ sln <- subscribeMergeSubscribed subscribed sub
1417+ occ <- readIORef $ mergeSubscribedOccurrence subscribed
1418+ return (sln, subscribed, occ)
1419+ Nothing -> {-# SCC "missMerge" #-} do
1420+ subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1421+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1422+ initialParents <- readBehaviorUntracked $ dynamicCurrent $ mergeParents m
1423+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1424+ s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1425+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1426+ height <- liftIO $ getEventSubscribedHeight parentSubd
1427+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1428+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1429+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1430+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1431+ myHeight = if invalidHeight `elem` heights
1432+ then invalidHeight
1433+ else succHeight $ heightBagMax myHeightBag
1434+ currentHeight <- getCurrentHeight
1435+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1436+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1437+ else (Nothing, dm)
1438+ unless (DMap.null accum) $ do
1439+ scheduleMerge myHeight subscribedUnsafe
1440+ occRef <- liftIO $ newIORef occ
1441+ when (isJust occ) $ scheduleClear occRef
1442+ accumRef <- liftIO $ newIORef accum
1443+ heightRef <- liftIO $ newIORef myHeight
1444+ heightMapRef <- liftIO $ newIORef myHeightBag
1445+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1446+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1447+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1448+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1449+ let !subscribed = MergeSubscribed
1450+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1451+ , mergeSubscribedOccurrence = occRef
1452+ , mergeSubscribedAccum = accumRef
1453+ , mergeSubscribedHeight = heightRef
1454+ , mergeSubscribedHeightBag = heightMapRef
1455+ , mergeSubscribedSubscribers = subs
1456+ , mergeSubscribedChange = changeSubdRef
1457+ , mergeSubscribedParents = parentsRef
1458+ , mergeSubscribedWeakSelf = weakSelf
16301459#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1460+ , mergeSubscribedNodeId = unsafeNodeId m
16321461#endif
1633− }
1462+ }
1463+ defer $ SomeMergeInit subscribed $ dynamicUpdated $ mergeParents m
1464+ liftIO $ writeIORef subscribedRef $! subscribed
1465+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1466+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1467+ return (sln, subscribed, occ)
16341468
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− }
1469+cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1470+cleanupMergeSubscribed subscribed = do
1471+ parents <- readIORef $ mergeSubscribedParents subscribed
1472+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1473+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1474+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
17041475
1476+{-# INLINE subscribeMergeSubscribed #-}
1477+subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO WeakBagTicket
1478+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
17051479
1706−{-# INLINABLE getFanSubscribed #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1480+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1481+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, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
17081482getFanSubscribed k f sub = do
17091483 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101484 case mSubscribed of
@@ -1722,16 +1496,13 @@ getFanSubscribed k f sub = do
17221496 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231497 occRef <- liftIO $ newIORef parentOcc
17241498 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281499 let subscribed = FanSubscribed
17291500 { fanSubscribedCachedSubscribed = fanSubscribed f
17301501 , fanSubscribedOccurrence = occRef
17311502 , fanSubscribedParent = subscription
17321503 , fanSubscribedSubscribers = subscribersRef
17331504#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1505+ , fanSubscribedNodeId = unsafeNodeId f
17351506#endif
17361507 }
17371508 let !self = (k, subscribed)
@@ -1741,7 +1512,7 @@ getFanSubscribed k f sub = do
17411512 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421513 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431514
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1515+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451516cleanupFanSubscribed (k, subscribed) = do
17461517 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471518 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1524,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531524 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541525
17551526{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1527+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571528subscribeFanSubscribed k subscribed sub = do
17581529 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591530 case DMap.lookup k subscribers of
@@ -1765,8 +1536,8 @@ subscribeFanSubscribed k subscribed sub = do
17651536 return sln
17661537 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671538
1768−{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1539+{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a) #-}
1540+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, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
17701541getSwitchSubscribed s sub = do
17711542 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721543 case mSubscribed of
@@ -1791,9 +1562,6 @@ getSwitchSubscribed s sub = do
17911562 when (isJust parentOcc) $ scheduleClear occRef
17921563 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931564 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971565 let !subscribed = SwitchSubscribed
17981566 { switchSubscribedCachedSubscribed = switchSubscribed s
17991567 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1574,7 @@ getSwitchSubscribed s sub = do
18061574 , switchSubscribedCurrentParent = subscriptionRef
18071575 , switchSubscribedWeakSelf = weakSelf
18081576#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1577+ , switchSubscribedNodeId = unsafeNodeId s
18101578#endif
18111579 }
18121580 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1592,8 @@ cleanupSwitchSubscribed subscribed = do
18241592subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18251593subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261594
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1595+{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a) #-}
1596+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, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
18291597getCoincidenceSubscribed c sub = do
18301598 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311599 case mSubscribed of
@@ -1851,9 +1619,6 @@ getCoincidenceSubscribed c sub = do
18511619 scheduleClear innerSubdRef
18521620 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531621 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571622 let subscribed = CoincidenceSubscribed
18581623 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591624 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1629,7 @@ getCoincidenceSubscribed c sub = do
18641629 , coincidenceSubscribedInnerParent = innerSubdRef
18651630 , coincidenceSubscribedWeakSelf = weakSelf
18661631#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1632+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681633#endif
18691634 }
18701635 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,511 +1646,120 @@ cleanupCoincidenceSubscribed subscribed = do
18811646subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821647subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831648
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)
1889−
1890−{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1895−
1896−{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1903− where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905− updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1906− let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1907− (mOldSubd, newPs) <- case me of
1908− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1909− Just e -> do
1910− let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1912− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1913− let newParent = MergeSubscribedParent subscription
1914− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916− forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1920− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921− return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922− foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1925− getInitialSubscribers initialParents subscriber = do
1926− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1927− let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1929− height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1934− )
1935−
1936− destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1937− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1938−
1939−{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1945− where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947− updateMe subscriber heightBagRef oldParents p = do
1948− -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1950− subscribeParent k e = do
1951− keyRef <- liftIO $ newIORef k
1952− let s = subscriber $ liftIO $ readIORef keyRef
1953− subscription@(EventSubscription _ subd) <- subscribe e s
1954− liftIO $ do
1955− newParentHeight <- getEventSubscribedHeight subd
1956− modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957− return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1959− -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961− moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962− Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1966− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967− return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968− Just toKey -> do
1969− liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970− return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1974− return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976− getInitialSubscribers initialParents subscriber = do
1977− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1978− keyRef <- liftIO $ newIORef k
1979− let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1981− height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1986− )
1987−
1988− destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1989− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1990−
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1993− -> IORef HeightBag
1994− -> DMap k s
1995− -> p
1996− -> EventM x ([EventSubscription x], DMap k s)
1997−
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)
2004−
2005−type MergeDestroyFunc k s
2006− = DMap k s
2007− -> IO ()
2008−
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))
1649+{-# INLINE merge #-}
1650+merge :: GCompare k => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1651+merge m = eventMerge $ Merge
1652+ { mergeParents = m
1653+ , mergeSubscribed = unsafeNewIORef m Nothing
20151654 }
20161655
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
2110− initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111− accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112− heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113− heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114− parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120−#ifdef DEBUG_CYCLES
2121− , eventSubscribedGetParents = do
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123− fmap getParent' . DMap.toList <$> readIORef parentsRef
2124− , eventSubscribedHasOwnHeightRef = False
2125− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126−#endif
2127− }
2128−
2129− m = Merge
2130− { _merge_parentsRef = parentsRef
2131− , _merge_heightBagRef = heightBagRef
2132− , _merge_heightRef = heightRef
2133− , _merge_sub = sub
2134− , _merge_accumRef = accumRef
2135− }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
2137− let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138− myHeight = if invalidHeight `elem` heights
2139− then invalidHeight
2140− else succHeight $ heightBagMax myHeightBag
2141− currentHeight <- getCurrentHeight
2142− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2143− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144− else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
2146− liftIO $ writeIORef accumRef $! accum
2147− liftIO $ writeIORef heightRef $! myHeight
2148− liftIO $ writeIORef heightBagRef $! myHeightBag
2149− liftIO $ writeIORef parentsRef $! initialParentState
2150− defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
2152− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
2155− , subscriberInvalidateHeight = \_ -> return ()
2156− , subscriberRecalculateHeight = \_ -> return ()
2157− }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2160− -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2161− -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162− -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2164− let unsubscribeAll = destroy =<< readIORef parentsRef
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)
2280−
22811656newtype 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) }
22831657
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1658+fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
1659+fan e =
22871660 let f = Fan
22881661 { fanParent = e
2289− , fanSubscribed = ref
1662+ , fanSubscribed = unsafeNewIORef e Nothing
22901663 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1664+ in EventSelector $ \k -> eventFan k f
22921665
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1666+runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1667+runHoldInits holdInitRef mergeInitRef = do
22951668 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
22971669 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1670+ unless (null holdInits && null mergeInits) $ do
22991671 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
23011672 liftIO $ writeIORef mergeInitRef []
23021673 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
2304− mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1674+ mapM_ initMerge mergeInits
1675+ runHoldInits holdInitRef mergeInitRef
23061676
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1677+initHold :: SomeHoldInit x -> EventM x ()
23081678initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
23091679
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1680+initMerge :: SomeMergeInit x -> EventM x ()
1681+initMerge (SomeMergeInit subscribed changed) = do
1682+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1683+ (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1684+ forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1685+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
23121686
2313−newEventEnv :: IO (EventEnv x)
2314−newEventEnv = do
1687+-- | Run an event action outside of a frame
1688+runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1689+runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
1690+ -- Clear out pending unsubscriptions; these will need to happen eventually anyway, and might cause us a lot of extra work during the frame, so get rid of them now
1691+ pendingCleanups <- atomicModifyIORef (_spiderTimeline_cleanups spiderTimeline) $ \x -> ([], x)
1692+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
23151693 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
23161694 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
23181695 mergeUpdateRef <- newIORef []
23191696 mergeInitRef <- newIORef []
23201697 heightRef <- newIORef zeroHeight
23211698 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231699 toClearRootRef <- newIORef []
23241700 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2327−
2328−clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2330− writeIORef toAssignRef []
2331− writeIORef holdInitRef []
2332− writeIORef dynInitRef []
2333− writeIORef mergeUpdateRef []
2334− writeIORef mergeInitRef []
2335− writeIORef heightRef zeroHeight
2336− writeIORef toClearRef []
2337− writeIORef toClearIntRef []
2338− writeIORef toClearRootRef []
2339− writeIORef coincidenceInfosRef []
2340− writeIORef delayedRef IntMap.empty
2341−
2342−-- | Run an event action outside of a frame
2343−runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344−runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1701+ delayedRef <- liftIO $ newIORef IntMap.empty
1702+ let env = EventEnv spiderTimeline toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23461703 let go = do
23471704 result <- a
2348− 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
1705+ runHoldInits holdInitRef mergeInitRef -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
23491706 return result
2350− result <- runEventM go
2351− toClear <- readIORef $ eventEnvClears env
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
2355− toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1707+ result <- runEventM go env
1708+ toClear <- readIORef toClearRef
1709+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1710+ toClearRoot <- readIORef toClearRootRef
1711+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1712+ toAssign <- readIORef toAssignRef
23581713 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1714+ coincidenceInfos <- readIORef coincidenceInfosRef
23601715 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611716 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1717+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631718 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365− writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1719+ mergeUpdates <- readIORef mergeUpdateRef
1720+ writeIORef mergeUpdateRef []
1721+ let updateMerge :: SomeMergeUpdate x -> IO [EventSubscription x]
1722+ updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap k (Event x)) m) = do
1723+ oldParents <- readIORef $ mergeSubscribedParents m
1724+ let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1725+ (mOldSubd, newPs) <- case me of
1726+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1727+ Just e -> do
1728+ s <- liftIO $ newSubscriberMerge k m
1729+ subscription@(EventSubscription _ subd) <- subscribe e s
1730+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1731+ let newParent = MergeSubscribedParent subscription s
1732+ liftIO $ addMergeHeight newParentHeight m
1733+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1734+ forM_ mOldSubd $ \oldSubd -> do
1735+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1736+ liftIO $ removeMergeHeight oldHeight m
1737+ return (maybeToList (mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1738+ (subscriptionsToKill, newParents) <- flip runEventM env $ foldM f ([], oldParents) $ DMap.toList p --TODO: I think this runEventM is OK, since no events are firing at this time, but it might not be
1739+ writeIORef (mergeSubscribedParents m) $! newParents
1740+ return subscriptionsToKill
1741+ when debugPropagate $ putStrLn "Updating merges"
1742+ mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1743+ when debugPropagate $ putStrLn "Updating merges done"
23691744 toReconnect <- readIORef toReconnectRef
2370− clearEventEnv env
23711745 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721746 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731747 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1748+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751749 finalize wi
23761750 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771751 wi' <- mkWeakPtrWithDebug i "wi'"
23781752 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
23791753 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
2382− 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
1754+ writeIORef holdInitRef [] --TODO: Should we reuse this?
1755+ e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1756+ runEventM (runHoldInits holdInitRef mergeInitRef) 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
23831757 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841758 sub <- newSubscriberSwitch subscribed
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
1759+ 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
23861760 {-
23871761 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1762+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891763 EventRoot _ -> "EventRoot"
23901764 EventNever -> "EventNever"
23911765 _ -> "something else"
@@ -2400,13 +1774,14 @@ runFrame a = SpiderHost $ do
24001774 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011775 when (parentHeight /= myHeight) $ do
24021776 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2404− 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
1777+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1778+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1779+ invalidateMergeHeight m --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
24051780 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061781 unsubscribe subscription
24071782 mapM_ invalidateCoincidenceHeight mcs
24081783 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
2409− mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
1784+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
24101785 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
24111786 height <- calculateSwitchHeight subscribed
24121787 updateSwitchHeight height subscribed
@@ -2436,12 +1811,50 @@ succHeight h@(Height a) =
24361811 then invalidHeight
24371812 else Height $ succ a
24381813
1814+removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1815+removeMergeHeight oldParentHeight subscribed = do
1816+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1817+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1818+ let newHeights = heightBagRemove oldParentHeight oldHeights
1819+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1820+
1821+invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1822+invalidateMergeHeight subscribed = do
1823+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1824+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1825+ when (oldHeight /= invalidHeight) $ do
1826+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1827+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1828+
1829+addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1830+addMergeHeight newParentHeight subscribed = do
1831+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1832+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1833+ let newHeights = heightBagAdd newParentHeight oldHeights
1834+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1835+
1836+revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1837+revalidateMergeHeight subscribed = do
1838+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1839+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1840+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1841+ parents <- readIORef $ mergeSubscribedParents subscribed
1842+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1843+ case heightBagSize heights `compare` DMap.size parents of
1844+ LT -> return ()
1845+ EQ -> do
1846+ let height = succHeight $ heightBagMax heights
1847+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1848+ writeIORef (mergeSubscribedHeight subscribed) $! height
1849+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1850+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1851+
24391852invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24401853invalidateCoincidenceHeight subscribed = do
24411854 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421855 when (oldHeight /= invalidHeight) $ do
24431856 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1857+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451858
24461859updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471860updateSwitchHeight new subscribed = do
@@ -2449,7 +1862,7 @@ updateSwitchHeight new subscribed = do
24491862 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501863 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511864 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1865+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531866
24541867recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551868recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1871,7 @@ recalculateCoincidenceHeight subscribed = do
24581871 height <- calculateCoincidenceHeight subscribed
24591872 when (height /= invalidHeight) $ do
24601873 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1874+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621875
24631876calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641877calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,170 +1910,183 @@ invalidate toReconnectRef wis = do
24971910-- Reflex integration
24981911--------------------------------------------------------------------------------
24991912
1913+-- | The default, global Spider environment
1914+type Spider = SpiderTimeline Global
1915+
25001916-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
1917+data Global
1918+
1919+{-# NOINLINE globalSpiderTimeline #-}
1920+globalSpiderTimeline :: SpiderTimeline Global
1921+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
1922+
1923+-- | Stores all global data relevant to a particular Spider timeline; only one
1924+-- value should exist for each type @x@
1925+data SpiderTimeline x = SpiderTimeline
1926+ { _spiderTimeline_toUnsubscribe :: !(IORef [EventSubscription x])
1927+ , _spiderTimeline_lock :: !(MVar ())
1928+ , _spiderTimeline_cleanups :: !(IORef [IO ()])
1929+#ifdef DEBUG
1930+ , _spiderTimeline_depth :: !(IORef Int)
1931+#endif
1932+ }
25021933type role SpiderTimeline nominal
25031934
2504−-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
1935+instance GEq SpiderTimeline where
1936+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1937+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
1938+ else Nothing
25061939
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
1940+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
1941+unsafeNewSpiderTimeline = do
1942+ toUnsubscribe <- newIORef []
1943+ lock <- newMVar ()
1944+ cleanups <- newIORef []
1945+#ifdef DEBUG
1946+ depthRef <- newIORef 0
1947+#endif
1948+ return $ SpiderTimeline
1949+ { _spiderTimeline_toUnsubscribe = toUnsubscribe
1950+ , _spiderTimeline_lock = lock
1951+ , _spiderTimeline_cleanups = cleanups
1952+#ifdef DEBUG
1953+ , _spiderTimeline_depth = depthRef
1954+#endif
1955+ }
25101956
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
1957+-- | Create a new SpiderTimeline
1958+newSpiderTimeline :: IO (Some SpiderTimeline)
1959+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
25291960
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1961+-- | Pass a new timeline to the given function.
1962+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
1963+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
25331964
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
1965+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1966+
1967+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
25481968
1969+instance Functor (R.Dynamic (SpiderTimeline x)) where
1970+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
1971+
1972+instance Applicative (R.Dynamic (SpiderTimeline x)) where
1973+ pure = SpiderDynamic . dynamicConst
1974+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
1975+ _ *> b = b
1976+ a <* _ = a
25491977
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
1978+instance Monad (R.Dynamic (SpiderTimeline x)) where
25511979 {-# INLINE return #-}
25521980 return = pure
25531981 {-# INLINE (>>=) #-}
25541982 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25551983 {-# INLINE (>>) #-}
2556− (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
1984+ _ >> y = y
25581985 {-# INLINE fail #-}
25591986 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
25751987
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 #-}
1988+instance R.Reflex (SpiderTimeline x) where
1989+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
1990+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
1991+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
1992+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
1993+ type PullM (SpiderTimeline x) = SpiderPullM x
1994+ type PushM (SpiderTimeline x) = SpiderPushM x
1995+ {-# INLINABLE never #-}
1996+ never = SpiderEvent eventNever
1997+ {-# INLINABLE constant #-}
1998+ constant = SpiderBehavior . behaviorConst
1999+ {-# INLINABLE push #-}
2000+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2001+ {-# INLINABLE pull #-}
2002+ pull = SpiderBehavior . pull . coerce
2003+ {-# INLINABLE merge #-}
2004+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2005+ {-# INLINABLE fan #-}
2006+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2007+ {-# INLINABLE switch #-}
2008+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2009+ {-# INLINABLE coincidence #-}
2010+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2011+ {-# INLINABLE current #-}
2012+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2013+ {-# INLINABLE updated #-}
2014+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2015+ {-# INLINABLE unsafeBuildDynamic #-}
2016+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2017+ {-# INLINABLE unsafeBuildIncremental #-}
2018+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2019+ {-# INLINABLE mergeIncremental #-}
2020+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
2021+ {-# INLINABLE currentIncremental #-}
2022+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2023+ {-# INLINABLE updatedIncremental #-}
2024+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2025+ {-# INLINABLE incrementalToDynamic #-}
2026+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2027+ c <- readBehaviorUntracked $ dynamicCurrent i
2028+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2029+ eventCoercion Coercion = Coercion
2030+ behaviorCoercion Coercion = Coercion
2031+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
25792032
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)
2584−#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
2033+instance R.MonadSample (SpiderTimeline x) (EventM x) where
2034+ {-# INLINABLE sample #-}
2035+ sample (SpiderBehavior b) = readBehaviorUntracked b
25882036
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
2037+instance R.MonadHold (SpiderTimeline x) (EventM x) where
2038+ {-# INLINABLE hold #-}
2039+ hold = holdSpiderEventM
2040+ {-# INLINABLE holdDyn #-}
2041+ holdDyn = holdDynSpiderEventM
2042+ {-# INLINABLE holdIncremental #-}
2043+ holdIncremental = holdIncrementalSpiderEventM
25912044
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
2045+holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2046+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
25942047
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
2048+holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2049+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
25972050
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
2051+holdIncrementalSpiderEventM :: R.Patch p => R.PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
2052+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
26002053
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2054+instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
26022055 {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2056+ hold v0 e = R.runHostFrame $ R.hold v0 e
26042057 {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2058+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
26062059 {-# 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
2060+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
26182061
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
2062+instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352063 {-# INLINABLE sample #-}
26362064 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
26372065
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2066+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2067+ {-# INLINABLE sample #-}
2068+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2069+
2070+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
26392071 {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2072+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
26412073
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2074+instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
26432075 {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2076+ hold v0 e = R.current <$> R.holdDyn v0 e
26452077 {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2078+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
26472079 {-# 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
2080+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
26552081
2656−--------------------------------------------------------------------------------
2657−-- Deprecated items
2658−--------------------------------------------------------------------------------
2082+data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
26592083
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
2084+data SpiderEventHandle x a = SpiderEventHandle
2085+ { spiderEventHandleSubscription :: EventSubscription x
2086+ , spiderEventHandleValue :: IORef (Maybe a)
2087+ }
2088+
2089+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
26642090 {-# INLINABLE subscribeEvent #-}
26652091 subscribeEvent e = SpiderHostFrame $ do
26662092 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2677,149 +2103,18 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTim
26772103 , spiderEventHandleValue = val
26782104 }
26792105
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2106+instance R.ReflexHost (SpiderTimeline x) where
26812107 type EventTrigger (SpiderTimeline x) = RootTrigger x
26822108 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
26832109 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
26842110
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2111+instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
26862112 {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2113+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
26882114 result <- readIORef $ spiderEventHandleValue h
26892115 touch h
26902116 return result
26912117
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
2712−
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
2715− lock <- newMVar ()
2716− env <- newEventEnv
2717−#ifdef DEBUG
2718− depthRef <- newIORef 0
2719−#endif
2720− return $ STE $ SpiderTimelineEnv
2721− { _spiderTimeline_lock = lock
2722− , _spiderTimeline_eventEnv = env
2723−#ifdef DEBUG
2724− , _spiderTimeline_depth = depthRef
2725−#endif
2726− }
2727−
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2731−
2732−data LocalSpiderTimeline (x :: Type) s
2733−
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2737−
2738−localSpiderTimeline
2739− :: proxy s
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2743−
2744−-- | Pass a new timeline to the given function.
2745−withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746−withSpiderTimeline k = do
2747− env <- unsafeNewSpiderTimelineEnv
2748− reify env $ \s -> k $ localSpiderTimeline s env
2749−
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
2753−
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2755−
2756−instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757− {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2762− type PullM (SpiderTimeline x) = SpiderPullM x
2763− type PushM (SpiderTimeline x) = SpiderPushM x
2764− {-# INLINABLE never #-}
2765− never = SpiderEvent eventNever
2766− {-# INLINABLE constant #-}
2767− constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
2769− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772− {-# INLINABLE pull #-}
2773− pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2777− mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780− -> DMap k q
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783− {-# INLINABLE switch #-}
2784− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785− {-# INLINABLE coincidence #-}
2786− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2787− {-# INLINABLE current #-}
2788− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789− {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2791− {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793− {-# INLINABLE unsafeBuildIncremental #-}
2794− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799− {-# INLINABLE currentIncremental #-}
2800− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801− {-# INLINABLE updatedIncremental #-}
2802− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803− {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805− c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807− eventCoercion Coercion = Coercion
2808− behaviorCoercion Coercion = Coercion
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))
2815−
2816−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2817−
2818−data SpiderEventHandle x a = SpiderEventHandle
2819− { spiderEventHandleSubscription :: EventSubscription x
2820− , spiderEventHandleValue :: IORef (Maybe a)
2821− }
2822−
28232118instance MonadRef (EventM x) where
28242119 type Ref (EventM x) = Ref IO
28252120 {-# INLINABLE newRef #-}
@@ -2834,7 +2129,7 @@ instance MonadAtomicRef (EventM x) where
28342129 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352130
28362131-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2132+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382133
28392134instance Monad (SpiderHost x) where
28402135 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2138,20 @@ instance Monad (SpiderHost x) where
28432138 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442139 {-# INLINABLE return #-}
28452140 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472141 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2142+ fail s = SpiderHost $ fail s
28542143
28552144-- | Run an action affecting the global Spider timeline; this will be guarded by
28562145-- a mutex for that timeline
28572146runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2147+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
28592148
28602149-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612150-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2151+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2152+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
28642153
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2154+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672155
28682156instance Monad (SpiderHostFrame x) where
28692157 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2160,26 @@ instance Monad (SpiderHostFrame x) where
28722160 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732161 {-# INLINABLE return #-}
28742162 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762163 {-# INLINABLE fail #-}
28772164 fail s = SpiderHostFrame $ fail s
2878−#endif
28792165
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
2166+instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2167+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2168+
2169+instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2170+ {-# INLINABLE hold #-}
2171+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2172+ {-# INLINABLE holdDyn #-}
2173+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2174+ {-# INLINABLE holdIncremental #-}
2175+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
28832176
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2177+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852178newEventWithTriggerIO f = do
28862179 es <- newFanEventWithTriggerIO $ \Refl -> f
28872180 return $ select es Refl
28882181
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2182+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902183newFanEventWithTriggerIO f = do
28912184 occRef <- newIORef DMap.empty
28922185 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2190,41 @@ newFanEventWithTriggerIO f = do
28972190 }
28982191 return $ EventSelector $ \k -> eventRoot k r
28992192
2193+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2194+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2195+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2196+ es <- newFanEventWithTriggerIO f
2197+ return $ R.EventSelector $ SpiderEvent . select es
2198+
2199+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2200+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2201+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2202+ es <- newFanEventWithTriggerIO f
2203+ return $ R.EventSelector $ SpiderEvent . select es
2204+
2205+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2206+ {-# INLINABLE subscribeEvent #-}
2207+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2208+
29002209newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
29012210
2211+instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2212+ {-# INLINABLE sample #-}
2213+ sample = ReadPhase . R.sample
2214+
2215+instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2216+ {-# INLINABLE hold #-}
2217+ hold v0 e = ReadPhase $ R.hold v0 e
2218+ {-# INLINABLE holdDyn #-}
2219+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2220+ {-# INLINABLE holdIncremental #-}
2221+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2222+
2223+instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2224+ type ReadPhase (SpiderHost x) = ReadPhase x
2225+ fireEventsAndRead es (ReadPhase a) = run es a
2226+ runHostFrame = runFrame . runSpiderHostFrame
2227+
29022228instance MonadRef (SpiderHost x) where
29032229 type Ref (SpiderHost x) = Ref IO
29042230 newRef = SpiderHost . newRef
@@ -2921,10 +2247,9 @@ instance PrimMonad (SpiderHostFrame x) where
29212247 type PrimState (SpiderHostFrame x) = PrimState IO
29222248 primitive = SpiderHostFrame . EventM . primitive
29232249
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2250+--------------------------------------------------------------------------------
2251+-- Deprecated items
2252+--------------------------------------------------------------------------------
29272253
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()
2254+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2255+type SpiderEnv = SpiderTimeline