@@ -2,132 +2,80 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE EmptyDataDecls #-}
5−{-# LANGUAGE ExistentialQuantification #-}
65{-# LANGUAGE FlexibleContexts #-}
76{-# LANGUAGE FlexibleInstances #-}
87{-# LANGUAGE FunctionalDependencies #-}
98{-# LANGUAGE GADTs #-}
109{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1110{-# LANGUAGE LambdaCase #-}
11+{-# LANGUAGE MagicHash #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
1214{-# LANGUAGE RankNTypes #-}
1315{-# LANGUAGE RoleAnnotations #-}
1416{-# LANGUAGE ScopedTypeVariables #-}
1517{-# LANGUAGE TypeFamilies #-}
1618{-# LANGUAGE TypeOperators #-}
1719{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
24−#ifdef USE_REFLEX_OPTIMIZER
2520{-# 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, (<>))
46+import Data.List hiding (foldl')
47+import Data.Maybe
48+import Data.Monoid ((<>))
6549import Data.Proxy
50+import Data.Some (Some)
51+import qualified Data.Some as Some
6652import Data.These
6753import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
54+import Data.Type.Coercion
55+import Data.Word
56+import GHC.Exts
7157import GHC.IORef (IORef (..))
7258import GHC.Stack
73−import Reflex.FastWeak
7459import System.IO.Unsafe
7560import System.Mem.Weak
7661import Unsafe.Coerce
7762
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−
8763#ifdef DEBUG_CYCLES
8864import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9165import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9266import qualified Data.List.NonEmpty as NonEmpty
67+import Data.Monoid (mempty)
9368import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
95−
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
69+#endif
9870
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)
71+import Data.WeakBag (WeakBag, WeakBagTicket)
10472import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
10673import 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
74+import Reflex.Patch
75+import qualified Reflex.Host.Class as R
11876
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
77+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
78+import Prelude hiding (any, concat, mapM, mapM_, sequence)
13179
13280debugPropagate :: Bool
13381
@@ -136,42 +84,28 @@ debugInvalidateHeight :: Bool
13684debugInvalidate :: Bool
13785
13886#ifdef DEBUG
87+
13988#define DEBUG_NODEIDS
14089
141−#ifdef DEBUG_TRACE_PROPAGATION
14290debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
14691
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
15092debugInvalidateHeight = False
151−#endif
15293
153−#ifdef DEBUG_TRACE_INVALIDATION
15494debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
15895
15996class HasNodeId a where
16097 getNodeId :: a -> Int
16198
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
99+instance HasNodeId (Hold x p a) where
169100 getNodeId = holdNodeId
170101
102+instance HasNodeId (PushSubscribed x a b) where
103+ getNodeId = pushSubscribedNodeId
104+
171105instance HasNodeId (SwitchSubscribed x a) where
172106 getNodeId = switchSubscribedNodeId
173107
174−instance HasNodeId (FanSubscribed x v a) where
108+instance HasNodeId (FanSubscribed x a) where
175109 getNodeId = fanSubscribedNodeId
176110
177111instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +119,41 @@ instance HasNodeId (Pull x a) where
185119
186120{-# INLINE showNodeId #-}
187121showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
122+showNodeId = ("#"<>) . show . getNodeId
123+
124+showSubscriberType :: Subscriber x a -> String
125+showSubscriberType = \case
126+ SubscriberPush _ _ -> "SubscriberPush"
127+ SubscriberMerge _ _ -> "SubscriberMerge"
128+ SubscriberFan _ -> "SubscriberFan"
129+ SubscriberMergeChange _ -> "SubscriberMergeChange"
130+ SubscriberHold _ -> "SubscriberHold"
131+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
132+ SubscriberSwitch _ -> "SubscriberSwitch"
133+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
134+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
135+ SubscriberHandle -> "SubscriberHandle"
136+
137+showEventType :: Event x a -> String
138+showEventType = \case
139+ EventRoot _ _ -> "EventRoot"
140+ EventNever -> "EventNever"
141+ EventPush _ -> "EventPush"
142+ EventMerge _ -> "EventMerge"
143+ EventFan _ _ -> "EventFan"
144+ EventSwitch _ -> "EventSwitch"
145+ EventCoincidence _ -> "EventCoincidence"
146+ EventHold _ -> "EventHold"
147+ EventDyn _ -> "EventDyn"
148+ EventHoldIdentity _ -> "EventHoldIdentity"
149+ EventDynIdentity _ -> "EventDynIdentity"
193150
194151#else
195152
196153debugPropagate = False
154+
197155debugInvalidateHeight = False
156+
198157debugInvalidate = False
199158
200159-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +161,6 @@ debugInvalidate = False
202161showNodeId :: a -> String
203162showNodeId _ = ""
204163
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209164#endif
210165
211166#ifdef DEBUG_NODEIDS
@@ -215,21 +170,13 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215170
216171newNodeId :: IO Int
217172newNodeId = 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− }
230173
231−unsubscribe :: EventSubscription x -> IO ()
232−unsubscribe (EventSubscription u _) = u
174+{-# NOINLINE unsafeNodeId #-}
175+unsafeNodeId :: a -> Int
176+unsafeNodeId a = unsafePerformIO $ do
177+ touch a
178+ newNodeId
179+#endif
233180
234181--------------------------------------------------------------------------------
235182-- Event
@@ -241,174 +188,86 @@ newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscrip
241188subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
242189subscribeAndRead = unEvent
243190
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
191+{-# RULES "pushCheap/cacheEvent" forall f e. pushCheap f (cacheEvent e) = pushCheap f e #-}
192+{-# RULES "hold/cacheEvent" forall f e. hold f (cacheEvent e) = hold f e #-}
193+{- RULES
194+ "subscribeAndRead/cacheEvent" forall e. subscribeAndRead (cacheEvent e) = subscribeAndRead e
248195 #-}
249196
250197-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251198-- caching; if the computation function is very cheap, this is (much) more
252199-- efficient than 'push'
200+{- INLINABLE pushCheap #-}
253201{-# INLINE [1] pushCheap #-}
254202pushCheap :: 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
203+pushCheap f e = Event $ \sub -> do
204+ (subscription, occ) <- subscribeAndRead e $ sub
257205 { subscriberPropagate = \a -> do
258− mb <- f a
206+ mb <- runComputeM $ f a
259207 mapM_ (subscriberPropagate sub) mb
260208 }
261− occ' <- join <$> mapM f occ
209+ occ' <- join <$> mapM (runComputeM . f) occ
262210 return (subscription, occ')
263211
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−
301212data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
213+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
214+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303215 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
216+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304217 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308218 }
309219
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−
325220-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326221-- repeatedly
327222--
328223--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
224+--there's only one subscriber, and then build our own WeakBag only when a second
330225--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− }
226+{-# NOINLINE [1] cacheEvent #-}
227+cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
228+cacheEvent e = Event $ \sub -> {-# SCC "cacheEvent" #-} do
229+ let !mSubscribedRef = unsafeNewIORef e Nothing
230+ mSubscribed <- liftIO $ readIORef mSubscribedRef
231+ case mSubscribed of
232+ Just subscribed -> liftIO $ do
233+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
234+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
235+ let es = EventSubscribed
236+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
237+ , eventSubscribedRetained = toAny subscribed
238+ }
239+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
240+ Nothing -> do
241+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
242+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
243+ occRef <- liftIO $ newIORef undefined
244+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
245+ { subscriberPropagate = \a -> do
246+ liftIO $ writeIORef occRef $ Just a
247+ scheduleClear occRef
248+ propagate a subscribers
249+ , subscriberInvalidateHeight = \old -> do
250+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
251+ , subscriberRecalculateHeight = \new -> do
252+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
409253 }
410− return (es, occ)
254+ liftIO $ writeIORef occRef occ
255+ when (isJust occ) $ scheduleClear occRef
256+ let !subscribed = CacheSubscribed
257+ { _cacheSubscribed_subscribers = subscribers
258+ , _cacheSubscribed_weakSelf = weakSelf
259+ , _cacheSubscribed_parent = parentSub
260+ , _cacheSubscribed_cached = mSubscribedRef
261+ , _cacheSubscribed_occurrence = occRef
262+ }
263+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
264+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
265+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
411266
267+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
268+cleanupCacheSubscribed self = do
269+ unsubscribe $ _cacheSubscribed_parent self
270+ writeIORef (_cacheSubscribed_cached self) Nothing
412271
413272subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414273subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +279,13 @@ wrap tag getSpecificSubscribed sub = do
420279 let es = tag subd
421280 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422281
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
282+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424283eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425284
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429285eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
286+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431287
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
288+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433289eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434290
435291eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +294,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438294eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439295eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440296
441−eventHold :: Hold x p -> Event x p
297+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442298eventHold !h = Event $ subscribeHoldEvent h
443299
444300eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
445301eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446302
447303{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
304+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449305subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450306 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451307 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,6 +320,16 @@ data Subscriber x a = Subscriber
464320 , subscriberRecalculateHeight :: !(Height -> IO ())
465321 }
466322
323+--TODO: Move this comment to WeakBag
324+-- These function are constructor functions that are marked NOINLINE so they are
325+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
326+-- so any weak references that are attached to the constructors will have their
327+-- finalizer run. Using the opaque constructor, does not see the
328+-- constructor application, so it behaves like an IORef and cannot be fused away.
329+--
330+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
331+-- the weak pointer to it in some cases.
332+
467333newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468334newSubscriberHold h = return $ Subscriber
469335 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +337,85 @@ newSubscriberHold h = return $ Subscriber
471337 , subscriberRecalculateHeight = \_ -> return ()
472338 }
473339
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
340+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
341+newSubscriberFan subscribed = return $ Subscriber
476342 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477343 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
344+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479345 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480346 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
347+ let f _ (Pair (Identity v) subsubs) = do
482348 propagate v $ _fanSubscribedChildren_list subsubs
483349 return $ Constant ()
484350 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485351 return ()
486352 , subscriberInvalidateHeight = \old -> do
353+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487354 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
355+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
356+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489357 , subscriberRecalculateHeight = \new -> do
358+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490359 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
360+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
361+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492362 }
493363
494364newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
365+newSubscriberSwitch subscribed = return $ Subscriber
496366 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
367+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497368 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498369 scheduleClear $ switchSubscribedOccurrence subscribed
499370 propagate a $ switchSubscribedSubscribers subscribed
500371 , subscriberInvalidateHeight = \_ -> do
372+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501373 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502374 when (oldHeight /= invalidHeight) $ do
503375 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
376+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
377+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
378+ , subscriberRecalculateHeight = \new -> do
379+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
380+ updateSwitchHeight new subscribed
381+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
382+ }
507383
508384newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
385+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510386 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
387+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511388 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512389 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513390 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514391 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515392 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517393 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518394 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519395 case occ of
520− Nothing ->
396+ Nothing -> do
521397 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522398 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
399+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
400+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525401 Just o -> do -- Since it's already firing, no need to adjust height
526402 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527403 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528404 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
405+ , subscriberInvalidateHeight = \_ -> do
406+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
407+ invalidateCoincidenceHeight subscribed
408+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
409+ , subscriberRecalculateHeight = \_ -> do
410+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
411+ recalculateCoincidenceHeight subscribed
412+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531413 }
532414
533415newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
416+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535417 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
418+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536419 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537420 case occ of
538421 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +423,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540423 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541424 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542425 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
426+ , subscriberInvalidateHeight = \_ -> do
427+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
428+ invalidateCoincidenceHeight subscribed
429+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
430+ , subscriberRecalculateHeight = \_ -> do
431+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
432+ recalculateCoincidenceHeight subscribed
433+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545434 }
546435
547436invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +440,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551440recalculateSubscriberHeight = flip subscriberRecalculateHeight
552441
553442-- | 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) $
443+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
444+propagate a subscribers = withIncreasedDepth $ do
563445 -- 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
564446 --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
447+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566448
567449--------------------------------------------------------------------------------
568450-- EventSubscribed
@@ -571,16 +453,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571453toAny :: a -> Any
572454toAny = unsafeCoerce
573455
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.
579456data EventSubscribed x = EventSubscribed
580457 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581458 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582459#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
460+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584461 , eventSubscribedHasOwnHeightRef :: !Bool
585462 , eventSubscribedWhoCreated :: !(IO [String])
586463#endif
@@ -607,23 +484,13 @@ eventSubscribedNever = EventSubscribed
607484 , eventSubscribedWhoCreated = return ["never"]
608485#endif
609486 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620487
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
488+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622489eventSubscribedFan !subscribed = EventSubscribed
623490 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624491 , eventSubscribedRetained = toAny subscribed
625492#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
493+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627494 , eventSubscribedHasOwnHeightRef = False
628495 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629496#endif
@@ -636,7 +503,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636503#ifdef DEBUG_CYCLES
637504 , eventSubscribedGetParents = do
638505 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
506+ return [Some.This $ _eventSubscription_subscribed s]
640507 , eventSubscribedHasOwnHeightRef = True
641508 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642509#endif
@@ -649,8 +516,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649516#ifdef DEBUG_CYCLES
650517 , eventSubscribedGetParents = do
651518 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
519+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
520+ innerParents = maybeToList $ fmap Some.This innerSubscription
654521 return $ outerParent : innerParents
655522 , eventSubscribedHasOwnHeightRef = True
656523 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,22 +531,34 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664531whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665532whoCreatedEventSubscribed = eventSubscribedWhoCreated
666533
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
534+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668535walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
536+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670537 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671538 when (h == invalidHeight) $ do
672539 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
540+ modify (Some.This s :)
674541 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
542+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676543 return subscribers
677544#endif
678545
679546{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
547+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681548subscribeHoldEvent = subscribeAndRead . holdEvent
682549
550+--------------------------------------------------------------------------------
551+-- EventSubscription
552+--------------------------------------------------------------------------------
553+
554+data EventSubscription x = EventSubscription
555+ { _eventSubscription_unsubscribe :: !(IO ())
556+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
557+ }
558+
559+unsubscribe :: EventSubscription x -> IO ()
560+unsubscribe (EventSubscription u _) = u
561+
683562--------------------------------------------------------------------------------
684563-- Behavior
685564--------------------------------------------------------------------------------
@@ -700,7 +579,7 @@ behaviorPull !p = Behavior $ do
700579 val <- liftIO $ readIORef $ pullValue p
701580 case val of
702581 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
582+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704583 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705584 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706585 return $ pullSubscribedValue subscribed
@@ -709,7 +588,7 @@ behaviorPull !p = Behavior $ do
709588 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710589 parentsRef <- liftIO $ newIORef []
711590 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
591+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713592 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714593 parents <- liftIO $ readIORef parentsRef
715594 let subscribed = PullSubscribed
@@ -719,7 +598,7 @@ behaviorPull !p = Behavior $ do
719598 , pullSubscribedParents = parents
720599 }
721600 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
601+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723602 return a
724603
725604behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,11 +609,11 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730609readHoldTracked h = do
731610 result <- liftIO $ readIORef $ holdValue h
732611 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
612+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735613 return result
736614
737−{-# INLINABLE readBehaviorUntracked #-}
615+{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
616+{-# SPECIALIZE readBehaviorUntracked :: HasSpiderTimeline x => Behavior x a -> EventM x a #-}
738617readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739618readBehaviorUntracked b = do
740619 holdInits <- getDeferralQueue
@@ -744,46 +623,42 @@ readBehaviorUntracked b = do
744623-- Dynamic
745624--------------------------------------------------------------------------------
746625
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`?
626+data Dynamic x p = Dynamic
627+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
628+ , dynamicUpdated :: !(Event x p)
752629 }
753630
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
631+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760632dynamicHold !h = Dynamic
761633 { dynamicCurrent = behaviorHold h
762634 , dynamicUpdated = eventHold h
763635 }
764636
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
637+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766638dynamicHoldIdentity = dynamicHold
767639
768−dynamicConst :: PatchTarget p -> DynamicS x p
640+dynamicConst :: PatchTarget p -> Dynamic x p
769641dynamicConst !a = Dynamic
770642 { dynamicCurrent = behaviorConst a
771643 , dynamicUpdated = eventNever
772644 }
773645
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
646+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775647dynamicDyn !d = Dynamic
776648 { dynamicCurrent = behaviorDyn d
777649 , dynamicUpdated = eventDyn d
778650 }
779651
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
652+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781653dynamicDynIdentity = dynamicDyn
782654
783655--------------------------------------------------------------------------------
784656-- Combinators
785657--------------------------------------------------------------------------------
786658
659+--TODO: Figure out why certain things are not 'representational', then make them
660+--representational so we can use coerce
661+
787662--type role Hold representational
788663data Hold x p
789664 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,46 +670,13 @@ data Hold x p
795670#endif
796671 }
797672
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−
829673data EventEnv x
830674 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831675 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833676 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834677 , 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])
678+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
679+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838680 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839681 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840682 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +687,7 @@ runEventM :: EventM x a -> IO a
845687runEventM = unEventM
846688
847689asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
690+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
849691
850692class MonadIO m => Defer a m where
851693 getDeferralQueue :: m (IORef [a])
@@ -864,10 +706,6 @@ instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
864706 {-# INLINE getDeferralQueue #-}
865707 getDeferralQueue = asksEventEnv eventEnvHoldInits
866708
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
870−
871709instance Defer (SomeHoldInit x) (BehaviorM x) where
872710 {-# INLINE getDeferralQueue #-}
873711 getDeferralQueue = BehaviorM $ asks snd
@@ -895,46 +733,39 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
895733 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896734
897735class HasSpiderTimeline x where
898− -- | Retrieve the current SpiderTimelineEnv
899− spiderTimeline :: SpiderTimelineEnv x
736+ -- | Retrieve the current SpiderTimeline
737+ spiderTimeline :: SpiderTimeline x
900738
901739instance HasSpiderTimeline Global where
902− spiderTimeline = globalSpiderTimelineEnv
740+ spiderTimeline = globalSpiderTimeline
903741
904742putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905743putCurrentHeight h = do
906744 heightRef <- asksEventEnv eventEnvCurrentHeight
907745 liftIO $ writeIORef heightRef $! h
908746
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
747+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910748 {-# INLINE getDeferralQueue #-}
911749 getDeferralQueue = asksEventEnv eventEnvClears
912750
913751{-# 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
752+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
753+scheduleClear r = defer $ SomeClear r
920754
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
924−
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
755+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926756 {-# INLINE getDeferralQueue #-}
927757 getDeferralQueue = asksEventEnv eventEnvRootClears
928758
929759{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
760+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
761+scheduleRootClear r = defer $ SomeRootClear r
932762
933763instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934764 {-# INLINE getDeferralQueue #-}
935765 getDeferralQueue = asksEventEnv eventEnvResetCoincidences
936766
937767-- Note: hold cannot examine its event until after the phase is over
768+{- SPECIALIZE hold :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
938769{-# INLINE [1] hold #-}
939770hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
940771hold v0 e = do
@@ -957,7 +788,7 @@ hold v0 e = do
957788 return h
958789
959790{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
791+getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961792getHoldEventSubscription h = do
962793 ep <- liftIO $ readIORef $ holdParent h
963794 case ep of
@@ -983,9 +814,9 @@ getHoldEventSubscription h = do
983814
984815type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985816
817+--type role BehaviorM representational
986818-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
819+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989820
990821instance Monad (BehaviorM x) where
991822 {-# INLINE (>>=) #-}
@@ -994,16 +825,14 @@ instance Monad (BehaviorM x) where
994825 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995826 {-# INLINE return #-}
996827 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998828 {-# INLINE fail #-}
999829 fail s = BehaviorM $ fail s
1000−#endif
1001830
1002831data BehaviorSubscribed x a
1003832 = forall p. BehaviorSubscribedHold (Hold x p)
1004833 | BehaviorSubscribedPull (PullSubscribed x a)
1005834
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
835+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007836
1008837--type role PullSubscribed representational
1009838data PullSubscribed x a
@@ -1038,7 +867,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038867#endif
1039868 }
1040869
1041−data Root x k
870+data Root x (k :: * -> *)
1042871 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043872 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044873 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1046,8 +875,6 @@ data Root x k
1046875
1047876data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1048877
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
1050−
1051878data SomeMergeUpdate x = SomeMergeUpdate
1052879 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053880 , _someMergeUpdate_invalidateHeight :: !(IO ())
@@ -1057,14 +884,18 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057884newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058885
1059886-- 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)
887+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
1061888
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
889+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1063890
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067− }
891+instance Defer (SomeHoldInit x) (ComputeM x) where
892+ getDeferralQueue = ComputeM ask
893+
894+{-# SPECIALIZE runComputeM :: HasSpiderTimeline x => ComputeM x a -> EventM x a #-}
895+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
896+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
897+
898+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1068899
1069900data HeightBag = HeightBag
1070901 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +913,7 @@ heightBagFromList :: [Height] -> HeightBag
1082913heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083914
1084915heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
916+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087917
1088918heightBagRemove :: Height -> HeightBag -> HeightBag
1089919heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +922,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092922 0 -> IntMap.delete h c
1093923 _ -> IntMap.insert h (pred old) c
1094924
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−
1102925heightBagMax :: HeightBag -> Height
1103926heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104927 Just ((h, _), _) -> Height h
@@ -1116,25 +939,25 @@ heightBagVerify b@(HeightBag s c) = if
1116939heightBagVerify = id
1117940#endif
1118941
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)))
942+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
943+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
944+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
945+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1123946 }
1124947
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
948+data FanSubscribed (x :: *) k
949+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
950+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
951+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129952 , fanSubscribedParent :: !(EventSubscription x)
1130953#ifdef DEBUG_NODEIDS
1131954 , fanSubscribedNodeId :: Int
1132955#endif
1133956 }
1134957
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
958+data Fan x k
959+ = Fan { fanParent :: !(Event x (DMap k Identity))
960+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1138961 }
1139962
1140963data SwitchSubscribed x a
@@ -1158,9 +981,7 @@ data Switch x a
1158981 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1159982 }
1160983
1161−#ifdef USE_TEMPLATE_HASKELL
1162984{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163−#endif
1164985data CoincidenceSubscribed x a
1165986 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166987 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +1009,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881009newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891010newInvalidatorPull p = return $! InvalidatorPull p
11901011
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1012+instance HasSpiderTimeline x => R.FunctorMaybe (Event x) where
1013+ fmapMaybe f = push $ return . f
11931014
11941015instance HasSpiderTimeline x => Align (Event x) where
11951016 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)
1017+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
12121018
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1019+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141020
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)
1021+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1022+newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171023
12181024--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)
1025+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201026zipDynWith f da db =
12211027 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221028 ec = flip push eab $ \o -> do
@@ -1229,22 +1035,28 @@ zipDynWith f da db =
12291035 return (a, b)
12301036 These (Identity a) (Identity b) -> return (a, b)
12311037 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1038+ in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331039
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
1040+unsafeDyn :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1041+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1042+ where x = (readV0, v')
12401043
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1044+newJoinDyn :: HasSpiderTimeline x => Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1045+newJoinDyn d =
1046+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1047+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1048+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1049+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1050+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1051+ in unsafeDyn readV0 v'
12441052
12451053-- ResultM can read behaviors and events
12461054type ResultM = EventM
12471055
1056+{-# NOINLINE unsafeNewIORef #-}
1057+unsafeNewIORef :: a -> b -> IORef b
1058+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1059+
12481060instance HasSpiderTimeline x => Functor (Event x) where
12491061 fmap f = push $ return . Just . f
12501062
@@ -1257,42 +1069,33 @@ push f e = cacheEvent (pushCheap f e)
12571069
12581070{-# INLINABLE pull #-}
12591071pull :: 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
1072+pull a = behaviorPull $ Pull
1073+ { pullCompute = a
1074+ , pullValue = unsafeNewIORef a Nothing
12681075#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1076+ , pullNodeId = unsafeNodeId a
12701077#endif
1271− }
1078+ }
12721079
12731080{-# INLINABLE switch #-}
12741081switch :: 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− }
1082+switch a = eventSwitch $ Switch
1083+ { switchParent = a
1084+ , switchSubscribed = unsafeNewIORef a Nothing
1085+ }
12811086
12821087coincidence :: 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− }
1088+coincidence a = eventCoincidence $ Coincidence
1089+ { coincidenceParent = a
1090+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1091+ }
12891092
12901093-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911094run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921095run roots after = do
12931096 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
1097+ t <- SpiderHost ask
1098+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961099 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971100 occBefore <- liftIO $ do
12981101 occBefore <- readIORef occRef
@@ -1330,11 +1133,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301133 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311134 EQ -> a
13321135
1333−newtype Clear a = Clear (IORef (Maybe a))
1334−
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1136+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13361137
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1138+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381139
13391140data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401141
@@ -1346,110 +1147,55 @@ mkWeakPtrWithDebug x debugNote = do
13461147 x' <- evaluate x
13471148 mkWeakPtr x' $
13481149 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1150+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501151 else Nothing
13511152
13521153type WeakList a = [Weak a]
13531154
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−
13811155{-# 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
1156+#ifdef DEBUG
1157+withIncreasedDepth :: CanTrace x m => m a -> m a
1158+withIncreasedDepth a = do
1159+ spiderTimeline <- askSpiderTimeline
1160+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851161 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1162+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871163 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−
14121164#else
1165+withIncreasedDepth :: m a -> m a
1166+withIncreasedDepth = id
1167+#endif
14131168
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1169+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171170
14181171{-# INLINE tracePropagate #-}
14191172tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1173+tracePropagate p = traceWhen p debugPropagate
14211174
14221175{-# INLINE traceInvalidate #-}
14231176traceInvalidate :: 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
1177+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331178
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 ()
1179+{-# INLINE traceWhen #-}
1180+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1181+traceWhen p b message = traceMWhen p b $ return message
14471182
1183+{-# INLINE traceMWhen #-}
1184+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1185+traceMWhen _ b getMessage = when b $ do
1186+ message <- getMessage
1187+#ifdef DEBUG
1188+ spiderTimeline <- askSpiderTimeline
1189+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1190+#else
1191+ let d = 0
14481192#endif
1193+ liftIO $ putStrLn $ replicate d ' ' <> message
14491194
14501195whoCreatedIORef :: IORef a -> IO [String]
14511196whoCreatedIORef (IORef a) = whoCreated $! a
14521197
1198+#ifdef DEBUG_CYCLES
14531199groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541200groupByHead = \case
14551201 [] -> []
@@ -1460,54 +1206,20 @@ groupByHead = \case
14601206 | otherwise -> (x, xs :| []) : l
14611207
14621208listsToForest :: 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−
1209+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951210#endif
14961211
1497−
14981212{-# INLINE propagateSubscriberHold #-}
14991213propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001214propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1215+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021216 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031217 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051218 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061219 case {-# SCC "apply" #-} apply a v of
15071220 Nothing -> return ()
15081221 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1222+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111223 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121224 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131225 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1227,25 @@ propagateSubscriberHold h a = do
15151227data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161228
15171229runBehaviorM :: 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)
1230+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191231
15201232askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211233askInvalidator = do
1522− (!m, _) <- ask
1234+ (!m, _) <- BehaviorM ask
15231235 case m of
15241236 Nothing -> return Nothing
15251237 Just (!wi, _) -> return $ Just wi
15261238
15271239askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281240askParentsRef = do
1529− (!m, _) <- ask
1241+ (!m, _) <- BehaviorM ask
15301242 case m of
15311243 Nothing -> return Nothing
15321244 Just (_, !p) -> return $ Just p
15331245
15341246askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351247askBehaviorHoldInits = do
1536− (_, !his) <- ask
1248+ (_, !his) <- BehaviorM ask
15371249 return his
15381250
15391251{-# INLINE getDynHold #-}
@@ -1541,27 +1253,30 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411253getDynHold d = do
15421254 mh <- liftIO $ readIORef $ unDyn d
15431255 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1256+ Right h -> return h
1257+ Left (readV0, v') -> do
15461258 holdInits <- getDeferralQueue
15471259 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
15541260 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1261+ liftIO $ writeIORef (unDyn d) $ Right h
15561262 return h
15571263
1558−
15591264-- Always refers to 0
15601265{-# NOINLINE zeroRef #-}
15611266zeroRef :: IORef Height
15621267zeroRef = unsafePerformIO $ newIORef zeroHeight
15631268
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)
1269+type CanSubscribe x m =
1270+ ( HasSpiderTimeline x
1271+ , HasCurrentHeight x m
1272+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1273+ , Defer SomeClear m -- Wiping out event firings
1274+ , Defer (SomeAssignment x) m -- Updating state
1275+ , Defer (SomeResetCoincidence x) m
1276+ , m ~ EventM x
1277+ )
1278+
1279+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651280getRootSubscribed k r sub = do
15661281 mSubscribed <- readIORef $ rootSubscribed r
15671282 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1290,10 @@ getRootSubscribed k r sub = do
15751290 let !cached = rootSubscribed r
15761291 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771292 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1293+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811294 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821295 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
1586− let !subscribed = RootSubscribed
1296+ let subscribed = RootSubscribed
15871297 { rootSubscribedKey = k
15881298 , rootSubscribedCachedSubscribed = cached
15891299 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1301,17 @@ getRootSubscribed k r sub = do
15911301 , rootSubscribedUninit = uninit
15921302 , rootSubscribedWeakSelf = weakSelf
15931303#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1304+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951305#endif
15961306 }
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)
1307+ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
16081308 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
16091309 occ <- getOcc
16101310 return (sln, subscribed, occ)
16111311
1612−#ifdef USE_TEMPLATE_HASKELL
16131312{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614−#endif
16151313cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1314+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
16171315 rootSubscribedUninit self
16181316 modifyIORef' cached $ DMap.delete k
16191317
@@ -1621,90 +1319,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211319subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221320subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231321
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1625−
1626−data FanInt x a = FanInt
1627− { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
1633− }
1634−
1635−newFanInt :: IO (FanInt x a)
1636−newFanInt = do
1637− subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639− occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
1643− return $ FanInt
1644− { _fanInt_subscribers = subscribers
1645− , _fanInt_subscriptionRef = subscriptionRef
1646− , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
1650− }
1651−
1652−fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656− isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657− when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658− let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659− (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660− { subscriberPropagate = \m -> do
1661− liftIO $ writeIORef (_fanInt_occRef self) m
1662− scheduleIntClear $ _fanInt_occRef self
1663− FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1665− subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1669− subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1673− subscriberRecalculateHeight s new
1674− }
1675− liftIO $ do
1676− writeIORef (_fanInt_subscriptionRef self) subscription
1677− writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678− scheduleIntClear $ _fanInt_occRef self
1679− liftIO $ do
1680− b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681− Nothing -> do
1682− b <- FastWeakBag.empty
1683− FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684− return b
1685− Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1687− currentOcc <- readIORef (_fanInt_occRef self)
1688−
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691−
1692−fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693−fanIntSubscribed ticket self = do
1694− subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695− return $ EventSubscribed
1696− { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697− , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698−#ifdef DEBUG_CYCLES
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702−#endif
1703− }
1704−
1705−
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))
1322+{-# SPECIALIZE getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1323+getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
17081324getFanSubscribed k f sub = do
17091325 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101326 case mSubscribed of
@@ -1722,16 +1338,13 @@ getFanSubscribed k f sub = do
17221338 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231339 occRef <- liftIO $ newIORef parentOcc
17241340 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281341 let subscribed = FanSubscribed
17291342 { fanSubscribedCachedSubscribed = fanSubscribed f
17301343 , fanSubscribedOccurrence = occRef
17311344 , fanSubscribedParent = subscription
17321345 , fanSubscribedSubscribers = subscribersRef
17331346#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1347+ , fanSubscribedNodeId = unsafeNodeId f
17351348#endif
17361349 }
17371350 let !self = (k, subscribed)
@@ -1741,7 +1354,7 @@ getFanSubscribed k f sub = do
17411354 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421355 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431356
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1357+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451358cleanupFanSubscribed (k, subscribed) = do
17461359 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471360 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1366,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531366 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541367
17551368{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1369+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571370subscribeFanSubscribed k subscribed sub = do
17581371 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591372 case DMap.lookup k subscribers of
@@ -1765,8 +1378,8 @@ subscribeFanSubscribed k subscribed sub = do
17651378 return sln
17661379 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671380
1768−{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1381+{-# SPECIALIZE getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a) #-}
1382+getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
17701383getSwitchSubscribed s sub = do
17711384 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721385 case mSubscribed of
@@ -1791,9 +1404,6 @@ getSwitchSubscribed s sub = do
17911404 when (isJust parentOcc) $ scheduleClear occRef
17921405 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931406 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971407 let !subscribed = SwitchSubscribed
17981408 { switchSubscribedCachedSubscribed = switchSubscribed s
17991409 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1416,7 @@ getSwitchSubscribed s sub = do
18061416 , switchSubscribedCurrentParent = subscriptionRef
18071417 , switchSubscribedWeakSelf = weakSelf
18081418#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1419+ , switchSubscribedNodeId = unsafeNodeId s
18101420#endif
18111421 }
18121422 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1434,8 @@ cleanupSwitchSubscribed subscribed = do
18241434subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18251435subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261436
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1437+{-# SPECIALIZE getCoincidenceSubscribed :: HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a) #-}
1438+getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
18291439getCoincidenceSubscribed c sub = do
18301440 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311441 case mSubscribed of
@@ -1851,9 +1461,6 @@ getCoincidenceSubscribed c sub = do
18511461 scheduleClear innerSubdRef
18521462 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531463 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571464 let subscribed = CoincidenceSubscribed
18581465 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591466 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1471,7 @@ getCoincidenceSubscribed c sub = do
18641471 , coincidenceSubscribedInnerParent = innerSubdRef
18651472 , coincidenceSubscribedWeakSelf = weakSelf
18661473#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1474+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681475#endif
18691476 }
18701477 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,497 +1488,216 @@ cleanupCoincidenceSubscribed subscribed = do
18811488subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821489subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831490
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)
1491+{-# INLINE merge #-}
1492+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1493+merge d = cacheEvent (mergeCheap d)
18951494
18961495{-# 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))
2015− }
2016−
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
2018−invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2019−
2020−invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021−invalidateMergeHeight' heightRef sub = do
2022− oldHeight <- readIORef heightRef
2023− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024− when (oldHeight /= invalidHeight) $ do
2025− writeIORef heightRef $! invalidHeight
2026− subscriberInvalidateHeight sub oldHeight
2027−
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
2029−revalidateMergeHeight m = do
2030− currentHeight <- readIORef $ _merge_heightRef m
2031−
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
2034− heights <- readIORef $ _merge_heightBagRef m
2035− parents <- readIORef $ _merge_parentsRef m
2036− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037− case heightBagSize heights `compare` DMap.size parents of
2038− LT -> return ()
2039− EQ -> do
2040− let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042− writeIORef (_merge_heightRef m) $! height
2043− subscriberRecalculateHeight (_merge_sub m) height
2044− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2045−
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047−scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048− vals <- liftIO $ readIORef $ _merge_accumRef m
2049− -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052− --TODO: Assert that m is not empty
2053− subscriberPropagate (_merge_sub m) vals
2054−
2055−checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056−checkCycle subscribed = liftIO $ do
2057− height <- readIORef (eventSubscribedHeightRef subscribed)
2058−
2059− -- currentHeight <- getCurrentHeight
2060− -- when (height <= currentHeight) $ if height /= invalidHeight
2061− -- then do
2062− -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063− -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2064− -- else liftIO $
2065− when (height == invalidHeight) $
2066−#ifdef DEBUG_CYCLES
2067− do
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
2071−#else
2072− throwIO EventLoopException
2073−#endif
2074−
2075−
2076−mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077−mergeSubscriber subscribed m getKey = Subscriber
2078− { subscriberPropagate = \a -> do
2079− oldM <- liftIO $ readIORef $ _merge_accumRef m
2080− k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082− tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083− liftIO $ writeIORef (_merge_accumRef m) $! newM
2084− when (DMap.null oldM) $ do -- Only schedule the firing once
2085− height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
2088− scheduleMergeSelf m height
2089− , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090− modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091− invalidateMergeHeight m
2092− , subscriberRecalculateHeight = \new -> do
2093− modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094− revalidateMergeHeight m
2095− }
2096−
2097−--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100− where updateMe = do
2101− oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103− liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104− return subscriptionsToKill
2105−
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1496+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1497+mergeCheap d = Event $ \sub -> do
21101498 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111499 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121500 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131501 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
1502+ parentsRef <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1503+ let scheduleSelf height = scheduleMerge' height heightRef $ do
1504+ m <- liftIO $ readIORef accumRef
1505+ liftIO $ writeIORef accumRef $! DMap.empty
1506+ --TODO: Assert that m is not empty
1507+ subscriberPropagate sub m
1508+ invalidateMyHeight = do
1509+ oldHeight <- readIORef heightRef
1510+ when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1511+ writeIORef heightRef $! invalidHeight
1512+ subscriberInvalidateHeight sub oldHeight
1513+ revalidateMyHeight = do
21971514 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?
1515+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
21991516 heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
2201− case heightBagSize heights `compare` numParents of
1517+ parents <- readIORef parentsRef
1518+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1519+ case heightBagSize heights `compare` DMap.size parents of
22021520 LT -> return ()
22031521 EQ -> do
22041522 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1523+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061524 writeIORef heightRef $! height
22071525 subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209− mySubscriber k = Subscriber
1526+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge"
1527+ subscriber :: forall a. k a -> Subscriber x a
1528+ subscriber k = Subscriber
22101529 { 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
1530+ oldM <- liftIO $ readIORef accumRef
1531+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1532+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1533+ liftIO $ writeIORef accumRef $! newM
1534+ when (DMap.null oldM) $ do -- Only schedule the firing once
1535+ height <- liftIO $ readIORef heightRef
1536+ --TODO: assertions about height
1537+ currentHeight <- getCurrentHeight
1538+ when (height <= currentHeight) $ do
1539+ if height /= invalidHeight
1540+ then do
1541+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1542+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1543+ else liftIO $ do
1544+#ifdef DEBUG_CYCLES
1545+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1546+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1547+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1548+#else
1549+ let cycleInfo = ""
1550+#endif
1551+ error $ "Causality loop found" <> cycleInfo
1552+ scheduleSelf height
1553+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
22171554 modifyIORef' heightBagRef $ heightBagRemove old
22181555 invalidateMyHeight
22191556 , subscriberRecalculateHeight = \new -> do
22201557 modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
1558+ revalidateMyHeight
22221559 }
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
1560+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1561+ let s = subscriber k
1562+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1563+ height <- liftIO $ getEventSubscribedHeight parentSubd
1564+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1565+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1566+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1567+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1568+ myHeight = if invalidHeight `elem` heights
1569+ then invalidHeight
1570+ else succHeight $ heightBagMax myHeightBag
22381571 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
1572+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1573+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1574+ else (Nothing, dm)
1575+ unless (DMap.null accum) $ do
1576+ scheduleSelf myHeight
1577+ occRef <- liftIO $ newIORef occ
1578+ when (isJust occ) $ scheduleClear occRef
1579+ liftIO $ writeIORef accumRef $! accum
1580+ liftIO $ writeIORef heightRef $! myHeight
1581+ liftIO $ writeIORef heightBagRef $! myHeightBag
1582+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1583+ liftIO $ writeIORef parentsRef $! DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1584+ let updateMe (PatchDMap p) = do
1585+ oldParents <- liftIO $ readIORef parentsRef
1586+ let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1587+ (mOldSubd, newPs) <- case me of
1588+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1589+ Just e -> do
1590+ let s = subscriber k
1591+ subscription@(EventSubscription _ subd) <- subscribe e s
1592+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1593+ let newParent = MergeSubscribedParent subscription
1594+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1595+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1596+ forM_ mOldSubd $ \oldSubd -> do
1597+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1598+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1599+ return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1600+ (subscriptionsToKill, newParents) <- 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
1601+ liftIO $ writeIORef parentsRef $! newParents
1602+ return subscriptionsToKill
22461603 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
1604+ let s = Subscriber
22641605 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266− defer $ updateMe a
1606+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1607+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
22671608 , subscriberInvalidateHeight = \_ -> return ()
22681609 , subscriberRecalculateHeight = \_ -> return ()
22691610 }
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)
1611+ (EventSubscription _ changeSubd, change) <- subscribeAndRead (dynamicUpdated d) s
1612+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
1613+ liftIO $ writeIORef changeSubdRef (s, changeSubd)
1614+ let unsubscribeAll = do
1615+ parents <- readIORef parentsRef
1616+ forM_ (DMap.toList parents) $ \(_ :=> MergeSubscribedParent s) -> unsubscribe s
1617+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1618+ , occ
1619+ )
22801620
22811621newtype 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) }
22831622
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1623+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1624+fan e =
22871625 let f = Fan
22881626 { fanParent = e
2289− , fanSubscribed = ref
1627+ , fanSubscribed = unsafeNewIORef e Nothing
22901628 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1629+ in EventSelector $ \k -> eventFan k f
22921630
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1631+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1632+runHoldInits holdInitRef mergeInitRef = do
22951633 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
22971634 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1635+ unless (null holdInits && null mergeInits) $ do
22991636 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
23011637 liftIO $ writeIORef mergeInitRef []
23021638 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
23041639 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1640+ runHoldInits holdInitRef mergeInitRef
23061641
23071642initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
23081643initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
23091644
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
2312−
23131645newEventEnv :: IO (EventEnv x)
23141646newEventEnv = do
23151647 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
23161648 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
23181649 mergeUpdateRef <- newIORef []
23191650 mergeInitRef <- newIORef []
23201651 heightRef <- newIORef zeroHeight
23211652 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231653 toClearRootRef <- newIORef []
23241654 coincidenceInfosRef <- newIORef []
23251655 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1656+ return $ EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23271657
23281658clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1659+clearEventEnv (EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
23301660 writeIORef toAssignRef []
23311661 writeIORef holdInitRef []
2332− writeIORef dynInitRef []
23331662 writeIORef mergeUpdateRef []
23341663 writeIORef mergeInitRef []
23351664 writeIORef heightRef zeroHeight
23361665 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
23381666 writeIORef toClearRootRef []
23391667 writeIORef coincidenceInfosRef []
23401668 writeIORef delayedRef IntMap.empty
23411669
23421670-- | Run an event action outside of a frame
23431671runFrame :: 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)
1672+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1673+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
23461674 let go = do
23471675 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
1676+ runHoldInits (eventEnvHoldInits 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
23491677 return result
23501678 result <- runEventM go
23511679 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
1680+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23551681 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1682+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23571683 toAssign <- readIORef $ eventEnvAssignments env
23581684 toReconnectRef <- newIORef []
23591685 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23601686 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611687 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1688+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631689 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23641690 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23651691 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1692+ when debugPropagate $ putStrLn "Updating merges"
23671693 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1694+ when debugPropagate $ putStrLn "Updating merges done"
23691695 toReconnect <- readIORef toReconnectRef
23701696 clearEventEnv env
23711697 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721698 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731699 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1700+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751701 finalize wi
23761702 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771703 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2379,13 +1705,13 @@ runFrame a = SpiderHost $ do
23791705 writeIORef (switchSubscribedBehaviorParents subscribed) []
23801706 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
23811707 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
1708+ runEventM $ runHoldInits (eventEnvHoldInits 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
23831709 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841710 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
1711+ 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
23861712 {-
23871713 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1714+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891715 EventRoot _ -> "EventRoot"
23901716 EventNever -> "EventNever"
23911717 _ -> "something else"
@@ -2400,7 +1726,7 @@ runFrame a = SpiderHost $ do
24001726 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011727 when (parentHeight /= myHeight) $ do
24021728 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1729+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24041730 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
24051731 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061732 unsubscribe subscription
@@ -2441,7 +1767,7 @@ invalidateCoincidenceHeight subscribed = do
24411767 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421768 when (oldHeight /= invalidHeight) $ do
24431769 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1770+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451771
24461772updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471773updateSwitchHeight new subscribed = do
@@ -2449,7 +1775,7 @@ updateSwitchHeight new subscribed = do
24491775 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501776 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511777 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1778+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531779
24541780recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551781recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1784,7 @@ recalculateCoincidenceHeight subscribed = do
24581784 height <- calculateCoincidenceHeight subscribed
24591785 when (height /= invalidHeight) $ do
24601786 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1787+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621788
24631789calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641790calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,227 +1823,40 @@ invalidate toReconnectRef wis = do
24971823-- Reflex integration
24981824--------------------------------------------------------------------------------
24991825
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
25041826-- | The default, global Spider environment
25051827type Spider = SpiderTimeline Global
25061828
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2510−
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2525−
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2529−
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533−
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535− {-# INLINABLE hold #-}
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
2549−
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551− {-# INLINE return #-}
2552− return = pure
2553− {-# INLINE (>>=) #-}
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555− {-# INLINE (>>) #-}
2556− (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2560−#endif
2561−
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564−newJoinDyn d =
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571−
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
1829+-- | Designates the default, global Spider timeline
1830+data Global
25751831
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 #-}
1832+{-# NOINLINE globalSpiderTimeline #-}
1833+globalSpiderTimeline :: SpiderTimeline Global
1834+!globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
25791835
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)
1836+-- | Stores all global data relevant to a particular Spider timeline; only one
1837+-- value should exist for each type @x@
1838+data SpiderTimeline x = SpiderTimeline
1839+ { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
1840+ , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
1841+#ifdef DEBUG
1842+ , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
25841843#endif
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588−
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2591−
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594−
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597−
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600−
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602− {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604− {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606− {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
2615−
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618−
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2633−
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635− {-# INLINABLE sample #-}
2636− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637−
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639− {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2641−
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643− {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645− {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647− {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655−
2656−--------------------------------------------------------------------------------
2657−-- Deprecated items
2658−--------------------------------------------------------------------------------
2659−
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662−type SpiderEnv = SpiderTimeline
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664− {-# INLINABLE subscribeEvent #-}
2665− subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667− val <- liftIO $ newIORef Nothing
2668− subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669− { subscriberPropagate = \a -> do
2670− liftIO $ writeIORef val $ Just a
2671− scheduleClear val
2672− , subscriberInvalidateHeight = \_ -> return ()
2673− , subscriberRecalculateHeight = \_ -> return ()
2674− }
2675− return $ SpiderEventHandle
2676− { spiderEventHandleSubscription = subscription
2677− , spiderEventHandleValue = val
2678− }
2679−
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684−
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2689− touch h
2690− return result
2691−
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697−
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703−
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
1844+ }
1845+type role SpiderTimeline nominal
27071846
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
1847+instance GEq SpiderTimeline where
1848+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1849+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
1850+ else Nothing
27121851
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
1852+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
1853+unsafeNewSpiderTimeline = do
27151854 lock <- newMVar ()
27161855 env <- newEventEnv
27171856#ifdef DEBUG
27181857 depthRef <- newIORef 0
27191858#endif
2720− return $ STE $ SpiderTimelineEnv
1859+ return $ SpiderTimeline
27211860 { _spiderTimeline_lock = lock
27221861 , _spiderTimeline_eventEnv = env
27231862#ifdef DEBUG
@@ -2725,40 +1864,43 @@ unsafeNewSpiderTimelineEnv = do
27251864#endif
27261865 }
27271866
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
1867+-- | Create a new SpiderTimeline
1868+newSpiderTimeline :: IO (Some SpiderTimeline)
1869+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27311870
2732−data LocalSpiderTimeline (x :: Type) s
1871+-- | Pass a new timeline to the given function.
1872+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
1873+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
27331874
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
1875+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27371876
2738−localSpiderTimeline
2739− :: proxy s
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
1877+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27431878
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
1879+instance HasSpiderTimeline x => Functor (R.Dynamic (SpiderTimeline x)) where
1880+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
27491881
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
1882+instance HasSpiderTimeline x => Applicative (R.Dynamic (SpiderTimeline x)) where
1883+ pure = SpiderDynamic . dynamicConst
1884+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
1885+ _ *> b = b
1886+ a <* _ = a
27531887
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1888+instance HasSpiderTimeline x => Monad (R.Dynamic (SpiderTimeline x)) where
1889+ {-# INLINE return #-}
1890+ return = pure
1891+ {-# INLINE (>>=) #-}
1892+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1893+ {-# INLINE (>>) #-}
1894+ _ >> y = y
1895+ {-# INLINE fail #-}
1896+ fail _ = error "Dynamic does not support 'fail'"
27551897
27561898instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27571899 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27581900 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27591901 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 }
1902+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
1903+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27621904 type PullM (SpiderTimeline x) = SpiderPullM x
27631905 type PushM (SpiderTimeline x) = SpiderPushM x
27641906 {-# INLINABLE never #-}
@@ -2767,19 +1909,12 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27671909 constant = SpiderBehavior . behaviorConst
27681910 {-# INLINE push #-}
27691911 push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27721912 {-# INLINABLE pull #-}
27731913 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
1914+ {-# INLINABLE merge #-}
1915+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
1916+ {-# INLINABLE fan #-}
1917+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27831918 {-# INLINABLE switch #-}
27841919 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27851920 {-# INLINABLE coincidence #-}
@@ -2787,31 +1922,73 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27871922 {-# INLINABLE current #-}
27881923 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27891924 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
1925+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
27911926 {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
1927+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
27931928 {-# 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
1929+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
1930+ {-# INLINABLE mergeIncremental #-}
1931+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
27991932 {-# INLINABLE currentIncremental #-}
28001933 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28011934 {-# INLINABLE updatedIncremental #-}
28021935 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
28031936 {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
1937+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
28051938 c <- readBehaviorUntracked $ dynamicCurrent i
28061939 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28071940 eventCoercion Coercion = Coercion
28081941 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))
1942+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
1943+
1944+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (EventM x) where
1945+ {-# INLINABLE sample #-}
1946+ sample (SpiderBehavior b) = readBehaviorUntracked b
1947+
1948+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (EventM x) where
1949+ {-# INLINABLE hold #-}
1950+ hold = holdSpiderEventM
1951+ {-# INLINABLE holdDyn #-}
1952+ holdDyn = holdDynSpiderEventM
1953+ {-# INLINABLE holdIncremental #-}
1954+ holdIncremental = holdIncrementalSpiderEventM
1955+
1956+holdSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
1957+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1958+
1959+holdDynSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
1960+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1961+
1962+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
1963+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
1964+
1965+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHost x) where
1966+ {-# INLINABLE hold #-}
1967+ hold v0 e = R.runHostFrame $ R.hold v0 e
1968+ {-# INLINABLE holdDyn #-}
1969+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
1970+ {-# INLINABLE holdIncremental #-}
1971+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
1972+
1973+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHost x) where
1974+ {-# INLINABLE sample #-}
1975+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
1976+
1977+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
1978+ {-# INLINABLE sample #-}
1979+ sample = coerce . readBehaviorTracked . unSpiderBehavior
1980+
1981+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
1982+ {-# INLINABLE sample #-}
1983+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1984+
1985+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1986+ {-# INLINABLE hold #-}
1987+ hold v0 e = R.current <$> R.holdDyn v0 e
1988+ {-# INLINABLE holdDyn #-}
1989+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
1990+ {-# INLINABLE holdIncremental #-}
1991+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
28151992
28161993data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28171994
@@ -2820,6 +1997,35 @@ data SpiderEventHandle x a = SpiderEventHandle
28201997 , spiderEventHandleValue :: IORef (Maybe a)
28211998 }
28221999
2000+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2001+ {-# INLINABLE subscribeEvent #-}
2002+ subscribeEvent e = SpiderHostFrame $ do
2003+ --TODO: Unsubscribe eventually (manually and/or with weak ref)
2004+ val <- liftIO $ newIORef Nothing
2005+ subscription <- subscribe (unSpiderEvent e) $ Subscriber
2006+ { subscriberPropagate = \a -> do
2007+ liftIO $ writeIORef val $ Just a
2008+ scheduleClear val
2009+ , subscriberInvalidateHeight = \_ -> return ()
2010+ , subscriberRecalculateHeight = \_ -> return ()
2011+ }
2012+ return $ SpiderEventHandle
2013+ { spiderEventHandleSubscription = subscription
2014+ , spiderEventHandleValue = val
2015+ }
2016+
2017+instance HasSpiderTimeline x => R.ReflexHost (SpiderTimeline x) where
2018+ type EventTrigger (SpiderTimeline x) = RootTrigger x
2019+ type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2020+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2021+
2022+instance HasSpiderTimeline x => R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2023+ {-# NOINLINE readEvent #-}
2024+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2025+ result <- readIORef $ spiderEventHandleValue h
2026+ touch h
2027+ return result
2028+
28232029instance MonadRef (EventM x) where
28242030 type Ref (EventM x) = Ref IO
28252031 {-# INLINABLE newRef #-}
@@ -2834,7 +2040,7 @@ instance MonadAtomicRef (EventM x) where
28342040 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352041
28362042-- | 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)
2043+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382044
28392045instance Monad (SpiderHost x) where
28402046 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2049,20 @@ instance Monad (SpiderHost x) where
28432049 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442050 {-# INLINABLE return #-}
28452051 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847− {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
28522052 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2053+ fail s = SpiderHost $ fail s
28542054
28552055-- | Run an action affecting the global Spider timeline; this will be guarded by
28562056-- a mutex for that timeline
28572057runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2058+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
28592059
28602060-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612061-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2062+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2063+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
28642064
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2065+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672066
28682067instance Monad (SpiderHostFrame x) where
28692068 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2071,26 @@ instance Monad (SpiderHostFrame x) where
28722071 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732072 {-# INLINABLE return #-}
28742073 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762074 {-# INLINABLE fail #-}
28772075 fail s = SpiderHostFrame $ fail s
2878−#endif
28792076
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
2077+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2078+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
28832079
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2080+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2081+ {-# INLINABLE hold #-}
2082+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2083+ {-# INLINABLE holdDyn #-}
2084+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2085+ {-# INLINABLE holdIncremental #-}
2086+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2087+
2088+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852089newEventWithTriggerIO f = do
28862090 es <- newFanEventWithTriggerIO $ \Refl -> f
28872091 return $ select es Refl
28882092
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2093+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902094newFanEventWithTriggerIO f = do
28912095 occRef <- newIORef DMap.empty
28922096 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2101,41 @@ newFanEventWithTriggerIO f = do
28972101 }
28982102 return $ EventSelector $ \k -> eventRoot k r
28992103
2104+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2105+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2106+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2107+ es <- newFanEventWithTriggerIO f
2108+ return $ R.EventSelector $ SpiderEvent . select es
2109+
2110+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2111+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2112+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2113+ es <- newFanEventWithTriggerIO f
2114+ return $ R.EventSelector $ SpiderEvent . select es
2115+
2116+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2117+ {-# INLINABLE subscribeEvent #-}
2118+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2119+
29002120newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
29012121
2122+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2123+ {-# INLINABLE sample #-}
2124+ sample = ReadPhase . R.sample
2125+
2126+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2127+ {-# INLINABLE hold #-}
2128+ hold v0 e = ReadPhase $ R.hold v0 e
2129+ {-# INLINABLE holdDyn #-}
2130+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2131+ {-# INLINABLE holdIncremental #-}
2132+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2133+
2134+instance HasSpiderTimeline x => R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2135+ type ReadPhase (SpiderHost x) = ReadPhase x
2136+ fireEventsAndRead es (ReadPhase a) = run es a
2137+ runHostFrame = runFrame . runSpiderHostFrame
2138+
29022139instance MonadRef (SpiderHost x) where
29032140 type Ref (SpiderHost x) = Ref IO
29042141 newRef = SpiderHost . newRef
@@ -2921,10 +2158,9 @@ instance PrimMonad (SpiderHostFrame x) where
29212158 type PrimState (SpiderHostFrame x) = PrimState IO
29222159 primitive = SpiderHostFrame . EventM . primitive
29232160
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2161+--------------------------------------------------------------------------------
2162+-- Deprecated items
2163+--------------------------------------------------------------------------------
29272164
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()
2165+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2166+type SpiderEnv = SpiderTimeline