@@ -2,132 +2,78 @@
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
25−{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
26−#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2820-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2921-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30−module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
22+module Reflex.Spider.Internal where
3123
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
24+import Control.Applicative
3525import Control.Concurrent
3626import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
27+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3828import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
29+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4030import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
31+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4432import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4733import Data.Align
4834import Data.Coerce
49−import Data.Dependent.Map (DMap)
35+import Data.Dependent.Map (DMap, DSum (..))
5036import 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
5437import Data.Foldable hiding (concat, elem, sequence_)
38+import Data.Function
5539import Data.Functor.Constant
56−import Data.Functor.Misc
5740import Data.Functor.Product
5841import Data.GADT.Compare
5942import Data.IntMap.Strict (IntMap)
6043import qualified Data.IntMap.Strict as IntMap
6144import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
45+import Data.List hiding (foldl')
46+import Data.Maybe
47+import Data.Monoid ((<>))
6548import Data.Proxy
49+import Data.Some (Some)
50+import qualified Data.Some as Some
6651import Data.These
6752import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
53+import Data.Type.Coercion
54+import Data.Word
55+import GHC.Exts
7156import GHC.IORef (IORef (..))
7257import GHC.Stack
73−import Reflex.FastWeak
7458import System.IO.Unsafe
7559import System.Mem.Weak
7660import Unsafe.Coerce
7761
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
81−#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
85−#endif
86−
8762#ifdef DEBUG_CYCLES
8863import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9164import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9265import qualified Data.List.NonEmpty as NonEmpty
66+import Data.Monoid (mempty)
9367import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
95−
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
68+#endif
9869
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
103−import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
70+import Data.WeakBag (WeakBag, WeakBagTicket)
10471import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
10672import qualified Reflex.Class as R
107−import qualified Reflex.Host.Class
108−import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
112−
113−#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
115−import System.IO (stderr)
116−import Data.List (isPrefixOf)
117−#endif
73+import qualified Reflex.Host.Class as R
11874
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123−#ifdef DEBUG_TRACE_EVENTS
124−withStackOneLine :: (BS8.ByteString -> a) -> a
125−withStackOneLine expr = unsafePerformIO $ do
126− stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
129−
130−#endif
75+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
76+import Prelude hiding (any, concat, mapM, mapM_, sequence)
13177
13278debugPropagate :: Bool
13379
@@ -136,42 +82,28 @@ debugInvalidateHeight :: Bool
13682debugInvalidate :: Bool
13783
13884#ifdef DEBUG
85+
13986#define DEBUG_NODEIDS
14087
141−#ifdef DEBUG_TRACE_PROPAGATION
14288debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
14689
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
15090debugInvalidateHeight = False
151−#endif
15291
153−#ifdef DEBUG_TRACE_INVALIDATION
15492debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
15893
15994class HasNodeId a where
16095 getNodeId :: a -> Int
16196
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
97+instance HasNodeId (Hold x p a) where
16998 getNodeId = holdNodeId
17099
100+instance HasNodeId (PushSubscribed x a b) where
101+ getNodeId = pushSubscribedNodeId
102+
171103instance HasNodeId (SwitchSubscribed x a) where
172104 getNodeId = switchSubscribedNodeId
173105
174−instance HasNodeId (FanSubscribed x v a) where
106+instance HasNodeId (FanSubscribed x a) where
175107 getNodeId = fanSubscribedNodeId
176108
177109instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +117,41 @@ instance HasNodeId (Pull x a) where
185117
186118{-# INLINE showNodeId #-}
187119showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
120+showNodeId = ("#"<>) . show . getNodeId
121+
122+showSubscriberType :: Subscriber x a -> String
123+showSubscriberType = \case
124+ SubscriberPush _ _ -> "SubscriberPush"
125+ SubscriberMerge _ _ -> "SubscriberMerge"
126+ SubscriberFan _ -> "SubscriberFan"
127+ SubscriberMergeChange _ -> "SubscriberMergeChange"
128+ SubscriberHold _ -> "SubscriberHold"
129+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
130+ SubscriberSwitch _ -> "SubscriberSwitch"
131+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
132+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
133+ SubscriberHandle -> "SubscriberHandle"
134+
135+showEventType :: Event x a -> String
136+showEventType = \case
137+ EventRoot _ _ -> "EventRoot"
138+ EventNever -> "EventNever"
139+ EventPush _ -> "EventPush"
140+ EventMerge _ -> "EventMerge"
141+ EventFan _ _ -> "EventFan"
142+ EventSwitch _ -> "EventSwitch"
143+ EventCoincidence _ -> "EventCoincidence"
144+ EventHold _ -> "EventHold"
145+ EventDyn _ -> "EventDyn"
146+ EventHoldIdentity _ -> "EventHoldIdentity"
147+ EventDynIdentity _ -> "EventDynIdentity"
193148
194149#else
195150
196151debugPropagate = False
152+
197153debugInvalidateHeight = False
154+
198155debugInvalidate = False
199156
200157-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +159,6 @@ debugInvalidate = False
202159showNodeId :: a -> String
203160showNodeId _ = ""
204161
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209162#endif
210163
211164#ifdef DEBUG_NODEIDS
@@ -215,200 +168,93 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215168
216169newNodeId :: IO Int
217170newNodeId = 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− }
230171
231−unsubscribe :: EventSubscription x -> IO ()
232−unsubscribe (EventSubscription u _) = u
172+{-# NOINLINE unsafeNodeId #-}
173+unsafeNodeId :: a -> Int
174+unsafeNodeId a = unsafePerformIO $ do
175+ touch a
176+ newNodeId
177+#endif
233178
234179--------------------------------------------------------------------------------
235180-- Event
236181--------------------------------------------------------------------------------
237182
238−newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
239−
240−{-# INLINE subscribeAndRead #-}
241−subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
242−subscribeAndRead = unEvent
243−
244−{-# RULES
245−"cacheEvent/cacheEvent" forall e. cacheEvent (cacheEvent e) = cacheEvent e
246−"cacheEvent/pushCheap" forall f e. pushCheap f (cacheEvent e) = cacheEvent (pushCheap f e)
247−"hold/cacheEvent" forall f e. hold f (cacheEvent e) = hold f e
248− #-}
183+newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
249184
250185-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251186-- caching; if the computation function is very cheap, this is (much) more
252187-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
188+{-# INLINABLE pushCheap #-}
254189pushCheap :: 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
190+pushCheap f e = Event $ \sub -> do
191+ (subscription, occ) <- subscribeAndRead e $ sub
257192 { subscriberPropagate = \a -> do
258− mb <- f a
193+ mb <- runComputeM $ f a
259194 mapM_ (subscriberPropagate sub) mb
260195 }
261− occ' <- join <$> mapM f occ
196+ occ' <- join <$> mapM (runComputeM . f) occ
262197 return (subscription, occ')
263198
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−
301199data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
200+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
201+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303202 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
203+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304204 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308205 }
309206
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−
325207-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326208-- repeatedly
327209--
328210--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
211+--there's only one subscriber, and then build our own WeakBag only when a second
330212--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− }
213+{-# INLINABLE cacheEvent #-}
214+cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
215+cacheEvent e = Event $ \sub -> {-# SCC "cacheEvent" #-} do
216+ let !mSubscribedRef = unsafeNewIORef e Nothing
217+ mSubscribed <- liftIO $ readIORef mSubscribedRef
218+ case mSubscribed of
219+ Just subscribed -> liftIO $ do
220+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
221+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
222+ let es = EventSubscribed
223+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
224+ , eventSubscribedRetained = toAny subscribed
225+ }
226+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
227+ Nothing -> do
228+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
229+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
230+ occRef <- liftIO $ newIORef undefined
231+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
232+ { subscriberPropagate = \a -> do
233+ liftIO $ writeIORef occRef $ Just a
234+ scheduleClear occRef
235+ propagate a subscribers
236+ , subscriberInvalidateHeight = \old -> do
237+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
238+ , subscriberRecalculateHeight = \new -> do
239+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
409240 }
410− return (es, occ)
241+ liftIO $ writeIORef occRef occ
242+ when (isJust occ) $ scheduleClear occRef
243+ let !subscribed = CacheSubscribed
244+ { _cacheSubscribed_subscribers = subscribers
245+ , _cacheSubscribed_weakSelf = weakSelf
246+ , _cacheSubscribed_parent = parentSub
247+ , _cacheSubscribed_cached = mSubscribedRef
248+ , _cacheSubscribed_occurrence = occRef
249+ }
250+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
251+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
252+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
411253
254+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
255+cleanupCacheSubscribed self = do
256+ unsubscribe $ _cacheSubscribed_parent self
257+ writeIORef (_cacheSubscribed_cached self) Nothing
412258
413259subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414260subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +266,13 @@ wrap tag getSpecificSubscribed sub = do
420266 let es = tag subd
421267 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422268
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
269+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424270eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425271
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429272eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
273+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431274
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
275+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433276eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434277
435278eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +281,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438281eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439282eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440283
441−eventHold :: Hold x p -> Event x p
284+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442285eventHold !h = Event $ subscribeHoldEvent h
443286
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
287+eventDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Event x p
445288eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446289
447290{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
291+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449292subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450293 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451294 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,75 +307,102 @@ data Subscriber x a = Subscriber
464307 , subscriberRecalculateHeight :: !(Height -> IO ())
465308 }
466309
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
310+--TODO: Move this comment to WeakBag
311+-- These function are constructor functions that are marked NOINLINE so they are
312+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
313+-- so any weak references that are attached to the constructors will have their
314+-- finalizer run. Using the opaque constructor, does not see the
315+-- constructor application, so it behaves like an IORef and cannot be fused away.
316+--
317+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
318+-- the weak pointer to it in some cases.
319+
320+newSubscriberHold :: (HasSpiderTimeline x, R.Patch p) => Hold x p -> IO (Subscriber x p)
468321newSubscriberHold h = return $ Subscriber
469322 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470323 , subscriberInvalidateHeight = \_ -> return ()
471324 , subscriberRecalculateHeight = \_ -> return ()
472325 }
473326
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
327+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
328+newSubscriberFan subscribed = return $ Subscriber
476329 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477330 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
331+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479332 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480333 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
334+ let f _ (Pair (Identity v) subsubs) = do
482335 propagate v $ _fanSubscribedChildren_list subsubs
483336 return $ Constant ()
484337 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485338 return ()
486339 , subscriberInvalidateHeight = \old -> do
340+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487341 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
342+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
343+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489344 , subscriberRecalculateHeight = \new -> do
345+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490346 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
347+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
348+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492349 }
493350
494351newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
352+newSubscriberSwitch subscribed = return $ Subscriber
496353 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
354+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497355 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498356 scheduleClear $ switchSubscribedOccurrence subscribed
499357 propagate a $ switchSubscribedSubscribers subscribed
500358 , subscriberInvalidateHeight = \_ -> do
359+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501360 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502361 when (oldHeight /= invalidHeight) $ do
503362 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
363+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
364+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
365+ , subscriberRecalculateHeight = \new -> do
366+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
367+ updateSwitchHeight new subscribed
368+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
369+ }
507370
508371newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
372+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510373 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
374+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511375 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512376 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513377 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514378 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515379 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517380 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518381 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519382 case occ of
520− Nothing ->
383+ Nothing -> do
521384 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522385 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
386+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
387+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525388 Just o -> do -- Since it's already firing, no need to adjust height
526389 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527390 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528391 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
392+ , subscriberInvalidateHeight = \_ -> do
393+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
394+ invalidateCoincidenceHeight subscribed
395+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
396+ , subscriberRecalculateHeight = \_ -> do
397+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
398+ recalculateCoincidenceHeight subscribed
399+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531400 }
532401
533402newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
403+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535404 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
405+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536406 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537407 case occ of
538408 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +410,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540410 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541411 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542412 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
413+ , subscriberInvalidateHeight = \_ -> do
414+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
415+ invalidateCoincidenceHeight subscribed
416+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
417+ , subscriberRecalculateHeight = \_ -> do
418+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
419+ recalculateCoincidenceHeight subscribed
420+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545421 }
546422
547423invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +427,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551427recalculateSubscriberHeight = flip subscriberRecalculateHeight
552428
553429-- | 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) $
430+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
431+propagate a subscribers = withIncreasedDepth $ do
563432 -- 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
564433 --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
434+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566435
567436--------------------------------------------------------------------------------
568437-- EventSubscribed
@@ -571,16 +440,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571440toAny :: a -> Any
572441toAny = unsafeCoerce
573442
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.
579443data EventSubscribed x = EventSubscribed
580444 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581445 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582446#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
447+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584448 , eventSubscribedHasOwnHeightRef :: !Bool
585449 , eventSubscribedWhoCreated :: !(IO [String])
586450#endif
@@ -607,23 +471,13 @@ eventSubscribedNever = EventSubscribed
607471 , eventSubscribedWhoCreated = return ["never"]
608472#endif
609473 }
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− }
620474
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
475+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622476eventSubscribedFan !subscribed = EventSubscribed
623477 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624478 , eventSubscribedRetained = toAny subscribed
625479#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
480+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627481 , eventSubscribedHasOwnHeightRef = False
628482 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629483#endif
@@ -636,7 +490,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636490#ifdef DEBUG_CYCLES
637491 , eventSubscribedGetParents = do
638492 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
493+ return [Some.This $ _eventSubscription_subscribed s]
640494 , eventSubscribedHasOwnHeightRef = True
641495 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642496#endif
@@ -649,8 +503,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649503#ifdef DEBUG_CYCLES
650504 , eventSubscribedGetParents = do
651505 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
506+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
507+ innerParents = maybeToList $ fmap Some.This innerSubscription
654508 return $ outerParent : innerParents
655509 , eventSubscribedHasOwnHeightRef = True
656510 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,29 +518,41 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664518whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665519whoCreatedEventSubscribed = eventSubscribedWhoCreated
666520
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
521+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668522walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
523+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670524 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671525 when (h == invalidHeight) $ do
672526 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
527+ modify (Some.This s :)
674528 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
529+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676530 return subscribers
677531#endif
678532
679533{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
534+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681535subscribeHoldEvent = subscribeAndRead . holdEvent
682536
537+--------------------------------------------------------------------------------
538+-- EventSubscription
539+--------------------------------------------------------------------------------
540+
541+data EventSubscription x = EventSubscription
542+ { _eventSubscription_unsubscribe :: !(IO ())
543+ , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
544+ }
545+
546+unsubscribe :: EventSubscription x -> IO ()
547+unsubscribe (EventSubscription u _) = u
548+
683549--------------------------------------------------------------------------------
684550-- Behavior
685551--------------------------------------------------------------------------------
686552
687553newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
688554
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
555+behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
690556behaviorHold !h = Behavior $ readHoldTracked h
691557
692558behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -700,7 +566,7 @@ behaviorPull !p = Behavior $ do
700566 val <- liftIO $ readIORef $ pullValue p
701567 case val of
702568 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
569+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704570 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705571 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706572 return $ pullSubscribedValue subscribed
@@ -709,7 +575,7 @@ behaviorPull !p = Behavior $ do
709575 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710576 parentsRef <- liftIO $ newIORef []
711577 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
578+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713579 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714580 parents <- liftIO $ readIORef parentsRef
715581 let subscribed = PullSubscribed
@@ -719,22 +585,22 @@ behaviorPull !p = Behavior $ do
719585 , pullSubscribedParents = parents
720586 }
721587 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
588+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723589 return a
724590
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
591+behaviorDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Behavior x (R.PatchTarget p)
726592behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
727593
728594{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
595+readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
730596readHoldTracked h = do
731597 result <- liftIO $ readIORef $ holdValue h
732598 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
599+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735600 return result
736601
737−{-# INLINABLE readBehaviorUntracked #-}
602+{-# SPECIALIZE readBehaviorUntracked :: HasSpiderTimeline x => Behavior x a -> BehaviorM x a #-}
603+{-# SPECIALIZE readBehaviorUntracked :: HasSpiderTimeline x => Behavior x a -> EventM x a #-}
738604readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739605readBehaviorUntracked b = do
740606 holdInits <- getDeferralQueue
@@ -744,49 +610,45 @@ readBehaviorUntracked b = do
744610-- Dynamic
745611--------------------------------------------------------------------------------
746612
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`?
613+data Dynamic x p = Dynamic
614+ { dynamicCurrent :: !(Behavior x (R.PatchTarget p))
615+ , dynamicUpdated :: !(Event x p)
752616 }
753617
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
618+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760619dynamicHold !h = Dynamic
761620 { dynamicCurrent = behaviorHold h
762621 , dynamicUpdated = eventHold h
763622 }
764623
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
624+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766625dynamicHoldIdentity = dynamicHold
767626
768−dynamicConst :: PatchTarget p -> DynamicS x p
627+dynamicConst :: R.PatchTarget p -> Dynamic x p
769628dynamicConst !a = Dynamic
770629 { dynamicCurrent = behaviorConst a
771630 , dynamicUpdated = eventNever
772631 }
773632
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
633+dynamicDyn :: (HasSpiderTimeline x, R.Patch p) => Dyn x p -> Dynamic x p
775634dynamicDyn !d = Dynamic
776635 { dynamicCurrent = behaviorDyn d
777636 , dynamicUpdated = eventDyn d
778637 }
779638
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
639+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781640dynamicDynIdentity = dynamicDyn
782641
783642--------------------------------------------------------------------------------
784643-- Combinators
785644--------------------------------------------------------------------------------
786645
646+--TODO: Figure out why certain things are not 'representational', then make them
647+--representational so we can use coerce
648+
787649--type role Hold representational
788650data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
651+ = Hold { holdValue :: !(IORef (R.PatchTarget p))
790652 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791653 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
792654 , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
@@ -795,46 +657,13 @@ data Hold x p
795657#endif
796658 }
797659
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−
829660data EventEnv x
830661 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831662 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833663 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834664 , 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])
665+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
666+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838667 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839668 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840669 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +674,7 @@ runEventM :: EventM x a -> IO a
845674runEventM = unEventM
846675
847676asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
677+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
849678
850679class MonadIO m => Defer a m where
851680 getDeferralQueue :: m (IORef [a])
@@ -864,11 +693,7 @@ instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
864693 {-# INLINE getDeferralQueue #-}
865694 getDeferralQueue = asksEventEnv eventEnvHoldInits
866695
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
870−
871−instance Defer (SomeHoldInit x) (BehaviorM x) where
696+instance HasSpiderTimeline x => Defer (SomeHoldInit x) (BehaviorM x) where
872697 {-# INLINE getDeferralQueue #-}
873698 getDeferralQueue = BehaviorM $ asks snd
874699
@@ -895,48 +720,41 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
895720 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896721
897722class HasSpiderTimeline x where
898− -- | Retrieve the current SpiderTimelineEnv
899− spiderTimeline :: SpiderTimelineEnv x
723+ -- | Retrieve the current SpiderTimeline
724+ spiderTimeline :: SpiderTimeline x
900725
901726instance HasSpiderTimeline Global where
902− spiderTimeline = globalSpiderTimelineEnv
727+ spiderTimeline = globalSpiderTimeline
903728
904729putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905730putCurrentHeight h = do
906731 heightRef <- asksEventEnv eventEnvCurrentHeight
907732 liftIO $ writeIORef heightRef $! h
908733
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
734+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910735 {-# INLINE getDeferralQueue #-}
911736 getDeferralQueue = asksEventEnv eventEnvClears
912737
913738{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
739+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
740+scheduleClear r = defer $ SomeClear r
916741
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918− {-# INLINE getDeferralQueue #-}
919− getDeferralQueue = asksEventEnv eventEnvIntClears
920−
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
924−
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
742+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926743 {-# INLINE getDeferralQueue #-}
927744 getDeferralQueue = asksEventEnv eventEnvRootClears
928745
929746{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
747+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
748+scheduleRootClear r = defer $ SomeRootClear r
932749
933750instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934751 {-# INLINE getDeferralQueue #-}
935752 getDeferralQueue = asksEventEnv eventEnvResetCoincidences
936753
937754-- Note: hold cannot examine its event until after the phase is over
938−{-# INLINE [1] hold #-}
939−hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
755+{-# SPECIALIZE hold :: (HasSpiderTimeline x, R.Patch p) => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
756+{- SPECIALIZE hold :: (HasSpiderTimeline x, R.Patch p) => R.PatchTarget p -> Event x p -> ComputeM x (Hold x p) #-}
757+hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
940758hold v0 e = do
941759 valRef <- liftIO $ newIORef v0
942760 invsRef <- liftIO $ newIORef []
@@ -957,7 +775,7 @@ hold v0 e = do
957775 return h
958776
959777{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
778+getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, R.Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961779getHoldEventSubscription h = do
962780 ep <- liftIO $ readIORef $ holdParent h
963781 case ep of
@@ -971,7 +789,7 @@ getHoldEventSubscription h = do
971789 Nothing -> return ()
972790 Just o -> do
973791 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
792+ case R.apply o old of
975793 Nothing -> return ()
976794 Just new -> do
977795 -- Need to evaluate these so that we don't retain the Hold itself
@@ -983,9 +801,9 @@ getHoldEventSubscription h = do
983801
984802type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985803
804+--type role BehaviorM representational
986805-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
806+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989807
990808instance Monad (BehaviorM x) where
991809 {-# INLINE (>>=) #-}
@@ -994,16 +812,14 @@ instance Monad (BehaviorM x) where
994812 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995813 {-# INLINE return #-}
996814 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998815 {-# INLINE fail #-}
999816 fail s = BehaviorM $ fail s
1000−#endif
1001817
1002818data BehaviorSubscribed x a
1003819 = forall p. BehaviorSubscribedHold (Hold x p)
1004820 | BehaviorSubscribedPull (PullSubscribed x a)
1005821
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
822+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007823
1008824--type role PullSubscribed representational
1009825data PullSubscribed x a
@@ -1038,15 +854,13 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038854#endif
1039855 }
1040856
1041−data Root x k
857+data Root x (k :: * -> *)
1042858 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043859 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044860 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1045861 }
1046862
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1048−
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
863+data SomeHoldInit x = forall p. R.Patch p => SomeHoldInit !(Hold x p)
1050864
1051865data SomeMergeUpdate x = SomeMergeUpdate
1052866 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
@@ -1057,14 +871,18 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057871newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058872
1059873-- 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)
874+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
1061875
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
876+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1063877
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067− }
878+instance Defer (SomeHoldInit x) (ComputeM x) where
879+ getDeferralQueue = ComputeM ask
880+
881+{-# SPECIALIZE runComputeM :: HasSpiderTimeline x => ComputeM x a -> EventM x a #-}
882+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
883+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
884+
885+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1068886
1069887data HeightBag = HeightBag
1070888 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +900,7 @@ heightBagFromList :: [Height] -> HeightBag
1082900heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083901
1084902heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
903+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087904
1088905heightBagRemove :: Height -> HeightBag -> HeightBag
1089906heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +909,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092909 0 -> IntMap.delete h c
1093910 _ -> IntMap.insert h (pred old) c
1094911
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−
1102912heightBagMax :: HeightBag -> Height
1103913heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104914 Just ((h, _), _) -> Height h
@@ -1116,25 +926,25 @@ heightBagVerify b@(HeightBag s c) = if
1116926heightBagVerify = id
1117927#endif
1118928
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)))
929+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
930+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
931+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
932+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1123933 }
1124934
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
935+data FanSubscribed (x :: *) k
936+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
937+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
938+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129939 , fanSubscribedParent :: !(EventSubscription x)
1130940#ifdef DEBUG_NODEIDS
1131941 , fanSubscribedNodeId :: Int
1132942#endif
1133943 }
1134944
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
945+data Fan x k
946+ = Fan { fanParent :: !(Event x (DMap k Identity))
947+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1138948 }
1139949
1140950data SwitchSubscribed x a
@@ -1158,9 +968,7 @@ data Switch x a
1158968 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
1159969 }
1160970
1161−#ifdef USE_TEMPLATE_HASKELL
1162971{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163−#endif
1164972data CoincidenceSubscribed x a
1165973 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
1166974 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1188,35 +996,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
1188996newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189997newInvalidatorPull p = return $! InvalidatorPull p
1190998
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
999+instance HasSpiderTimeline x => R.FunctorMaybe (Event x) where
1000+ fmapMaybe f = push $ return . f
11931001
11941002instance HasSpiderTimeline x => Align (Event x) where
11951003 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)
1004+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
12121005
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1006+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (R.PatchTarget p), Event x p) (Hold x p)) }
12141007
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)
1008+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1009+newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171010
12181011--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)
1012+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201013zipDynWith f da db =
12211014 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221015 ec = flip push eab $ \o -> do
@@ -1229,70 +1022,75 @@ zipDynWith f da db =
12291022 return (a, b)
12301023 These (Identity a) (Identity b) -> return (a, b)
12311024 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1025+ in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331026
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
1027+unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1028+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1029+ where x = (readV0, v')
12401030
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1031+newJoinDyn :: HasSpiderTimeline x => Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1032+newJoinDyn d =
1033+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1034+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1035+ eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1036+ eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1037+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1038+ in unsafeDyn readV0 v'
12441039
12451040-- ResultM can read behaviors and events
12461041type ResultM = EventM
12471042
1043+{-# NOINLINE unsafeNewIORef #-}
1044+unsafeNewIORef :: a -> b -> IORef b
1045+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1046+
12481047instance HasSpiderTimeline x => Functor (Event x) where
12491048 fmap f = push $ return . Just . f
12501049
12511050instance Functor (Behavior x) where
12521051 fmap f = pull . fmap f . readBehaviorTracked
12531052
1254−{-# INLINE push #-}
1053+{-# INLINABLE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
12551054push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
12561055push f e = cacheEvent (pushCheap f e)
1056+{-
1057+push f e = eventPush $ Push
1058+ { pushCompute = f
1059+ , pushParent = e
1060+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1061+ }
1062+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1063+-}
12571064
12581065{-# INLINABLE pull #-}
12591066pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1067+pull a = behaviorPull $ Pull
1068+ { pullCompute = a
1069+ , pullValue = unsafeNewIORef a Nothing
12621070#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1071+ , pullNodeId = unsafeNodeId a
12641072#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1073+ }
12721074
12731075{-# INLINABLE switch #-}
12741076switch :: 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− }
1077+switch a = eventSwitch $ Switch
1078+ { switchParent = a
1079+ , switchSubscribed = unsafeNewIORef a Nothing
1080+ }
12811081
12821082coincidence :: 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− }
1083+coincidence a = eventCoincidence $ Coincidence
1084+ { coincidenceParent = a
1085+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1086+ }
12891087
12901088-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911089run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921090run roots after = do
12931091 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
1092+ spiderTimeline <- SpiderHost ask
1093+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ unSpiderHost $ runFrame $ do
12961094 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971095 occBefore <- liftIO $ do
12981096 occBefore <- readIORef occRef
@@ -1330,11 +1128,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301128 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311129 EQ -> a
13321130
1333−newtype Clear a = Clear (IORef (Maybe a))
1131+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13341132
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1336−
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1133+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381134
13391135data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401136
@@ -1346,110 +1142,55 @@ mkWeakPtrWithDebug x debugNote = do
13461142 x' <- evaluate x
13471143 mkWeakPtr x' $
13481144 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1145+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501146 else Nothing
13511147
13521148type WeakList a = [Weak a]
13531149
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−
13811150{-# 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
1151+#ifdef DEBUG
1152+withIncreasedDepth :: CanTrace x m => m a -> m a
1153+withIncreasedDepth a = do
1154+ spiderTimeline <- askSpiderTimeline
1155+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851156 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1157+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871158 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−
14121159#else
1160+withIncreasedDepth :: m a -> m a
1161+withIncreasedDepth = id
1162+#endif
14131163
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1164+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171165
14181166{-# INLINE tracePropagate #-}
14191167tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1168+tracePropagate p = traceWhen p debugPropagate
14211169
14221170{-# INLINE traceInvalidate #-}
14231171traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1172+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14371173
1174+{-# INLINE traceWhen #-}
1175+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1176+traceWhen p b message = traceMWhen p b $ return message
14381177
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1447−
1178+{-# INLINE traceMWhen #-}
1179+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1180+traceMWhen _ b getMessage = when b $ do
1181+ message <- getMessage
1182+#ifdef DEBUG
1183+ spiderTimeline <- askSpiderTimeline
1184+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1185+#else
1186+ let d = 0
14481187#endif
1188+ liftIO $ putStrLn $ replicate d ' ' <> message
14491189
14501190whoCreatedIORef :: IORef a -> IO [String]
14511191whoCreatedIORef (IORef a) = whoCreated $! a
14521192
1193+#ifdef DEBUG_CYCLES
14531194groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541195groupByHead = \case
14551196 [] -> []
@@ -1460,54 +1201,20 @@ groupByHead = \case
14601201 | otherwise -> (x, xs :| []) : l
14611202
14621203listsToForest :: 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−
1204+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951205#endif
14961206
1497−
14981207{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1208+propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, R.Patch p) => Hold x p -> p -> EventM x ()
15001209propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1210+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021211 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031212 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051213 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1214+ case {-# SCC "apply" #-} R.apply a v of
15071215 Nothing -> return ()
15081216 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1217+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111218 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121219 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131220 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,53 +1222,56 @@ propagateSubscriberHold h a = do
15151222data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161223
15171224runBehaviorM :: 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)
1225+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191226
15201227askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211228askInvalidator = do
1522− (!m, _) <- ask
1229+ (!m, _) <- BehaviorM ask
15231230 case m of
15241231 Nothing -> return Nothing
15251232 Just (!wi, _) -> return $ Just wi
15261233
15271234askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281235askParentsRef = do
1529− (!m, _) <- ask
1236+ (!m, _) <- BehaviorM ask
15301237 case m of
15311238 Nothing -> return Nothing
15321239 Just (_, !p) -> return $ Just p
15331240
15341241askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351242askBehaviorHoldInits = do
1536− (_, !his) <- ask
1243+ (_, !his) <- BehaviorM ask
15371244 return his
15381245
15391246{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1247+getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
15411248getDynHold d = do
15421249 mh <- liftIO $ readIORef $ unDyn d
15431250 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1251+ Right h -> return h
1252+ Left (readV0, v') -> do
15461253 holdInits <- getDeferralQueue
15471254 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
15541255 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1256+ liftIO $ writeIORef (unDyn d) $ Right h
15561257 return h
15571258
1558−
15591259-- Always refers to 0
15601260{-# NOINLINE zeroRef #-}
15611261zeroRef :: IORef Height
15621262zeroRef = unsafePerformIO $ newIORef zeroHeight
15631263
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)
1264+type CanSubscribe x m =
1265+ ( HasSpiderTimeline x
1266+ , HasCurrentHeight x m
1267+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1268+ , Defer SomeClear m -- Wiping out event firings
1269+ , Defer (SomeAssignment x) m -- Updating state
1270+ , Defer (SomeResetCoincidence x) m
1271+ , m ~ EventM x
1272+ )
1273+
1274+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651275getRootSubscribed k r sub = do
15661276 mSubscribed <- readIORef $ rootSubscribed r
15671277 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,15 +1285,10 @@ getRootSubscribed k r sub = do
15751285 let !cached = rootSubscribed r
15761286 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771287 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1288+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811289 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821290 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
1586− let !subscribed = RootSubscribed
1291+ let subscribed = RootSubscribed
15871292 { rootSubscribedKey = k
15881293 , rootSubscribedCachedSubscribed = cached
15891294 , rootSubscribedOccurrence = getOcc
@@ -1591,29 +1296,17 @@ getRootSubscribed k r sub = do
15911296 , rootSubscribedUninit = uninit
15921297 , rootSubscribedWeakSelf = weakSelf
15931298#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1299+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951300#endif
15961301 }
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)
1302+ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
16081303 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
16091304 occ <- getOcc
16101305 return (sln, subscribed, occ)
16111306
1612−#ifdef USE_TEMPLATE_HASKELL
16131307{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614−#endif
16151308cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1309+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
16171310 rootSubscribedUninit self
16181311 modifyIORef' cached $ DMap.delete k
16191312
@@ -1621,90 +1314,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211314subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221315subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231316
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))
1317+{-# SPECIALIZE getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1318+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)
17081319getFanSubscribed k f sub = do
17091320 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101321 case mSubscribed of
@@ -1722,16 +1333,13 @@ getFanSubscribed k f sub = do
17221333 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231334 occRef <- liftIO $ newIORef parentOcc
17241335 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281336 let subscribed = FanSubscribed
17291337 { fanSubscribedCachedSubscribed = fanSubscribed f
17301338 , fanSubscribedOccurrence = occRef
17311339 , fanSubscribedParent = subscription
17321340 , fanSubscribedSubscribers = subscribersRef
17331341#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1342+ , fanSubscribedNodeId = unsafeNodeId f
17351343#endif
17361344 }
17371345 let !self = (k, subscribed)
@@ -1741,7 +1349,7 @@ getFanSubscribed k f sub = do
17411349 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421350 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431351
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1352+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451353cleanupFanSubscribed (k, subscribed) = do
17461354 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471355 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1361,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531361 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541362
17551363{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1364+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571365subscribeFanSubscribed k subscribed sub = do
17581366 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591367 case DMap.lookup k subscribers of
@@ -1765,8 +1373,8 @@ subscribeFanSubscribed k subscribed sub = do
17651373 return sln
17661374 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671375
1768−{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1376+{-# SPECIALIZE getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a) #-}
1377+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)
17701378getSwitchSubscribed s sub = do
17711379 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721380 case mSubscribed of
@@ -1791,9 +1399,6 @@ getSwitchSubscribed s sub = do
17911399 when (isJust parentOcc) $ scheduleClear occRef
17921400 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931401 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971402 let !subscribed = SwitchSubscribed
17981403 { switchSubscribedCachedSubscribed = switchSubscribed s
17991404 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1411,7 @@ getSwitchSubscribed s sub = do
18061411 , switchSubscribedCurrentParent = subscriptionRef
18071412 , switchSubscribedWeakSelf = weakSelf
18081413#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1414+ , switchSubscribedNodeId = unsafeNodeId s
18101415#endif
18111416 }
18121417 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1824,8 +1429,8 @@ cleanupSwitchSubscribed subscribed = do
18241429subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18251430subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261431
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1432+{-# SPECIALIZE getCoincidenceSubscribed :: HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a) #-}
1433+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)
18291434getCoincidenceSubscribed c sub = do
18301435 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311436 case mSubscribed of
@@ -1851,9 +1456,6 @@ getCoincidenceSubscribed c sub = do
18511456 scheduleClear innerSubdRef
18521457 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531458 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571459 let subscribed = CoincidenceSubscribed
18581460 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591461 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1466,7 @@ getCoincidenceSubscribed c sub = do
18641466 , coincidenceSubscribedInnerParent = innerSubdRef
18651467 , coincidenceSubscribedWeakSelf = weakSelf
18661468#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1469+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681470#endif
18691471 }
18701472 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,497 +1483,212 @@ cleanupCoincidenceSubscribed subscribed = do
18811483subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821484subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831485
1884−{-# INLINE mergeG #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886− => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1889−
1890−{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1895−
1896−{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1903− where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905− updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1906− let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1907− (mOldSubd, newPs) <- case me of
1908− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1909− Just e -> do
1910− let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1912− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1913− let newParent = MergeSubscribedParent subscription
1914− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916− forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1920− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921− return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922− foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1925− getInitialSubscribers initialParents subscriber = do
1926− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1927− let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1929− height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1934− )
1935−
1936− destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1937− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1938−
1939−{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1945− where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947− updateMe subscriber heightBagRef oldParents p = do
1948− -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1950− subscribeParent k e = do
1951− keyRef <- liftIO $ newIORef k
1952− let s = subscriber $ liftIO $ readIORef keyRef
1953− subscription@(EventSubscription _ subd) <- subscribe e s
1954− liftIO $ do
1955− newParentHeight <- getEventSubscribedHeight subd
1956− modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957− return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1959− -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961− moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962− Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1966− liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967− return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968− Just toKey -> do
1969− liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970− return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1974− return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976− getInitialSubscribers initialParents subscriber = do
1977− subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1978− keyRef <- liftIO $ newIORef k
1979− let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1981− height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983− return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984− , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985− , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1986− )
1987−
1988− destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1989− destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1990−
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1993− -> IORef HeightBag
1994− -> DMap k s
1995− -> p
1996− -> EventM x ([EventSubscription x], DMap k s)
1997−
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
2000−type MergeInitFunc k v q x s
2001− = DMap k q
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
2004−
2005−type MergeDestroyFunc k s
2006− = DMap k s
2007− -> IO ()
2008−
2009−data Merge x k v s = Merge
2010− { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011− , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012− , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
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
1486+{-# INLINE merge #-}
1487+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1488+merge d = cacheEvent $ Event $ \sub -> do
21101489 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111490 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121491 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131492 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
1493+ parentsRef <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1494+ let scheduleSelf height = scheduleMerge' height heightRef $ do
1495+ m <- liftIO $ readIORef accumRef
1496+ liftIO $ writeIORef accumRef $! DMap.empty
1497+ --TODO: Assert that m is not empty
1498+ subscriberPropagate sub m
1499+ invalidateMyHeight = do
1500+ oldHeight <- readIORef heightRef
1501+ 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
1502+ writeIORef heightRef $! invalidHeight
1503+ subscriberInvalidateHeight sub oldHeight
1504+ revalidateMyHeight = do
21971505 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?
1506+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
21991507 heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
2201− case heightBagSize heights `compare` numParents of
1508+ parents <- readIORef parentsRef
1509+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1510+ case heightBagSize heights `compare` DMap.size parents of
22021511 LT -> return ()
22031512 EQ -> do
22041513 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1514+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061515 writeIORef heightRef $! height
22071516 subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209− mySubscriber k = Subscriber
1517+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge"
1518+ subscriber :: forall a. k a -> Subscriber x a
1519+ subscriber k = Subscriber
22101520 { 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
1521+ oldM <- liftIO $ readIORef accumRef
1522+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1523+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1524+ liftIO $ writeIORef accumRef $! newM
1525+ when (DMap.null oldM) $ do -- Only schedule the firing once
1526+ height <- liftIO $ readIORef heightRef
1527+ --TODO: assertions about height
1528+ currentHeight <- getCurrentHeight
1529+ when (height <= currentHeight) $ do
1530+ if height /= invalidHeight
1531+ then do
1532+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1533+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1534+ else liftIO $ do
1535+#ifdef DEBUG_CYCLES
1536+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1537+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1538+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1539+#else
1540+ let cycleInfo = ""
1541+#endif
1542+ error $ "Causality loop found" <> cycleInfo
1543+ scheduleSelf height
1544+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
22171545 modifyIORef' heightBagRef $ heightBagRemove old
22181546 invalidateMyHeight
22191547 , subscriberRecalculateHeight = \new -> do
22201548 modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
1549+ revalidateMyHeight
22221550 }
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
1551+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1552+ let s = subscriber k
1553+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1554+ height <- liftIO $ getEventSubscribedHeight parentSubd
1555+ return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1556+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1557+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1558+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1559+ myHeight = if invalidHeight `elem` heights
1560+ then invalidHeight
1561+ else succHeight $ heightBagMax myHeightBag
22381562 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
1563+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1564+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1565+ else (Nothing, dm)
1566+ unless (DMap.null accum) $ do
1567+ scheduleSelf myHeight
1568+ occRef <- liftIO $ newIORef occ
1569+ when (isJust occ) $ scheduleClear occRef
1570+ liftIO $ writeIORef accumRef $! accum
1571+ liftIO $ writeIORef heightRef $! myHeight
1572+ liftIO $ writeIORef heightBagRef $! myHeightBag
1573+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1574+ liftIO $ writeIORef parentsRef $! DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1575+ let updateMe (R.PatchDMap p) = do
1576+ oldParents <- liftIO $ readIORef parentsRef
1577+ let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1578+ (mOldSubd, newPs) <- case me of
1579+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1580+ Just e -> do
1581+ let s = subscriber k
1582+ subscription@(EventSubscription _ subd) <- subscribe e s
1583+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1584+ let newParent = MergeSubscribedParent subscription
1585+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1586+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1587+ forM_ mOldSubd $ \oldSubd -> do
1588+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1589+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1590+ return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1591+ (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
1592+ liftIO $ writeIORef parentsRef $! newParents
1593+ return subscriptionsToKill
22461594 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
1595+ let s = Subscriber
22641596 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266− defer $ updateMe a
1597+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1598+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
22671599 , subscriberInvalidateHeight = \_ -> return ()
22681600 , subscriberRecalculateHeight = \_ -> return ()
22691601 }
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)
1602+ (EventSubscription _ changeSubd, change) <- subscribeAndRead (dynamicUpdated d) s
1603+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
1604+ liftIO $ writeIORef changeSubdRef (s, changeSubd)
1605+ let unsubscribeAll = do
1606+ parents <- readIORef parentsRef
1607+ forM_ (DMap.toList parents) $ \(_ :=> MergeSubscribedParent s) -> unsubscribe s
1608+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1609+ , occ
1610+ )
22801611
22811612newtype 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) }
22831613
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1614+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1615+fan e =
22871616 let f = Fan
22881617 { fanParent = e
2289− , fanSubscribed = ref
1618+ , fanSubscribed = unsafeNewIORef e Nothing
22901619 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1620+ in EventSelector $ \k -> eventFan k f
22921621
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1622+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1623+runHoldInits holdInitRef mergeInitRef = do
22951624 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
22971625 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1626+ unless (null holdInits && null mergeInits) $ do
22991627 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
23011628 liftIO $ writeIORef mergeInitRef []
23021629 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
23041630 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1631+ runHoldInits holdInitRef mergeInitRef
23061632
23071633initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
23081634initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
23091635
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
2312−
23131636newEventEnv :: IO (EventEnv x)
23141637newEventEnv = do
23151638 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
23161639 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
23181640 mergeUpdateRef <- newIORef []
23191641 mergeInitRef <- newIORef []
23201642 heightRef <- newIORef zeroHeight
23211643 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231644 toClearRootRef <- newIORef []
23241645 coincidenceInfosRef <- newIORef []
23251646 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1647+ return $ EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23271648
23281649clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1650+clearEventEnv (EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
23301651 writeIORef toAssignRef []
23311652 writeIORef holdInitRef []
2332− writeIORef dynInitRef []
23331653 writeIORef mergeUpdateRef []
23341654 writeIORef mergeInitRef []
23351655 writeIORef heightRef zeroHeight
23361656 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
23381657 writeIORef toClearRootRef []
23391658 writeIORef coincidenceInfosRef []
23401659 writeIORef delayedRef IntMap.empty
23411660
23421661-- | Run an event action outside of a frame
23431662runFrame :: 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)
1663+runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
1664+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimeline x)
23461665 let go = do
23471666 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
1667+ 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
23491668 return result
23501669 result <- runEventM go
23511670 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
1671+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23551672 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1673+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23571674 toAssign <- readIORef $ eventEnvAssignments env
23581675 toReconnectRef <- newIORef []
23591676 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23601677 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611678 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1679+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631680 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23641681 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23651682 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1683+ when debugPropagate $ putStrLn "Updating merges"
23671684 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1685+ when debugPropagate $ putStrLn "Updating merges done"
23691686 toReconnect <- readIORef toReconnectRef
23701687 clearEventEnv env
23711688 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721689 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731690 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1691+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751692 finalize wi
23761693 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771694 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2379,13 +1696,13 @@ runFrame a = SpiderHost $ do
23791696 writeIORef (switchSubscribedBehaviorParents subscribed) []
23801697 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
23811698 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
1699+ 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
23831700 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841701 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
1702+ 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
23861703 {-
23871704 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1705+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891706 EventRoot _ -> "EventRoot"
23901707 EventNever -> "EventNever"
23911708 _ -> "something else"
@@ -2400,7 +1717,7 @@ runFrame a = SpiderHost $ do
24001717 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011718 when (parentHeight /= myHeight) $ do
24021719 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1720+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24041721 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
24051722 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061723 unsubscribe subscription
@@ -2441,7 +1758,7 @@ invalidateCoincidenceHeight subscribed = do
24411758 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421759 when (oldHeight /= invalidHeight) $ do
24431760 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1761+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451762
24461763updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471764updateSwitchHeight new subscribed = do
@@ -2449,7 +1766,7 @@ updateSwitchHeight new subscribed = do
24491766 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501767 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511768 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1769+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531770
24541771recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551772recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1775,7 @@ recalculateCoincidenceHeight subscribed = do
24581775 height <- calculateCoincidenceHeight subscribed
24591776 when (height /= invalidHeight) $ do
24601777 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1778+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621779
24631780calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641781calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,227 +1814,40 @@ invalidate toReconnectRef wis = do
24971814-- Reflex integration
24981815--------------------------------------------------------------------------------
24991816
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
25041817-- | The default, global Spider environment
25051818type Spider = SpiderTimeline Global
25061819
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
1820+-- | Designates the default, global Spider timeline
1821+data Global
25751822
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 #-}
1823+{-# NOINLINE globalSpiderTimeline #-}
1824+globalSpiderTimeline :: SpiderTimeline Global
1825+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
25791826
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)
1827+-- | Stores all global data relevant to a particular Spider timeline; only one
1828+-- value should exist for each type @x@
1829+data SpiderTimeline x = SpiderTimeline
1830+ { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
1831+ , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
1832+#ifdef DEBUG
1833+ , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
25841834#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
1835+ }
1836+type role SpiderTimeline nominal
27071837
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
1838+instance GEq SpiderTimeline where
1839+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1840+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
1841+ else Nothing
27121842
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
1843+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
1844+unsafeNewSpiderTimeline = do
27151845 lock <- newMVar ()
27161846 env <- newEventEnv
27171847#ifdef DEBUG
27181848 depthRef <- newIORef 0
27191849#endif
2720− return $ STE $ SpiderTimelineEnv
1850+ return $ SpiderTimeline
27211851 { _spiderTimeline_lock = lock
27221852 , _spiderTimeline_eventEnv = env
27231853#ifdef DEBUG
@@ -2725,61 +1855,56 @@ unsafeNewSpiderTimelineEnv = do
27251855#endif
27261856 }
27271857
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
1858+-- | Create a new SpiderTimeline
1859+newSpiderTimeline :: IO (Some SpiderTimeline)
1860+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27311861
2732−data LocalSpiderTimeline (x :: Type) s
1862+-- | Pass a new timeline to the given function.
1863+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
1864+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
27331865
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
1866+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27371867
2738−localSpiderTimeline
2739− :: proxy s
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
1868+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27431869
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
1870+instance HasSpiderTimeline x => Functor (R.Dynamic (SpiderTimeline x)) where
1871+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
27491872
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
1873+instance HasSpiderTimeline x => Applicative (R.Dynamic (SpiderTimeline x)) where
1874+ pure = SpiderDynamic . dynamicConst
1875+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
1876+ _ *> b = b
1877+ a <* _ = a
27531878
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1879+instance HasSpiderTimeline x => Monad (R.Dynamic (SpiderTimeline x)) where
1880+ {-# INLINE return #-}
1881+ return = pure
1882+ {-# INLINE (>>=) #-}
1883+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
1884+ {-# INLINE (>>) #-}
1885+ _ >> y = y
1886+ {-# INLINE fail #-}
1887+ fail _ = error "Dynamic does not support 'fail'"
27551888
27561889instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757− {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27581890 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27591891 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 }
1892+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
1893+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27621894 type PullM (SpiderTimeline x) = SpiderPullM x
27631895 type PushM (SpiderTimeline x) = SpiderPushM x
27641896 {-# INLINABLE never #-}
27651897 never = SpiderEvent eventNever
27661898 {-# INLINABLE constant #-}
27671899 constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
1900+ {-# INLINABLE push #-}
27691901 push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27721902 {-# INLINABLE pull #-}
27731903 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
1904+ {-# INLINABLE merge #-}
1905+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
1906+ {-# INLINABLE fan #-}
1907+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27831908 {-# INLINABLE switch #-}
27841909 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27851910 {-# INLINABLE coincidence #-}
@@ -2787,31 +1912,73 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27871912 {-# INLINABLE current #-}
27881913 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27891914 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
1915+ updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
27911916 {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
1917+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
27931918 {-# 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
1919+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
1920+ {-# INLINABLE mergeIncremental #-}
1921+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
27991922 {-# INLINABLE currentIncremental #-}
28001923 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28011924 {-# INLINABLE updatedIncremental #-}
28021925 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
28031926 {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
1927+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
28051928 c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
1929+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
28071930 eventCoercion Coercion = Coercion
28081931 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))
1932+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
1933+
1934+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (EventM x) where
1935+ {-# INLINABLE sample #-}
1936+ sample (SpiderBehavior b) = readBehaviorUntracked b
1937+
1938+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (EventM x) where
1939+ {-# INLINABLE hold #-}
1940+ hold = holdSpiderEventM
1941+ {-# INLINABLE holdDyn #-}
1942+ holdDyn = holdDynSpiderEventM
1943+ {-# INLINABLE holdIncremental #-}
1944+ holdIncremental = holdIncrementalSpiderEventM
1945+
1946+holdSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
1947+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1948+
1949+holdDynSpiderEventM :: HasSpiderTimeline x => a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
1950+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
1951+
1952+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, R.Patch p) => R.PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
1953+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
1954+
1955+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHost x) where
1956+ {-# INLINABLE hold #-}
1957+ hold v0 e = R.runHostFrame $ R.hold v0 e
1958+ {-# INLINABLE holdDyn #-}
1959+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
1960+ {-# INLINABLE holdIncremental #-}
1961+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
1962+
1963+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHost x) where
1964+ {-# INLINABLE sample #-}
1965+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
1966+
1967+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
1968+ {-# INLINABLE sample #-}
1969+ sample = coerce . readBehaviorTracked . unSpiderBehavior
1970+
1971+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
1972+ {-# INLINABLE sample #-}
1973+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
1974+
1975+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
1976+ {-# INLINABLE hold #-}
1977+ hold v0 e = R.current <$> R.holdDyn v0 e
1978+ {-# INLINABLE holdDyn #-}
1979+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
1980+ {-# INLINABLE holdIncremental #-}
1981+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
28151982
28161983data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28171984
@@ -2820,6 +1987,35 @@ data SpiderEventHandle x a = SpiderEventHandle
28201987 , spiderEventHandleValue :: IORef (Maybe a)
28211988 }
28221989
1990+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
1991+ {-# INLINABLE subscribeEvent #-}
1992+ subscribeEvent e = SpiderHostFrame $ do
1993+ --TODO: Unsubscribe eventually (manually and/or with weak ref)
1994+ val <- liftIO $ newIORef Nothing
1995+ subscription <- subscribe (unSpiderEvent e) $ Subscriber
1996+ { subscriberPropagate = \a -> do
1997+ liftIO $ writeIORef val $ Just a
1998+ scheduleClear val
1999+ , subscriberInvalidateHeight = \_ -> return ()
2000+ , subscriberRecalculateHeight = \_ -> return ()
2001+ }
2002+ return $ SpiderEventHandle
2003+ { spiderEventHandleSubscription = subscription
2004+ , spiderEventHandleValue = val
2005+ }
2006+
2007+instance HasSpiderTimeline x => R.ReflexHost (SpiderTimeline x) where
2008+ type EventTrigger (SpiderTimeline x) = RootTrigger x
2009+ type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2010+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2011+
2012+instance HasSpiderTimeline x => R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2013+ {-# NOINLINE readEvent #-}
2014+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2015+ result <- readIORef $ spiderEventHandleValue h
2016+ touch h
2017+ return result
2018+
28232019instance MonadRef (EventM x) where
28242020 type Ref (EventM x) = Ref IO
28252021 {-# INLINABLE newRef #-}
@@ -2834,7 +2030,7 @@ instance MonadAtomicRef (EventM x) where
28342030 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352031
28362032-- | 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)
2033+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382034
28392035instance Monad (SpiderHost x) where
28402036 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2039,20 @@ instance Monad (SpiderHost x) where
28432039 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442040 {-# INLINABLE return #-}
28452041 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
28522042 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2043+ fail s = SpiderHost $ fail s
28542044
28552045-- | Run an action affecting the global Spider timeline; this will be guarded by
28562046-- a mutex for that timeline
28572047runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2048+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
28592049
28602050-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612051-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2052+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2053+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
28642054
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2055+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672056
28682057instance Monad (SpiderHostFrame x) where
28692058 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2061,26 @@ instance Monad (SpiderHostFrame x) where
28722061 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732062 {-# INLINABLE return #-}
28742063 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762064 {-# INLINABLE fail #-}
28772065 fail s = SpiderHostFrame $ fail s
2878−#endif
28792066
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
2067+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2068+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
28832069
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2070+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2071+ {-# INLINABLE hold #-}
2072+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2073+ {-# INLINABLE holdDyn #-}
2074+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2075+ {-# INLINABLE holdIncremental #-}
2076+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2077+
2078+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852079newEventWithTriggerIO f = do
28862080 es <- newFanEventWithTriggerIO $ \Refl -> f
28872081 return $ select es Refl
28882082
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2083+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902084newFanEventWithTriggerIO f = do
28912085 occRef <- newIORef DMap.empty
28922086 subscribedRef <- newIORef DMap.empty
@@ -2897,8 +2091,41 @@ newFanEventWithTriggerIO f = do
28972091 }
28982092 return $ EventSelector $ \k -> eventRoot k r
28992093
2094+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2095+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2096+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2097+ es <- newFanEventWithTriggerIO f
2098+ return $ R.EventSelector $ SpiderEvent . select es
2099+
2100+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2101+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2102+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2103+ es <- newFanEventWithTriggerIO f
2104+ return $ R.EventSelector $ SpiderEvent . select es
2105+
2106+instance HasSpiderTimeline x => R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2107+ {-# INLINABLE subscribeEvent #-}
2108+ subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2109+
29002110newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
29012111
2112+instance HasSpiderTimeline x => R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2113+ {-# INLINABLE sample #-}
2114+ sample = ReadPhase . R.sample
2115+
2116+instance HasSpiderTimeline x => R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2117+ {-# INLINABLE hold #-}
2118+ hold v0 e = ReadPhase $ R.hold v0 e
2119+ {-# INLINABLE holdDyn #-}
2120+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2121+ {-# INLINABLE holdIncremental #-}
2122+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2123+
2124+instance HasSpiderTimeline x => R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2125+ type ReadPhase (SpiderHost x) = ReadPhase x
2126+ fireEventsAndRead es (ReadPhase a) = run es a
2127+ runHostFrame = runFrame . runSpiderHostFrame
2128+
29022129instance MonadRef (SpiderHost x) where
29032130 type Ref (SpiderHost x) = Ref IO
29042131 newRef = SpiderHost . newRef
@@ -2921,10 +2148,9 @@ instance PrimMonad (SpiderHostFrame x) where
29212148 type PrimState (SpiderHostFrame x) = PrimState IO
29222149 primitive = SpiderHostFrame . EventM . primitive
29232150
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2151+--------------------------------------------------------------------------------
2152+-- Deprecated items
2153+--------------------------------------------------------------------------------
29272154
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()
2155+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2156+type SpiderEnv = SpiderTimeline