@@ -9,125 +9,67 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MagicHash #-}
13+{-# LANGUAGE MultiParamTypeClasses #-}
14+{-# LANGUAGE MultiWayIf #-}
1215{-# LANGUAGE RankNTypes #-}
1316{-# LANGUAGE RoleAnnotations #-}
1417{-# LANGUAGE ScopedTypeVariables #-}
1518{-# LANGUAGE TypeFamilies #-}
1619{-# LANGUAGE TypeOperators #-}
1720{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
24−#ifdef USE_REFLEX_OPTIMIZER
25−{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
26−#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2821-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2922-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30−module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
23+module Reflex.Spider.Internal where
3124
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
25+import Control.Applicative
3526import Control.Concurrent
3627import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
28+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3829import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
30+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4031import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
32+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4433import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
34+import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
4735import Data.Align
4836import Data.Coerce
49−import Data.Dependent.Map (DMap)
37+import Data.Dependent.Map (DMap, DSum (..))
5038import 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
5439import Data.Foldable hiding (concat, elem, sequence_)
55−import Data.Functor.Constant
56−import Data.Functor.Misc
57−import Data.Functor.Product
40+import Data.Function
41+import Data.Functor.Compose
5842import Data.GADT.Compare
5943import Data.IntMap.Strict (IntMap)
6044import qualified Data.IntMap.Strict as IntMap
6145import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
46+import Data.List hiding (foldl')
47+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
48+import qualified Data.List.NonEmpty as NonEmpty
49+import Data.Maybe
6450import Data.Monoid (mempty, (<>))
65−import Data.Proxy
51+import Data.Some (Some)
52+import qualified Data.Some as Some
6653import Data.These
6754import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
55+import Data.Tree (Forest, Tree (..), drawForest)
56+import Data.Word
7157import GHC.IORef (IORef (..))
7258import GHC.Stack
73−import Reflex.FastWeak
7459import System.IO.Unsafe
7560import System.Mem.Weak
7661import Unsafe.Coerce
7762
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
81−#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
85−#endif
86−
87−#ifdef DEBUG_CYCLES
88−import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
91−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92−import qualified Data.List.NonEmpty as NonEmpty
93−import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
95−
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
98−
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)
63+import Data.WeakBag (WeakBag, WeakBagTicket)
10464import qualified Data.WeakBag as WeakBag
105−import qualified Reflex.Class
10665import 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
118−
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
66+import qualified Reflex.Host.Class as R
12267
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"
68+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
69+import Prelude hiding (any, concat, mapM, mapM_, sequence)
12970
130−#endif
71+type SubscriberList a = WeakBag (Subscriber a)
72+type SubscriberListTicket a = WeakBagTicket (Subscriber a)
13173
13274debugPropagate :: Bool
13375
@@ -136,65 +78,79 @@ debugInvalidateHeight :: Bool
13678debugInvalidate :: Bool
13779
13880#ifdef DEBUG
81+
13982#define DEBUG_NODEIDS
14083
141−#ifdef DEBUG_TRACE_PROPAGATION
14284debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
14685
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
15086debugInvalidateHeight = False
151−#endif
15287
153−#ifdef DEBUG_TRACE_INVALIDATION
15488debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
15889
15990class HasNodeId a where
16091 getNodeId :: a -> Int
16192
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
93+instance HasNodeId (Hold p a) where
16994 getNodeId = holdNodeId
17095
171−instance HasNodeId (SwitchSubscribed x a) where
96+instance HasNodeId (PushSubscribed a b) where
97+ getNodeId = pushSubscribedNodeId
98+
99+instance HasNodeId (SwitchSubscribed a) where
172100 getNodeId = switchSubscribedNodeId
173101
174−instance HasNodeId (FanSubscribed x v a) where
102+instance HasNodeId (MergeSubscribed a) where
103+ getNodeId = mergeSubscribedNodeId
104+
105+instance HasNodeId (FanSubscribed a) where
175106 getNodeId = fanSubscribedNodeId
176107
177−instance HasNodeId (CoincidenceSubscribed x a) where
108+instance HasNodeId (CoincidenceSubscribed a) where
178109 getNodeId = coincidenceSubscribedNodeId
179110
180−instance HasNodeId (RootSubscribed x a) where
111+instance HasNodeId (RootSubscribed a) where
181112 getNodeId = rootSubscribedNodeId
182113
183−instance HasNodeId (Pull x a) where
114+instance HasNodeId (Pull a) where
184115 getNodeId = pullNodeId
185116
186117{-# INLINE showNodeId #-}
187118showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
119+showNodeId = ("#"<>) . show . getNodeId
120+
121+showSubscriberType :: Subscriber a -> String
122+showSubscriberType = \case
123+ SubscriberPush _ _ -> "SubscriberPush"
124+ SubscriberMerge _ _ -> "SubscriberMerge"
125+ SubscriberFan _ -> "SubscriberFan"
126+ SubscriberMergeChange _ -> "SubscriberMergeChange"
127+ SubscriberHold _ -> "SubscriberHold"
128+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
129+ SubscriberSwitch _ -> "SubscriberSwitch"
130+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
131+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
132+ SubscriberHandle -> "SubscriberHandle"
133+
134+showEventType :: Event a -> String
135+showEventType = \case
136+ EventRoot _ _ -> "EventRoot"
137+ EventNever -> "EventNever"
138+ EventPush _ -> "EventPush"
139+ EventMerge _ -> "EventMerge"
140+ EventFan _ _ -> "EventFan"
141+ EventSwitch _ -> "EventSwitch"
142+ EventCoincidence _ -> "EventCoincidence"
143+ EventHold _ -> "EventHold"
144+ EventDyn _ -> "EventDyn"
145+ EventHoldIdentity _ -> "EventHoldIdentity"
146+ EventDynIdentity _ -> "EventDynIdentity"
193147
194148#else
195149
196150debugPropagate = False
151+
197152debugInvalidateHeight = False
153+
198154debugInvalidate = False
199155
200156-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +158,6 @@ debugInvalidate = False
202158showNodeId :: a -> String
203159showNodeId _ = ""
204160
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209161#endif
210162
211163#ifdef DEBUG_NODEIDS
@@ -215,637 +167,220 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215167
216168newNodeId :: IO Int
217169newNodeId = 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− }
230170
231−unsubscribe :: EventSubscription x -> IO ()
232−unsubscribe (EventSubscription u _) = u
171+{-# NOINLINE unsafeNodeId #-}
172+unsafeNodeId :: a -> Int
173+unsafeNodeId a = unsafePerformIO $ do
174+ touch a
175+ newNodeId
176+#endif
233177
234178--------------------------------------------------------------------------------
235179-- Event
236180--------------------------------------------------------------------------------
237181
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− #-}
249−
250−-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251−-- caching; if the computation function is very cheap, this is (much) more
252−-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255−pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
257− { subscriberPropagate = \a -> do
258− mb <- f a
259− mapM_ (subscriberPropagate sub) mb
260− }
261− occ' <- join <$> mapM f occ
262− return (subscription, occ')
263−
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−
301−data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303− , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304− , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308− }
309−
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−
325−-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326−-- repeatedly
327−--
328−--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
330−--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− }
409− }
410− return (es, occ)
411−
412−
413−subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414−subscribe e s = fst <$> subscribeAndRead e s
415−
416−{-# INLINE wrap #-}
417−wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
418−wrap tag getSpecificSubscribed sub = do
419− (sln, subd, occ) <- getSpecificSubscribed sub
420− let es = tag subd
421− return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422−
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
424−eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425−
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429−eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
431−
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433−eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434−
435−eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
436−eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
437−
438−eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439−eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440−
441−eventHold :: Hold x p -> Event x p
442−eventHold !h = Event $ subscribeHoldEvent h
443−
444−eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
445−eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
182+data Event a
183+ = forall k. GCompare k => EventRoot !(k a) !(Root k)
184+ | EventNever
185+ | forall b. EventPush !(Push b a)
186+ | forall k. (GCompare k, a ~ DMap k Identity) => EventMerge !(Merge k)
187+ | forall k. GCompare k => EventFan !(k a) !(Fan k)
188+ | EventSwitch !(Switch a)
189+ | EventCoincidence !(Coincidence a)
190+ | forall p b. (a ~ p b, R.Patch p) => EventHold !(Hold p b)
191+ | forall p b. (a ~ p b, R.Patch p) => EventDyn !(Dyn p b)
192+ | forall b. (a ~ Identity b) => EventHoldIdentity !(Hold Identity b)
193+ | forall b. (a ~ Identity b) => EventDynIdentity !(Dyn Identity b)
194+
195+{-# SPECIALIZE subscribe :: Event a -> Subscriber a -> EventM x (EventSubscription a) #-}
196+subscribe :: forall x m a. CanSubscribe x m => Event a -> Subscriber a -> m (EventSubscription a)
197+subscribe e sub = case e of
198+ EventRoot k r -> wrap EventSubscribedRoot $ liftIO . getRootSubscribed k r
199+ EventNever -> return $ EventSubscription Nothing EventSubscribedNever
200+ EventPush p -> wrap EventSubscribedPush $ getPushSubscribed p
201+ EventFan k f -> wrap (EventSubscribedFan k) $ getFanSubscribed k f
202+ EventMerge m -> wrap EventSubscribedMerge $ getMergeSubscribed m
203+ EventSwitch s -> wrap EventSubscribedSwitch $ getSwitchSubscribed s
204+ EventCoincidence c -> wrap EventSubscribedCoincidence $ getCoincidenceSubscribed c
205+ EventHold h -> subscribeHoldEvent h sub
206+ EventDyn j -> getDynHold j >>= \h -> subscribeHoldEvent h sub
207+ EventHoldIdentity h -> subscribeHoldEvent h sub
208+ EventDynIdentity j -> getDynHold j >>= \h -> subscribeHoldEvent h sub
209+ where
210+ wrap :: (t -> EventSubscribed a) -> (Subscriber a -> m (SubscriberListTicket a, t)) -> m (EventSubscription a)
211+ wrap tag getSpecificSubscribed = do
212+ (sln, subd) <- getSpecificSubscribed sub
213+ return $ EventSubscription (Just sln) $ tag subd
446214
447215{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
216+subscribeCoincidenceInner :: CanSubscribe x m => Event a -> Height -> CoincidenceSubscribed a -> m (Maybe a, Height, EventSubscribed a)
449217subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450218 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451− (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
219+ subscription@(EventSubscription _ innerSubd) <- subscribe inner subInner
220+ innerOcc <- liftIO $ readEventSubscribed innerSubd
452221 innerHeight <- liftIO $ getEventSubscribedHeight innerSubd
453222 let height = max innerHeight outerHeight
454223 defer $ SomeResetCoincidence subscription $ if height > outerHeight then Just subscribedUnsafe else Nothing
455224 return (innerOcc, height, innerSubd)
456225
457−--------------------------------------------------------------------------------
458−-- Subscriber
459−--------------------------------------------------------------------------------
460−
461−data Subscriber x a = Subscriber
462− { subscriberPropagate :: !(a -> EventM x ())
463− , subscriberInvalidateHeight :: !(Height -> IO ())
464− , subscriberRecalculateHeight :: !(Height -> IO ())
465− }
466−
467−newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468−newSubscriberHold h = return $ Subscriber
469− { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
470− , subscriberInvalidateHeight = \_ -> return ()
471− , subscriberRecalculateHeight = \_ -> return ()
472− }
473−
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
476− { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477− subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
479− liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480− scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
482− propagate v $ _fanSubscribedChildren_list subsubs
483− return $ Constant ()
484− _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485− return ()
486− , subscriberInvalidateHeight = \old -> do
487− subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
489− , subscriberRecalculateHeight = \new -> do
490− subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
492− }
493−
494−newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
496− { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
497− liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498− scheduleClear $ switchSubscribedOccurrence subscribed
499− propagate a $ switchSubscribedSubscribers subscribed
500− , subscriberInvalidateHeight = \_ -> do
501− oldHeight <- readIORef $ switchSubscribedHeight subscribed
502− when (oldHeight /= invalidHeight) $ do
503− writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
507−
508−newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
510− { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
511− outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512− tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513− (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514− tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515− tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517− liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518− scheduleClear $ coincidenceSubscribedInnerParent subscribed
519− case occ of
520− Nothing ->
521− when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522− writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525− Just o -> do -- Since it's already firing, no need to adjust height
526− liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527− scheduleClear $ coincidenceSubscribedOccurrence subscribed
528− propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
531− }
532−
533−newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
535− { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
536− occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537− case occ of
538− Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
539− Nothing -> do
540− liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541− scheduleClear $ coincidenceSubscribedOccurrence subscribed
542− propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
545− }
546−
547−invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
548−invalidateSubscriberHeight = flip subscriberInvalidateHeight
549−
550−recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551−recalculateSubscriberHeight = flip subscriberRecalculateHeight
552−
553−-- | 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) $
563− -- 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
564− --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
566−
567226--------------------------------------------------------------------------------
568227-- EventSubscribed
569228--------------------------------------------------------------------------------
570229
571−toAny :: a -> Any
572−toAny = unsafeCoerce
573−
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.
579−data EventSubscribed x = EventSubscribed
580− { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581− , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582−#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
584− , eventSubscribedHasOwnHeightRef :: !Bool
585− , eventSubscribedWhoCreated :: !(IO [String])
586−#endif
587− }
588−
589−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
590−eventSubscribedRoot !r = EventSubscribed
591− { eventSubscribedHeightRef = zeroRef
592− , eventSubscribedRetained = toAny r
593−#ifdef DEBUG_CYCLES
594− , eventSubscribedGetParents = return []
595− , eventSubscribedHasOwnHeightRef = False
596− , eventSubscribedWhoCreated = return ["root"]
597−#endif
598− }
599−
600−eventSubscribedNever :: EventSubscribed x
601−eventSubscribedNever = EventSubscribed
602− { eventSubscribedHeightRef = zeroRef
603− , eventSubscribedRetained = toAny ()
604−#ifdef DEBUG_CYCLES
605− , eventSubscribedGetParents = return []
606− , eventSubscribedHasOwnHeightRef = False
607− , eventSubscribedWhoCreated = return ["never"]
608−#endif
609− }
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− }
620−
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622−eventSubscribedFan !subscribed = EventSubscribed
623− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624− , eventSubscribedRetained = toAny subscribed
625−#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
627− , eventSubscribedHasOwnHeightRef = False
628− , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629−#endif
630− }
631−
632−eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
633−eventSubscribedSwitch !subscribed = EventSubscribed
634− { eventSubscribedHeightRef = switchSubscribedHeight subscribed
635− , eventSubscribedRetained = toAny subscribed
636−#ifdef DEBUG_CYCLES
637− , eventSubscribedGetParents = do
638− s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
640− , eventSubscribedHasOwnHeightRef = True
641− , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642−#endif
643− }
644−
645−eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
646−eventSubscribedCoincidence !subscribed = EventSubscribed
647− { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
648− , eventSubscribedRetained = toAny subscribed
649−#ifdef DEBUG_CYCLES
650− , eventSubscribedGetParents = do
651− innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
654− return $ outerParent : innerParents
655− , eventSubscribedHasOwnHeightRef = True
656− , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
657−#endif
658− }
659−
660−getEventSubscribedHeight :: EventSubscribed x -> IO Height
230+data EventSubscribed a
231+ = EventSubscribedRoot {-# NOUNPACK #-} (RootSubscribed a)
232+ | EventSubscribedNever
233+ | forall b. EventSubscribedPush !(PushSubscribed b a)
234+ | forall k. (GCompare k, a ~ DMap k Identity) => EventSubscribedMerge !(MergeSubscribed k)
235+ | forall k. GCompare k => EventSubscribedFan !(k a) !(FanSubscribed k)
236+ | EventSubscribedSwitch !(SwitchSubscribed a)
237+ | EventSubscribedCoincidence !(CoincidenceSubscribed a)
238+
239+readEventSubscribed :: EventSubscribed a -> IO (Maybe a)
240+readEventSubscribed = \case
241+ EventSubscribedRoot rs -> readRootSubscribed rs
242+ EventSubscribedNever -> return Nothing
243+ EventSubscribedPush ps -> readPushSubscribed ps
244+ EventSubscribedMerge ms -> readMergeSubscribed ms
245+ EventSubscribedFan k fs -> readFanSubscribed k fs
246+ EventSubscribedSwitch ss -> readSwitchSubscribed ss
247+ EventSubscribedCoincidence cs -> readCoincidenceSubscribed cs
248+
249+{-# INLINE subscribeEventSubscribed #-}
250+subscribeEventSubscribed :: EventSubscribed a -> Subscriber a -> IO (Maybe (SubscriberListTicket a))
251+subscribeEventSubscribed es sub = case es of
252+ EventSubscribedRoot r -> do
253+ traceSubscribe $ "subscribeEventSubscribed Root"
254+ Just <$> subscribeRootSubscribed r sub
255+ EventSubscribedNever -> do
256+ traceSubscribe $ "subscribeEventSubscribed Never"
257+ return Nothing
258+ EventSubscribedPush subscribed -> do
259+ traceSubscribe $ "subscribeEventSubscribed Push"
260+ Just <$> subscribePushSubscribed subscribed sub
261+ EventSubscribedFan k subscribed -> do
262+ traceSubscribe $ "subscribeEventSubscribed Fan"
263+ Just <$> subscribeFanSubscribed k subscribed sub
264+ EventSubscribedMerge subscribed -> do
265+ traceSubscribe $ "subscribeEventSubscribed Merge"
266+ Just <$> subscribeMergeSubscribed subscribed sub
267+ EventSubscribedSwitch subscribed -> do
268+ traceSubscribe $ "subscribeEventSubscribed Switch"
269+ Just <$> subscribeSwitchSubscribed subscribed sub
270+ EventSubscribedCoincidence subscribed -> do
271+ traceSubscribe $ "subscribeEventSubscribed Coincidence"
272+ Just <$> subscribeCoincidenceSubscribed subscribed sub
273+
274+{-# INLINE eventSubscribedGetParents #-}
275+eventSubscribedGetParents :: EventSubscribed a -> IO [Some EventSubscribed]
276+eventSubscribedGetParents = \case
277+ EventSubscribedRoot _ -> return []
278+ EventSubscribedNever -> return []
279+ EventSubscribedPush subscribed -> return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
280+ EventSubscribedFan _ subscribed -> return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
281+ EventSubscribedMerge subscribed -> do
282+ ps <- readIORef $ mergeSubscribedParents subscribed
283+ return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
284+ EventSubscribedSwitch subscribed -> do
285+ s <- readIORef $ switchSubscribedCurrentParent subscribed
286+ return [Some.This $ _eventSubscription_subscribed s]
287+ EventSubscribedCoincidence subscribed -> do
288+ innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
289+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
290+ innerParents = maybeToList $ fmap Some.This innerSubscription
291+ return $ outerParent : innerParents
292+
293+getEventSubscribedHeight :: EventSubscribed a -> IO Height
661294getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
662295
663−#ifdef DEBUG_CYCLES
664−whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665−whoCreatedEventSubscribed = eventSubscribedWhoCreated
666−
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
296+{-# INLINE eventSubscribedHeightRef #-}
297+eventSubscribedHeightRef :: EventSubscribed a -> IORef Height
298+eventSubscribedHeightRef = \case
299+ EventSubscribedRoot _ -> zeroRef
300+ EventSubscribedNever -> zeroRef
301+ EventSubscribedPush subscribed -> pushSubscribedHeight subscribed
302+ EventSubscribedFan _ subscribed -> eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
303+ EventSubscribedMerge subscribed -> mergeSubscribedHeight subscribed
304+ EventSubscribedSwitch subscribed -> switchSubscribedHeight subscribed
305+ EventSubscribedCoincidence subscribed -> coincidenceSubscribedHeight subscribed
306+
307+whoCreatedEventSubscribed :: EventSubscribed a -> IO [String]
308+whoCreatedEventSubscribed = \case
309+ EventSubscribedRoot _ -> return ["root"]
310+ EventSubscribedNever -> return ["never"]
311+ EventSubscribedPush subscribed -> whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
312+ EventSubscribedFan _ subscribed -> whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
313+ EventSubscribedMerge subscribed -> whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
314+ EventSubscribedSwitch subscribed -> whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
315+ EventSubscribedCoincidence subscribed -> whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
316+
317+{-# INLINE eventSubscribedHasOwnHeightRef #-}
318+eventSubscribedHasOwnHeightRef :: EventSubscribed a -> Bool
319+eventSubscribedHasOwnHeightRef = \case
320+ EventSubscribedRoot _ -> False
321+ EventSubscribedNever -> False
322+ EventSubscribedPush _ -> False
323+ EventSubscribedFan _ _ -> False
324+ EventSubscribedMerge _ -> True
325+ EventSubscribedSwitch _ -> True
326+ EventSubscribedCoincidence _ -> True
327+
328+walkInvalidHeightParents :: EventSubscribed a -> IO [Some EventSubscribed]
668329walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
330+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670331 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671332 when (h == invalidHeight) $ do
672333 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
334+ modify (Some.This s :)
674335 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
336+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676337 return subscribers
677−#endif
678338
679−{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681−subscribeHoldEvent = subscribeAndRead . holdEvent
682−
683−--------------------------------------------------------------------------------
684−-- Behavior
685339--------------------------------------------------------------------------------
686−
687−newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
688−
689−behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
690−behaviorHold !h = Behavior $ readHoldTracked h
691−
692−behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
693−behaviorHoldIdentity = behaviorHold
694−
695−behaviorConst :: a -> Behavior x a
696−behaviorConst !a = Behavior $ return a
697−
698−behaviorPull :: Pull x a -> Behavior x a
699−behaviorPull !p = Behavior $ do
700− val <- liftIO $ readIORef $ pullValue p
701− case val of
702− Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
704− askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705− liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706− return $ pullSubscribedValue subscribed
707− Nothing -> do
708− i <- liftIO $ newInvalidatorPull p
709− wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710− parentsRef <- liftIO $ newIORef []
711− holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713− invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714− parents <- liftIO $ readIORef parentsRef
715− let subscribed = PullSubscribed
716− { pullSubscribedValue = a
717− , pullSubscribedInvalidators = invsRef
718− , pullSubscribedOwnInvalidator = i
719− , pullSubscribedParents = parents
720− }
721− liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
723− return a
724−
725−behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
726−behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
727−
728−{-# INLINE readHoldTracked #-}
729−readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730−readHoldTracked h = do
731− result <- liftIO $ readIORef $ holdValue h
732− 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
735− return result
736−
737−{-# INLINABLE readBehaviorUntracked #-}
738−readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739−readBehaviorUntracked b = do
740− holdInits <- getDeferralQueue
741− liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
742−
743−--------------------------------------------------------------------------------
744−-- Dynamic
340+-- EventSubscription
745341--------------------------------------------------------------------------------
746342
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`?
343+data EventSubscription a = EventSubscription
344+ { _eventSubscription_ticket :: !(Maybe (SubscriberListTicket a))
345+ , _eventSubscription_subscribed :: !(EventSubscribed a)
752346 }
753347
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
760−dynamicHold !h = Dynamic
761− { dynamicCurrent = behaviorHold h
762− , dynamicUpdated = eventHold h
763− }
764−
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
766−dynamicHoldIdentity = dynamicHold
767−
768−dynamicConst :: PatchTarget p -> DynamicS x p
769−dynamicConst !a = Dynamic
770− { dynamicCurrent = behaviorConst a
771− , dynamicUpdated = eventNever
772− }
773−
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
775−dynamicDyn !d = Dynamic
776− { dynamicCurrent = behaviorDyn d
777− , dynamicUpdated = eventDyn d
778− }
779−
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
781−dynamicDynIdentity = dynamicDyn
348+unsubscribe :: EventSubscription a -> IO ()
349+unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
782350
783351--------------------------------------------------------------------------------
784352-- Combinators
785353--------------------------------------------------------------------------------
786354
355+--TODO: Figure out why certain things are not 'representational', then make them
356+--representational so we can use coerce
357+
787358--type role Hold representational
788−data Hold x p
789− = Hold { holdValue :: !(IORef (PatchTarget p))
790− , holdInvalidators :: !(IORef [Weak (Invalidator x)])
791− , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
792− , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
359+data Hold p a
360+ = Hold { holdValue :: !(IORef a)
361+ , holdInvalidators :: !(IORef [Weak Invalidator])
362+ , holdParent :: !(IORef (Either (Event (p a)) (EventSubscription (p a)))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
793363#ifdef DEBUG_NODEIDS
794364 , holdNodeId :: Int
795365#endif
796366 }
797367
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−
829368data EventEnv x
830− = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831− , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833− , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834− , 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])
369+ = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
370+ , eventEnvAssignments :: !(IORef [SomeAssignment]) -- Needed for Subscribe
371+ , eventEnvHoldInits :: !(IORef [SomeHoldInit]) -- Needed for Subscribe
372+ , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate])
373+ , eventEnvMergeInits :: !(IORef [SomeMergeInit]) -- Needed for Subscribe
374+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
375+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838376 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839− , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840− , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
377+ , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence]) -- Needed for Subscribe
378+ , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge]))
841379 }
842380
843381{-# INLINE runEventM #-}
844−runEventM :: EventM x a -> IO a
845−runEventM = unEventM
846−
847−asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
382+runEventM :: EventM x a -> EventEnv x -> IO a
383+runEventM = runReaderT . unEventM
849384
850385class MonadIO m => Defer a m where
851386 getDeferralQueue :: m (IORef [a])
@@ -856,98 +391,91 @@ defer a = do
856391 q <- getDeferralQueue
857392 liftIO $ modifyIORef' q (a:)
858393
859−instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
394+instance Defer SomeAssignment (EventM x) where
860395 {-# INLINE getDeferralQueue #-}
861− getDeferralQueue = asksEventEnv eventEnvAssignments
396+ getDeferralQueue = EventM $ asks eventEnvAssignments
862397
863−instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
398+instance Defer SomeHoldInit (EventM x) where
864399 {-# INLINE getDeferralQueue #-}
865− getDeferralQueue = asksEventEnv eventEnvHoldInits
400+ getDeferralQueue = EventM $ asks eventEnvHoldInits
866401
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
402+instance Defer SomeHoldInit BehaviorM where
872403 {-# INLINE getDeferralQueue #-}
873404 getDeferralQueue = BehaviorM $ asks snd
874405
875−instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
406+instance Defer SomeMergeUpdate (EventM x) where
876407 {-# INLINE getDeferralQueue #-}
877− getDeferralQueue = asksEventEnv eventEnvMergeUpdates
408+ getDeferralQueue = EventM $ asks eventEnvMergeUpdates
878409
879−instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
410+instance Defer SomeMergeInit (EventM x) where
880411 {-# INLINE getDeferralQueue #-}
881− getDeferralQueue = asksEventEnv eventEnvMergeInits
412+ getDeferralQueue = EventM $ asks eventEnvMergeInits
882413
883−class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
414+class HasCurrentHeight m where
884415 getCurrentHeight :: m Height
885− scheduleMerge :: Height -> EventM x () -> m ()
416+ scheduleMerge :: Height -> MergeSubscribed a -> m ()
886417
887−instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
418+instance HasCurrentHeight (EventM x) where
888419 {-# INLINE getCurrentHeight #-}
889− getCurrentHeight = do
890− heightRef <- asksEventEnv eventEnvCurrentHeight
420+ getCurrentHeight = EventM $ do
421+ heightRef <- asks eventEnvCurrentHeight
891422 liftIO $ readIORef heightRef
892423 {-# INLINE scheduleMerge #-}
893− scheduleMerge height subscribed = do
894− delayedRef <- asksEventEnv eventEnvDelayedMerges
895− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
424+ scheduleMerge height subscribed = EventM $ do
425+ delayedRef <- asks eventEnvDelayedMerges
426+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
427+
428+class HasSpiderTimeline x m | m -> x where
429+ -- | Retrieve the current SpiderTimeline
430+ askSpiderTimeline :: m (SpiderTimeline x)
896431
897−class HasSpiderTimeline x where
898− -- | Retrieve the current SpiderTimelineEnv
899− spiderTimeline :: SpiderTimelineEnv x
432+instance HasSpiderTimeline x (EventM x) where
433+ {-# INLINE askSpiderTimeline #-}
434+ askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
900435
901−instance HasSpiderTimeline Global where
902− spiderTimeline = globalSpiderTimelineEnv
436+instance HasSpiderTimeline x (SpiderHost x) where
437+ {-# INLINE askSpiderTimeline #-}
438+ askSpiderTimeline = SpiderHost ask
903439
904−putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905−putCurrentHeight h = do
906− heightRef <- asksEventEnv eventEnvCurrentHeight
440+putCurrentHeight :: Height -> EventM x ()
441+putCurrentHeight h = EventM $ do
442+ heightRef <- asks eventEnvCurrentHeight
907443 liftIO $ writeIORef heightRef $! h
908444
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
445+instance Defer SomeClear (EventM x) where
910446 {-# INLINE getDeferralQueue #-}
911− getDeferralQueue = asksEventEnv eventEnvClears
447+ getDeferralQueue = EventM $ asks eventEnvClears
912448
913449{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
450+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
451+scheduleClear r = defer $ SomeClear r
916452
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
453+instance Defer SomeRootClear (EventM x) where
918454 {-# 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
926− {-# INLINE getDeferralQueue #-}
927− getDeferralQueue = asksEventEnv eventEnvRootClears
455+ getDeferralQueue = EventM $ asks eventEnvRootClears
928456
929457{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
458+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
459+scheduleRootClear r = defer $ SomeRootClear r
932460
933−instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
461+instance Defer SomeResetCoincidence (EventM x) where
934462 {-# INLINE getDeferralQueue #-}
935− getDeferralQueue = asksEventEnv eventEnvResetCoincidences
463+ getDeferralQueue = EventM $ asks eventEnvResetCoincidences
936464
937465-- 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)
466+{-# SPECIALIZE hold :: R.Patch p => a -> Event (p a) -> EventM x (Hold p a) #-}
467+{-# SPECIALIZE hold :: R.Patch p => a -> Event (p a) -> ComputeM (Hold p a) #-}
468+hold :: (R.Patch p, Defer SomeHoldInit m) => a -> Event (p a) -> m (Hold p a)
940469hold v0 e = do
941470 valRef <- liftIO $ newIORef v0
942471 invsRef <- liftIO $ newIORef []
943− parentRef <- liftIO $ newIORef Nothing
472+ parentRef <- liftIO $ newIORef $ Left e
944473#ifdef DEBUG_NODEIDS
945474 nodeId <- liftIO newNodeId
946475#endif
947476 let h = Hold
948477 { holdValue = valRef
949478 , holdInvalidators = invsRef
950− , holdEvent = e
951479 , holdParent = parentRef
952480#ifdef DEBUG_NODEIDS
953481 , holdNodeId = nodeId
@@ -957,114 +485,134 @@ hold v0 e = do
957485 return h
958486
959487{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
488+getHoldEventSubscription :: forall m p a x. (Defer SomeAssignment m, Defer SomeHoldInit m, Defer SomeClear m, R.Patch p, HasCurrentHeight m, Defer SomeMergeInit m, Defer SomeResetCoincidence m, HasSpiderTimeline x m) => Hold p a -> m (EventSubscription (p a))
961489getHoldEventSubscription h = do
962490 ep <- liftIO $ readIORef $ holdParent h
963491 case ep of
964− Just subd -> return subd
965− Nothing -> do
966− let e = holdEvent h
492+ Right subd -> return subd
493+ Left e -> do
967494 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
968− (subscription@(EventSubscription _ _), occ) <- subscribeAndRead e =<< liftIO (newSubscriberHold h)
495+ subscription@(EventSubscription _ subd) <- subscribe e =<< liftIO (newSubscriberHold h)
969496 liftIO $ writeIORef subscriptionRef $! subscription
497+ occ <- liftIO $ readEventSubscribed subd
970498 case occ of
971499 Nothing -> return ()
972500 Just o -> do
973501 old <- liftIO $ readIORef $ holdValue h
974− case apply o old of
502+ case R.apply o old of
975503 Nothing -> return ()
976504 Just new -> do
977505 -- Need to evaluate these so that we don't retain the Hold itself
978506 v <- liftIO $ evaluate $ holdValue h
979507 i <- liftIO $ evaluate $ holdInvalidators h
980508 defer $ SomeAssignment v i new
981− liftIO $ writeIORef (holdParent h) $ Just subscription
509+ liftIO $ writeIORef (holdParent h) $ Right subscription
982510 return subscription
983511
984−type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
512+type BehaviorEnv = (Maybe (Weak Invalidator, IORef [SomeBehaviorSubscribed]), IORef [SomeHoldInit])
985513
514+--type role BehaviorM representational
986515-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
516+newtype BehaviorM a = BehaviorM { unBehaviorM :: ReaderT BehaviorEnv IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989517
990−instance Monad (BehaviorM x) where
518+instance Monad BehaviorM where
991519 {-# INLINE (>>=) #-}
992520 BehaviorM x >>= f = BehaviorM $ x >>= unBehaviorM . f
993521 {-# INLINE (>>) #-}
994522 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995523 {-# INLINE return #-}
996524 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998525 {-# INLINE fail #-}
999526 fail s = BehaviorM $ fail s
1000−#endif
1001527
1002−data BehaviorSubscribed x a
1003− = forall p. BehaviorSubscribedHold (Hold x p)
1004− | BehaviorSubscribedPull (PullSubscribed x a)
528+data BehaviorSubscribed a
529+ = forall p. BehaviorSubscribedHold (Hold p a)
530+ | BehaviorSubscribedPull (PullSubscribed a)
1005531
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
532+data SomeBehaviorSubscribed = forall a. SomeBehaviorSubscribed (BehaviorSubscribed a)
1007533
1008534--type role PullSubscribed representational
1009−data PullSubscribed x a
535+data PullSubscribed a
1010536 = PullSubscribed { pullSubscribedValue :: !a
1011− , pullSubscribedInvalidators :: !(IORef [Weak (Invalidator x)])
1012− , pullSubscribedOwnInvalidator :: !(Invalidator x)
1013− , pullSubscribedParents :: ![SomeBehaviorSubscribed x] -- Need to keep parent behaviors alive, or they won't let us know when they're invalidated
537+ , pullSubscribedInvalidators :: !(IORef [Weak Invalidator])
538+ , pullSubscribedOwnInvalidator :: !Invalidator
539+ , pullSubscribedParents :: ![SomeBehaviorSubscribed] -- Need to keep parent behaviors alive, or they won't let us know when they're invalidated
1014540 }
1015541
1016542--type role Pull representational
1017−data Pull x a
1018− = Pull { pullValue :: !(IORef (Maybe (PullSubscribed x a)))
1019− , pullCompute :: !(BehaviorM x a)
543+data Pull a
544+ = Pull { pullValue :: !(IORef (Maybe (PullSubscribed a)))
545+ , pullCompute :: !(BehaviorM a)
1020546#ifdef DEBUG_NODEIDS
1021547 , pullNodeId :: Int
1022548#endif
1023549 }
1024550
1025−data Invalidator x
1026− = forall a. InvalidatorPull (Pull x a)
1027− | forall a. InvalidatorSwitch (SwitchSubscribed x a)
551+data Invalidator
552+ = forall a. InvalidatorPull (Pull a)
553+ | forall a. InvalidatorSwitch (SwitchSubscribed a)
1028554
1029−data RootSubscribed x a = forall k. GCompare k => RootSubscribed
555+data RootSubscribed a = forall k. GCompare k => RootSubscribed
1030556 { rootSubscribedKey :: !(k a)
1031− , rootSubscribedCachedSubscribed :: !(IORef (DMap k (RootSubscribed x))) -- From the original Root
1032− , rootSubscribedSubscribers :: !(WeakBag (Subscriber x a))
557+ , rootSubscribedCachedSubscribed :: !(IORef (DMap k RootSubscribed)) -- From the original Root
558+ , rootSubscribedSubscribers :: !(SubscriberList a)
1033559 , rootSubscribedOccurrence :: !(IO (Maybe a)) -- Lookup from rootOccurrence
1034560 , rootSubscribedUninit :: IO ()
1035− , rootSubscribedWeakSelf :: !(IORef (Weak (RootSubscribed x a))) --TODO: Can we make this a lazy non-IORef and then force it manually to avoid an indirection each time we use it?
561+ , rootSubscribedWeakSelf :: !(IORef (Weak (RootSubscribed a))) --TODO: Can we make this a lazy non-IORef and then force it manually to avoid an indirection each time we use it?
1036562#ifdef DEBUG_NODEIDS
1037563 , rootSubscribedNodeId :: Int
1038564#endif
1039565 }
1040566
1041−data Root x k
567+data Root (k :: * -> *)
1042568 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043− , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044− , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
569+ , rootSubscribed :: !(IORef (DMap k RootSubscribed))
570+ , rootInit :: !(forall a. k a -> RootTrigger a -> IO (IO ()))
1045571 }
1046572
1047−data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
573+data SomeHoldInit = forall p a. R.Patch p => SomeHoldInit !(Hold p a)
1048574
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
575+data SomeMergeUpdate = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap (DMap k Event)) (MergeSubscribed k)
1050576
1051−data SomeMergeUpdate x = SomeMergeUpdate
1052− { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053− , _someMergeUpdate_invalidateHeight :: !(IO ())
1054− , _someMergeUpdate_recalculateHeight :: !(IO ())
1055− }
577+data SomeMergeInit = forall k. GCompare k => SomeMergeInit !(MergeSubscribed k) !(Event (R.PatchDMap (DMap k Event)))
1056578
1057−newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
579+data SomeEventSubscription = forall a. SomeEventSubscription (EventSubscription a)
1058580
1059581-- 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)
582+newtype EventM x a = EventM { unEventM :: ReaderT (EventEnv x) IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
583+
584+data PushSubscribed a b
585+ = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed a b)))
586+ , pushSubscribedOccurrence :: !(IORef (Maybe b)) -- If the current height is less than our height, this should always be Nothing; during our height, this will get filled in at some point, always before our children are notified; after our height, this will be filled in with the correct value (Nothing if we are not firing, Just if we are)
587+ , pushSubscribedHeight :: !(IORef Height)
588+ , pushSubscribedSubscribers :: !(SubscriberList b)
589+ , pushSubscribedSelf :: !(Subscriber a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
590+ , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed a b)))
591+ , pushSubscribedParent :: !(EventSubscription a)
592+#ifdef DEBUG_NODEIDS
593+ , pushSubscribedNodeId :: Int
594+#endif
595+ }
1061596
1062−newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
597+newtype ComputeM a = ComputeM (ReaderT (IORef [SomeHoldInit]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1063598
1064−data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065− { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066− , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067− }
599+instance Defer SomeHoldInit ComputeM where
600+ getDeferralQueue = ComputeM ask
601+
602+{-# SPECIALIZE runComputeM :: ComputeM a -> EventM x a #-}
603+runComputeM :: Defer SomeHoldInit m => ComputeM a -> m a
604+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
605+
606+data Push a b
607+ = Push { pushCompute :: !(a -> ComputeM (Maybe b)) -- Compute the current firing value; assumes that its parent has been computed --TODO: This only uses Defer SomeHoldInit EventM; perhaps only the hold init queue should be passed in (also, perhaps those hold inits can be accelerated - can there be a loop we would need to worry about?)
608+ , pushParent :: !(Event a)
609+ , pushSubscribed :: !(IORef (Maybe (PushSubscribed a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
610+ }
611+
612+data MergeSubscribedParent k a = MergeSubscribedParent !(EventSubscription a) !(Subscriber a)
613+
614+mergeSubscribedParentSubscription :: MergeSubscribedParent k a -> EventSubscription a
615+mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1068616
1069617data HeightBag = HeightBag
1070618 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -1082,8 +630,7 @@ heightBagFromList :: [Height] -> HeightBag
1082630heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083631
1084632heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
633+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087634
1088635heightBagRemove :: Height -> HeightBag -> HeightBag
1089636heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +639,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092639 0 -> IntMap.delete h c
1093640 _ -> IntMap.insert h (pred old) c
1094641
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−
1102642heightBagMax :: HeightBag -> Height
1103643heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104644 Just ((h, _), _) -> Height h
@@ -1116,183 +656,307 @@ heightBagVerify b@(HeightBag s c) = if
1116656heightBagVerify = id
1117657#endif
1118658
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)))
659+data MergeSubscribed k
660+ = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed k))) -- From the original merge
661+ , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
662+ , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
663+ , mergeSubscribedHeight :: !(IORef Height)
664+ , mergeSubscribedHeightBag :: !(IORef HeightBag)
665+ , mergeSubscribedSubscribers :: !(SubscriberList (DMap k Identity))
666+ , mergeSubscribedChange :: !(IORef (Subscriber (R.PatchDMap (DMap k Event)), EventSubscribed (R.PatchDMap (DMap k Event))))
667+ , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent k)))
668+ , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed k)))
669+#ifdef DEBUG_NODEIDS
670+ , mergeSubscribedNodeId :: Int
671+#endif
672+ }
673+
674+--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
675+data Merge k
676+ = Merge { mergeParents :: !(Dynamic R.PatchDMap (DMap k Event))
677+ , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed k)))
678+ }
679+
680+data FanSubscribedChildren k a = FanSubscribedChildren
681+ { _fanSubscribedChildren_list :: !(SubscriberList a)
682+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed k)
683+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed k)))
1123684 }
1124685
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
1129− , fanSubscribedParent :: !(EventSubscription x)
686+data FanSubscribed k
687+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed k)))
688+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren k))) -- This DMap should never be empty
689+ , fanSubscribedParent :: !(EventSubscription (DMap k Identity))
1130690#ifdef DEBUG_NODEIDS
1131691 , fanSubscribedNodeId :: Int
1132692#endif
1133693 }
1134694
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
695+data Fan k
696+ = Fan { fanParent :: !(Event (DMap k Identity))
697+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed k)))
1138698 }
1139699
1140−data SwitchSubscribed x a
1141− = SwitchSubscribed { switchSubscribedCachedSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
700+data SwitchSubscribed a
701+ = SwitchSubscribed { switchSubscribedCachedSubscribed :: !(IORef (Maybe (SwitchSubscribed a)))
1142702 , switchSubscribedOccurrence :: !(IORef (Maybe a))
1143703 , switchSubscribedHeight :: !(IORef Height)
1144− , switchSubscribedSubscribers :: !(WeakBag (Subscriber x a))
1145− , switchSubscribedOwnInvalidator :: {-# NOUNPACK #-} !(Invalidator x)
1146− , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
1147− , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
1148− , switchSubscribedParent :: !(Behavior x (Event x a))
1149− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
1150− , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
704+ , switchSubscribedSubscribers :: !(SubscriberList a)
705+ , switchSubscribedOwnInvalidator :: {-# NOUNPACK #-} !Invalidator
706+ , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak Invalidator))
707+ , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed])
708+ , switchSubscribedParent :: !(Behavior (Event a))
709+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription a))
710+ , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed a)))
1151711#ifdef DEBUG_NODEIDS
1152712 , switchSubscribedNodeId :: Int
1153713#endif
1154714 }
1155715
1156−data Switch x a
1157− = Switch { switchParent :: !(Behavior x (Event x a))
1158− , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
716+data Switch a
717+ = Switch { switchParent :: !(Behavior (Event a))
718+ , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed a)))
1159719 }
1160720
1161−#ifdef USE_TEMPLATE_HASKELL
1162721{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163−#endif
1164−data CoincidenceSubscribed x a
1165− = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
722+data CoincidenceSubscribed a
723+ = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed a)))
1166724 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
1167− , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
725+ , coincidenceSubscribedSubscribers :: !(SubscriberList a)
1168726 , coincidenceSubscribedHeight :: !(IORef Height)
1169− , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1170− , coincidenceSubscribedOuterParent :: !(EventSubscription x)
1171− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
1172− , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
727+ , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber (Event a))
728+ , coincidenceSubscribedOuterParent :: !(EventSubscription (Event a))
729+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed a)))
730+ , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed a)))
1173731#ifdef DEBUG_NODEIDS
1174732 , coincidenceSubscribedNodeId :: Int
1175733#endif
1176734 }
1177735
1178−data Coincidence x a
1179− = Coincidence { coincidenceParent :: !(Event x (Event x a))
1180− , coincidenceSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
736+data Coincidence a
737+ = Coincidence { coincidenceParent :: !(Event (Event a))
738+ , coincidenceSubscribed :: !(IORef (Maybe (CoincidenceSubscribed a)))
1181739 }
1182740
1183−{-# NOINLINE newInvalidatorSwitch #-}
1184−newInvalidatorSwitch :: SwitchSubscribed x a -> IO (Invalidator x)
1185−newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
741+data Subscriber a
742+ = forall b. SubscriberPush (a -> ComputeM (Maybe b)) (PushSubscribed a b) --TODO: Why does this have the pushCompute in it?
743+ | forall k. GCompare k => SubscriberMerge !(k a) (MergeSubscribed k) --TODO: Can we inline the GCompare?
744+ | forall k. (a ~ R.PatchDMap (DMap k Event), GCompare k) => SubscriberMergeChange (MergeSubscribed k)
745+ | forall k. (GCompare k, a ~ DMap k Identity) => SubscriberFan (FanSubscribed k)
746+ | forall p b. (a ~ p b, R.Patch p) => SubscriberHold !(Hold p b)
747+ | forall b. (a ~ Identity b) => SubscriberHoldIdentity !(Hold Identity b)
748+ | SubscriberSwitch (SwitchSubscribed a)
749+ | forall b. a ~ Event b => SubscriberCoincidenceOuter (CoincidenceSubscribed b)
750+ | SubscriberCoincidenceInner (CoincidenceSubscribed a)
751+ | SubscriberHandle
752+
753+-- These function are constructor functions that are marked NOINLINE so they are
754+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
755+-- so any weak references that are attached to the constructors will have their
756+-- finalizer run. Using the opaque constructor, does not see the
757+-- constructor application, so it behaves like an IORef and cannot be fused away.
758+--
759+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
760+-- the weak pointer to it in some cases.
1186761
1187−{-# NOINLINE newInvalidatorPull #-}
1188−newInvalidatorPull :: Pull x a -> IO (Invalidator x)
1189−newInvalidatorPull p = return $! InvalidatorPull p
762+--TODO: I think all of these noinlines are now unnecessary
763+{-# NOINLINE newSubscriberPush #-}
764+newSubscriberPush :: (a -> ComputeM (Maybe b)) -> PushSubscribed a b -> IO (Subscriber a)
765+newSubscriberPush compute subd = return $! SubscriberPush compute subd
1190766
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
767+{-# RULES
768+ "newSubscriberHold/Identity" forall h. newSubscriberHold h = newSubscriberHoldIdentity h
769+ #-}
770+{-# NOINLINE newSubscriberHold #-}
771+newSubscriberHold :: R.Patch p => Hold p a -> IO (Subscriber (p a))
772+newSubscriberHold h = return $! SubscriberHold h
1193773
1194−instance HasSpiderTimeline x => Align (Event x) where
1195− 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]
774+{-# NOINLINE newSubscriberHoldIdentity #-}
775+newSubscriberHoldIdentity :: Hold Identity a -> IO (Subscriber (Identity a))
776+newSubscriberHoldIdentity h = return $! SubscriberHoldIdentity h
1201777
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
778+{-# NOINLINE newSubscriberMerge #-}
779+newSubscriberMerge :: GCompare k => k a -> MergeSubscribed k -> IO (Subscriber a)
780+newSubscriberMerge k subd = return $! SubscriberMerge k subd
781+
782+{-# NOINLINE newSubscriberMergeChange #-}
783+newSubscriberMergeChange :: GCompare k => MergeSubscribed k -> IO (Subscriber (R.PatchDMap (DMap k Event)))
784+newSubscriberMergeChange subd = return $! SubscriberMergeChange subd
785+
786+{-# NOINLINE newSubscriberFan #-}
787+newSubscriberFan :: GCompare k => FanSubscribed k -> IO (Subscriber (DMap k Identity))
788+newSubscriberFan subd = return $! SubscriberFan subd
1208789
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)
790+{-# NOINLINE newSubscriberSwitch #-}
791+newSubscriberSwitch :: SwitchSubscribed a -> IO (Subscriber a)
792+newSubscriberSwitch subd = return $! SubscriberSwitch subd
1212793
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
794+{-# NOINLINE newSubscriberCoincidenceOuter #-}
795+newSubscriberCoincidenceOuter :: CoincidenceSubscribed b -> IO (Subscriber (Event b))
796+newSubscriberCoincidenceOuter subd = return $! SubscriberCoincidenceOuter subd
1214797
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)
798+{-# NOINLINE newSubscriberCoincidenceInner #-}
799+newSubscriberCoincidenceInner :: CoincidenceSubscribed a -> IO (Subscriber a)
800+newSubscriberCoincidenceInner subd = return $! SubscriberCoincidenceInner subd
801+
802+{-# NOINLINE newInvalidatorSwitch #-}
803+newInvalidatorSwitch :: SwitchSubscribed a -> IO Invalidator
804+newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
805+
806+{-# NOINLINE newInvalidatorPull #-}
807+newInvalidatorPull :: Pull a -> IO Invalidator
808+newInvalidatorPull p = return $! InvalidatorPull p
809+
810+data Dynamic p a
811+ = DynamicHold !(Hold p a)
812+ | p ~ Identity => DynamicHoldIdentity !(Hold Identity a)
813+ | DynamicConst !a
814+ | DynamicDyn !(Dyn p a)
815+ | p ~ Identity => DynamicDynIdentity !(Dyn Identity a)
816+
817+{-# INLINE current #-}
818+current :: R.Patch p => Dynamic p a -> Behavior a
819+current = \case
820+ DynamicHold h -> BehaviorHold h
821+ DynamicHoldIdentity h -> BehaviorHoldIdentity h
822+ DynamicConst a -> BehaviorConst a
823+ DynamicDyn d -> BehaviorDyn d
824+ DynamicDynIdentity d -> BehaviorDynIdentity d
825+
826+--TODO: If you only need updated, not current, can we avoid actually constructing the Hold?
827+{-# INLINE updated #-}
828+updated :: R.Patch p => Dynamic p a -> Event (p a)
829+updated = \case
830+ DynamicHold h -> EventHold h
831+ DynamicHoldIdentity h -> EventHoldIdentity h
832+ DynamicConst _ -> EventNever
833+ DynamicDyn d -> EventDyn d
834+ DynamicDynIdentity d -> EventDynIdentity d
835+
836+newMapDyn :: (a -> b) -> Dynamic Identity a -> Dynamic Identity b
837+newMapDyn f d = DynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ current d) (Identity . f . runIdentity <$> updated d)
838+
839+instance Functor (Dynamic Identity) where
840+ fmap = newMapDyn
841+
842+instance Applicative (Dynamic Identity) where
843+ pure = DynamicConst
844+ (<*>) = zipDynWith ($)
845+ _ *> b = b
846+ a <* _ = a
847+
848+instance R.FunctorMaybe Event where
849+ fmapMaybe f = push $ return . f
850+
851+instance Align Event where
852+ nil = EventNever
853+ align ea eb = R.fmapMaybe R.dmapToThese $ merge $ DynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
1217854
1218855--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)
856+zipDynWith :: (a -> b -> c) -> Dynamic Identity a -> Dynamic Identity b -> Dynamic Identity c
1220857zipDynWith f da db =
1221− let eab = align (dynamicUpdated da) (dynamicUpdated db)
858+ let eab = align (updated da) (updated db)
1222859 ec = flip push eab $ \o -> do
1223860 (a, b) <- case o of
1224861 This (Identity a) -> do
1225− b <- readBehaviorUntracked $ dynamicCurrent db
862+ b <- readBehaviorUntracked $ current db
1226863 return (a, b)
1227864 That (Identity b) -> do
1228− a <- readBehaviorUntracked $ dynamicCurrent da
865+ a <- readBehaviorUntracked $ current da
1229866 return (a, b)
1230867 These (Identity a) (Identity b) -> return (a, b)
1231868 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
869+ in DynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (current da) <*> readBehaviorUntracked (current db)) ec
1233870
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
871+instance Monad (Dynamic Identity) where
872+ {-# INLINE return #-}
873+ return = pure
874+ {-# INLINE (>>=) #-}
875+ x >>= f = DynamicDynIdentity $ newJoinDyn $ newMapDyn f x --TODO: (>>), fail
876+ {-# INLINE (>>) #-}
877+ _ >> y = y
878+ {-# INLINE fail #-}
879+ fail _ = error "Dynamic does not support 'fail'"
1240880
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
881+newtype Dyn p a = Dyn { unDyn :: IORef (Either (BehaviorM a, Event (p a)) (Hold p a)) }
882+
883+unsafeDyn :: BehaviorM a -> Event (p a) -> Dyn p a
884+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
885+ where x = (readV0, v')
886+
887+newJoinDyn :: Dynamic Identity (Dynamic Identity a) -> Dyn Identity a
888+newJoinDyn d =
889+ let readV0 = readBehaviorTracked . current =<< readBehaviorTracked (current d)
890+ eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . current . runIdentity) $ updated d
891+ eInner = switch $ updated <$> current d
892+ eBoth = coincidence $ updated . runIdentity <$> updated d
893+ v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
894+ in unsafeDyn readV0 v'
895+
896+--type role Behavior representational
897+data Behavior a
898+ = forall p. BehaviorHold !(Hold p a)
899+ | BehaviorHoldIdentity !(Hold Identity a)
900+ | BehaviorConst !a
901+ | BehaviorPull !(Pull a)
902+ | BehaviorDynIdentity !(Dyn Identity a)
903+ | forall p. R.Patch p => BehaviorDyn !(Dyn p a)
1244904
1245905-- ResultM can read behaviors and events
1246906type ResultM = EventM
1247907
1248−instance HasSpiderTimeline x => Functor (Event x) where
908+{-# NOINLINE unsafeNewIORef #-}
909+unsafeNewIORef :: a -> b -> IORef b
910+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
911+
912+instance Functor Event where
1249913 fmap f = push $ return . Just . f
1250914
1251−instance Functor (Behavior x) where
915+instance Functor Behavior where
1252916 fmap f = pull . fmap f . readBehaviorTracked
1253917
1254−{-# INLINE push #-}
1255−push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1256−push f e = cacheEvent (pushCheap f e)
918+{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
919+push :: forall a b. (a -> ComputeM (Maybe b)) -> Event a -> Event b
920+push f e = EventPush $ Push
921+ { pushCompute = f
922+ , pushParent = e
923+ , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
924+ }
925+-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1257926
1258−{-# INLINABLE pull #-}
1259−pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
927+{-# NOINLINE pull #-}
928+pull :: BehaviorM a -> Behavior a
929+pull a = BehaviorPull $ Pull
930+ { pullCompute = a
931+ , pullValue = unsafeNewIORef a Nothing
1268932#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
933+ , pullNodeId = unsafeNodeId a
1270934#endif
1271− }
935+ }
1272936
1273−{-# INLINABLE switch #-}
1274−switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
937+{-# NOINLINE switch #-}
938+switch :: Behavior (Event a) -> Event a
939+switch a = EventSwitch $ Switch
940+ { switchParent = a
941+ , switchSubscribed = unsafeNewIORef a Nothing
942+ }
1281943
1282−coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
944+coincidence :: Event (Event a) -> Event a
945+coincidence a = EventCoincidence $ Coincidence
946+ { coincidenceParent = a
947+ , coincidenceSubscribed = unsafeNewIORef a Nothing
948+ }
949+
950+propagateAndUpdateSubscribersRef :: SubscriberList a -> a -> EventM x ()
951+propagateAndUpdateSubscribersRef subscribersRef a = do
952+ propagate a subscribersRef
1289953
1290954-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1291−run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
955+run :: [DSum RootTrigger Identity] -> ResultM x b -> SpiderHost x b
1292956run roots after = do
1293− tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
957+ tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
958+ spiderEnv <- SpiderHost ask
959+ result <- SpiderHost $ lift $ withMVar (_spiderEnv_lock spiderEnv) $ \_ -> flip runReaderT spiderEnv $ unSpiderHost $ runFrame $ do
1296960 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297961 occBefore <- liftIO $ do
1298962 occBefore <- readIORef occRef
@@ -1303,40 +967,43 @@ run roots after = do
1303967 return $ Just r
1304968 else return Nothing
1305969 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
1306− propagate a subscribersRef
1307− delayedRef <- asksEventEnv eventEnvDelayedMerges
970+ propagateAndUpdateSubscribersRef subscribersRef a
971+ delayedRef <- EventM $ asks eventEnvDelayedMerges
1308972 let go = do
1309973 delayed <- liftIO $ readIORef delayedRef
1310974 case IntMap.minViewWithKey delayed of
1311975 Nothing -> return ()
1312976 Just ((currentHeight, cur), future) -> do
1313− tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
977+ tracePropagate $ "Running height " ++ show currentHeight
1314978 putCurrentHeight $ Height currentHeight
1315979 liftIO $ writeIORef delayedRef $! future
1316− sequence_ cur
980+ forM_ cur $ \d -> case d of
981+ DelayedMerge subscribed -> do
982+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
983+ case height `compare` Height currentHeight of
984+ LT -> error "Somehow a merge's height has been decreased after it was scheduled"
985+ GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
986+ EQ -> do
987+ m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
988+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
989+ --TODO: Assert that m is not empty
990+ liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
991+ scheduleClear $ mergeSubscribedOccurrence subscribed
992+ propagateAndUpdateSubscribersRef (mergeSubscribedSubscribers subscribed) m
1317993 go
1318994 go
1319995 putCurrentHeight maxBound
1320996 after
1321− tracePropagate (Proxy :: Proxy x) "Done running an event frame"
997+ tracePropagate "Done running an event frame"
1322998 return result
1323999
1324−scheduleMerge' :: HasSpiderTimeline x => Height -> IORef Height -> EventM x () -> EventM x ()
1325−scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
1326− height <- liftIO $ readIORef heightRef
1327− currentHeight <- getCurrentHeight
1328− case height `compare` currentHeight of
1329− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1330− GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1331− EQ -> a
1332−
1333−newtype Clear a = Clear (IORef (Maybe a))
1000+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13341001
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1002+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13361003
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1004+data SomeAssignment = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak Invalidator]) a
13381005
1339−data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1006+data DelayedMerge = forall k. DelayedMerge (MergeSubscribed k)
13401007
13411008debugFinalize :: Bool
13421009debugFinalize = False
@@ -1346,106 +1013,54 @@ mkWeakPtrWithDebug x debugNote = do
13461013 x' <- evaluate x
13471014 mkWeakPtr x' $
13481015 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1016+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501017 else Nothing
13511018
13521019type WeakList a = [Weak a]
13531020
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−
13811021{-# 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
1022+#ifdef DEBUG
1023+withIncreasedDepth :: CanTrace x m => m a -> m a
1024+withIncreasedDepth a = do
1025+ spiderEnv <- askSpiderTimeline
1026+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) succ
13851027 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1028+ liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
13871029 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−
14121030#else
1031+withIncreasedDepth :: m a -> m a
1032+withIncreasedDepth = id
1033+#endif
14131034
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1035+type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
14171036
14181037{-# INLINE tracePropagate #-}
1419−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1038+tracePropagate :: (CanTrace x m) => String -> m ()
1039+tracePropagate = traceWhen debugPropagate
1040+
1041+{-# INLINE traceSubscribe #-}
1042+traceSubscribe :: String -> IO ()
1043+traceSubscribe = when debugSubscribe . liftIO . putStrLn
14211044
14221045{-# INLINE traceInvalidate #-}
14231046traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1047+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14251048
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1049+{-# INLINE traceWhen #-}
1050+traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1051+traceWhen b message = traceMWhen b $ return message
14471052
1053+{-# INLINE traceMWhen #-}
1054+traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1055+traceMWhen b getMessage = when b $ do
1056+ message <- getMessage
1057+#ifdef DEBUG
1058+ spiderEnv <- askSpiderTimeline
1059+ d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
1060+#else
1061+ let d = 0
14481062#endif
1063+ liftIO $ putStrLn $ replicate d ' ' <> message
14491064
14501065whoCreatedIORef :: IORef a -> IO [String]
14511066whoCreatedIORef (IORef a) = whoCreated $! a
@@ -1460,278 +1075,431 @@ groupByHead = \case
14601075 | otherwise -> (x, xs :| []) : l
14611076
14621077listsToForest :: 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−
1495−#endif
1078+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14961079
1080+-- | Propagate everything at the current height
1081+propagate :: a -> SubscriberList a -> EventM x ()
1082+propagate a subscribers = withIncreasedDepth $ do
1083+ -- 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
1084+ --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
1085+ WeakBag.traverse subscribers $ \s -> case s of
1086+ SubscriberPush compute subscribed -> {-# SCC "traversePush" #-} do
1087+ tracePropagate $ "SubscriberPush" <> showNodeId subscribed
1088+ occ <- runComputeM $ compute a
1089+ case occ of
1090+ Nothing -> return () -- No need to write a Nothing back into the Ref
1091+ Just o -> do
1092+ liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
1093+ scheduleClear $ pushSubscribedOccurrence subscribed
1094+ propagate o $ pushSubscribedSubscribers subscribed
1095+ SubscriberMerge k subscribed -> {-# SCC "traverseMerge" #-} do
1096+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
1097+ oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1098+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
1099+ tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1100+ liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
1101+ when (DMap.null oldM) $ do -- Only schedule the firing once
1102+ height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1103+ --TODO: assertions about height
1104+ currentHeight <- getCurrentHeight
1105+ when (height <= currentHeight) $ do
1106+ myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
1107+ if height /= invalidHeight
1108+ then error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1109+ else liftIO $ do
1110+ nodesInvolvedInCycle <- walkInvalidHeightParents $ EventSubscribedMerge subscribed
1111+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1112+ error $ "Causality loop found:\n" <> drawForest (listsToForest stacks)
1113+ scheduleMerge height subscribed
1114+ SubscriberMergeChange subscribed -> {-# SCC "traverseMergeChange" #-} do
1115+ tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
1116+ defer $ SomeMergeUpdate a subscribed
1117+ SubscriberFan subscribed -> {-# SCC "traverseFan" #-} do
1118+ subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
1119+ tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
1120+ --TODO: We need a better DMap intersection; here, we are assuming that the number of firing keys is small and the number of subscribers is large
1121+ forM_ (DMap.toList a) $ \(k :=> Identity v) -> {-# SCC "SubscriberFan" #-} case DMap.lookup k subs of
1122+ Nothing -> do
1123+ tracePropagate "No subscriber for key"
1124+ return ()
1125+ Just subsubs -> do
1126+ propagate v $ _fanSubscribedChildren_list subsubs
1127+ return ()
1128+ SubscriberHold h -> {-# SCC "traverseHold" #-} propagateSubscriberHold h a
1129+ SubscriberHoldIdentity h -> {-# SCC "traverseHoldIdentity" #-} propagateSubscriberHold h a
1130+ SubscriberSwitch subscribed -> {-# SCC "traverseSwitch" #-} do
1131+ tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
1132+ liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
1133+ scheduleClear $ switchSubscribedOccurrence subscribed
1134+ propagate a $ switchSubscribedSubscribers subscribed
1135+ SubscriberCoincidenceOuter subscribed -> {-# SCC "traverseCoincidenceOuter" #-} do
1136+ tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
1137+ outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
1138+ tracePropagate $ " outerHeight = " <> show outerHeight
1139+ (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
1140+ tracePropagate $ " isJust occ = " <> show (isJust occ)
1141+ tracePropagate $ " innerHeight = " <> show innerHeight
1142+ liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
1143+ scheduleClear $ coincidenceSubscribedInnerParent subscribed
1144+ case occ of
1145+ Nothing -> do
1146+ when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
1147+ writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
1148+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
1149+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
1150+ Just o -> do -- Since it's already firing, no need to adjust height
1151+ liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
1152+ scheduleClear $ coincidenceSubscribedOccurrence subscribed
1153+ propagate o $ coincidenceSubscribedSubscribers subscribed
1154+ SubscriberCoincidenceInner subscribed -> {-# SCC "traverseCoincidenceInner" #-} do
1155+ tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
1156+ occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
1157+ case occ of
1158+ Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
1159+ Nothing -> do
1160+ liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
1161+ scheduleClear $ coincidenceSubscribedOccurrence subscribed
1162+ propagate a $ coincidenceSubscribedSubscribers subscribed
1163+ SubscriberHandle -> {-# SCC "traverseHandle" #-} tracePropagate "SubscriberHandle"
14971164
14981165{-# INLINE propagateSubscriberHold #-}
1499−propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1166+propagateSubscriberHold :: R.Patch p => Hold p a -> p a -> EventM x ()
15001167propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1168+ {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
15021169 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031170 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051171 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506− case {-# SCC "apply" #-} apply a v of
1172+ case {-# SCC "apply" #-} R.apply a v of
15071173 Nothing -> return ()
15081174 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1175+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111176 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121177 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131178 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
15141179
1515−data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1180+data SomeResetCoincidence = forall a. SomeResetCoincidence !(EventSubscription a) !(Maybe (CoincidenceSubscribed a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161181
1517−runBehaviorM :: 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)
1182+{-# SPECIALIZE readBehaviorUntracked :: Behavior a -> BehaviorM a #-}
1183+{-# SPECIALIZE readBehaviorUntracked :: Behavior a -> EventM x a #-}
1184+readBehaviorUntracked :: Defer SomeHoldInit m => Behavior a -> m a
1185+readBehaviorUntracked b = do
1186+ holdInits <- getDeferralQueue
1187+ liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
1188+
1189+runBehaviorM :: BehaviorM a -> Maybe (Weak Invalidator, IORef [SomeBehaviorSubscribed]) -> IORef [SomeHoldInit] -> IO a
1190+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191191
1520−askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1192+askInvalidator :: BehaviorM (Maybe (Weak Invalidator))
15211193askInvalidator = do
1522− (!m, _) <- ask
1194+ (!m, _) <- BehaviorM ask
15231195 case m of
15241196 Nothing -> return Nothing
15251197 Just (!wi, _) -> return $ Just wi
15261198
1527−askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1199+askParentsRef :: BehaviorM (Maybe (IORef [SomeBehaviorSubscribed]))
15281200askParentsRef = do
1529− (!m, _) <- ask
1201+ (!m, _) <- BehaviorM ask
15301202 case m of
15311203 Nothing -> return Nothing
15321204 Just (_, !p) -> return $ Just p
15331205
1534−askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1206+askBehaviorHoldInits :: BehaviorM (IORef [SomeHoldInit])
15351207askBehaviorHoldInits = do
1536− (_, !his) <- ask
1208+ (_, !his) <- BehaviorM ask
15371209 return his
15381210
1211+readBehaviorTracked :: Behavior a -> BehaviorM a
1212+readBehaviorTracked b = case b of
1213+ BehaviorHold h -> readHoldTracked h
1214+ BehaviorHoldIdentity h -> readHoldTracked h
1215+ BehaviorConst a -> return a
1216+ BehaviorPull p -> do
1217+ val <- liftIO $ readIORef $ pullValue p
1218+ case val of
1219+ Just subscribed -> do
1220+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1221+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
1222+ liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
1223+ return $ pullSubscribedValue subscribed
1224+ Nothing -> do
1225+ i <- liftIO $ newInvalidatorPull p
1226+ wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
1227+ parentsRef <- liftIO $ newIORef []
1228+ holdInits <- askBehaviorHoldInits
1229+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
1230+ invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
1231+ parents <- liftIO $ readIORef parentsRef
1232+ let subscribed = PullSubscribed
1233+ { pullSubscribedValue = a
1234+ , pullSubscribedInvalidators = invsRef
1235+ , pullSubscribedOwnInvalidator = i
1236+ , pullSubscribedParents = parents
1237+ }
1238+ liftIO $ writeIORef (pullValue p) $ Just subscribed
1239+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1240+ return a
1241+ BehaviorDyn d -> readHoldTracked =<< getDynHold d
1242+ BehaviorDynIdentity d -> readHoldTracked =<< getDynHold d
1243+
1244+{-# INLINE readHoldTracked #-}
1245+readHoldTracked :: Hold p a -> BehaviorM a
1246+readHoldTracked h = do
1247+ result <- liftIO $ readIORef $ holdValue h
1248+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
1249+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
1250+ return result
1251+
15391252{-# INLINE getDynHold #-}
1540−getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
1253+getDynHold :: (Defer SomeHoldInit m, R.Patch p) => Dyn p a -> m (Hold p a)
15411254getDynHold d = do
15421255 mh <- liftIO $ readIORef $ unDyn d
15431256 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1257+ Right h -> return h
1258+ Left (readV0, v') -> do
15461259 holdInits <- getDeferralQueue
15471260 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
15541261 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1262+ liftIO $ writeIORef (unDyn d) $ Right h
15561263 return h
15571264
1265+readRootSubscribed :: RootSubscribed a -> IO (Maybe a)
1266+readRootSubscribed = rootSubscribedOccurrence
1267+
1268+readPushSubscribed :: PushSubscribed b a -> IO (Maybe a)
1269+readPushSubscribed subscribed = do
1270+ result <- readIORef $ pushSubscribedOccurrence subscribed -- Since ResultM is always called after the final height is reached, this will always be valid
1271+ touch $ pushSubscribedSelf subscribed
1272+ return result
1273+
1274+readMergeSubscribed :: MergeSubscribed k -> IO (Maybe (DMap k Identity))
1275+readMergeSubscribed subscribed = do
1276+ result <- readIORef $ mergeSubscribedOccurrence subscribed
1277+ touch $ mergeSubscribedParents subscribed
1278+ return result
1279+
1280+readFanSubscribed :: GCompare k => k a -> FanSubscribed k -> IO (Maybe a)
1281+readFanSubscribed k fs = do
1282+ parentOcc <- readEventSubscribed $ _eventSubscription_subscribed $ fanSubscribedParent fs
1283+ return $ coerce $ DMap.lookup k =<< parentOcc
1284+
1285+readSwitchSubscribed :: SwitchSubscribed a -> IO (Maybe a)
1286+readSwitchSubscribed subscribed = do
1287+ result <- readIORef $ switchSubscribedOccurrence subscribed
1288+ touch $ switchSubscribedOwnInvalidator subscribed
1289+ return result
1290+
1291+readCoincidenceSubscribed :: CoincidenceSubscribed a -> IO (Maybe a)
1292+readCoincidenceSubscribed subscribed = do
1293+ result <- readIORef $ coincidenceSubscribedOccurrence subscribed
1294+ touch $ coincidenceSubscribedOuter subscribed
1295+ --TODO: do we need to touch the inner subscriber?
1296+ return result
15581297
15591298-- Always refers to 0
15601299{-# NOINLINE zeroRef #-}
15611300zeroRef :: IORef Height
15621301zeroRef = unsafePerformIO $ newIORef zeroHeight
15631302
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)
1303+{-# INLINE subscribeHoldEvent #-}
1304+subscribeHoldEvent :: (CanSubscribe x m, R.Patch p) => Hold p a -> Subscriber (p a) -> m (EventSubscription (p a))
1305+subscribeHoldEvent h sub = do
1306+ EventSubscription _ subd <- getHoldEventSubscription h
1307+ sln <- liftIO $ subscribeEventSubscribed subd sub
1308+ return $ EventSubscription sln subd
1309+
1310+{-# INLINE debugSubscribe #-}
1311+debugSubscribe :: Bool
1312+debugSubscribe = False
1313+
1314+
1315+type CanSubscribe x m =
1316+ ( HasSpiderTimeline x m
1317+ , HasCurrentHeight m
1318+ , Defer SomeHoldInit m, Defer SomeMergeInit m -- The things we need to lazily initialize state
1319+ , Defer SomeClear m -- Wiping out event firings
1320+ , Defer SomeAssignment m -- Updating state
1321+ , Defer SomeResetCoincidence m
1322+ )
1323+
1324+getRootSubscribed :: GCompare k => k a -> Root k -> Subscriber a -> IO (SubscriberListTicket a, RootSubscribed a)
15651325getRootSubscribed k r sub = do
15661326 mSubscribed <- readIORef $ rootSubscribed r
1567− let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
15681327 case DMap.lookup k mSubscribed of
15691328 Just subscribed -> {-# SCC "hitRoot" #-} do
15701329 sln <- subscribeRootSubscribed subscribed sub
1571− occ <- getOcc
1572− return (sln, subscribed, occ)
1330+ return (sln, subscribed)
15731331 Nothing -> {-# SCC "missRoot" #-} do
15741332 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
15751333 let !cached = rootSubscribed r
15761334 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771335 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1336+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811337 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821338 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
1586− let !subscribed = RootSubscribed
1339+ let subscribed = RootSubscribed
15871340 { rootSubscribedKey = k
15881341 , rootSubscribedCachedSubscribed = cached
1589− , rootSubscribedOccurrence = getOcc
1342+ , rootSubscribedOccurrence = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
15901343 , rootSubscribedSubscribers = subs
15911344 , rootSubscribedUninit = uninit
15921345 , rootSubscribedWeakSelf = weakSelf
15931346#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1347+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951348#endif
15961349 }
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)
1350+ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
16081351 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
1609− occ <- getOcc
1610− return (sln, subscribed, occ)
1352+ return (sln, subscribed)
16111353
1612−#ifdef USE_TEMPLATE_HASKELL
16131354{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614−#endif
1615−cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1616−cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
1355+cleanupRootSubscribed :: RootSubscribed a -> IO ()
1356+cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
16171357 rootSubscribedUninit self
16181358 modifyIORef' cached $ DMap.delete k
16191359
16201360{-# INLINE subscribeRootSubscribed #-}
1621−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1361+subscribeRootSubscribed :: RootSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
16221362subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231363
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"
1364+-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1365+{-# SPECIALIZE getPushSubscribed :: Push a b -> Subscriber b -> EventM x (SubscriberListTicket b, PushSubscribed a b) #-}
1366+getPushSubscribed :: CanSubscribe x m => Push a b -> Subscriber b -> m (SubscriberListTicket b, PushSubscribed a b)
1367+getPushSubscribed p sub = do
1368+ mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1369+ case mSubscribed of
1370+ Just subscribed -> {-# SCC "hitPush" #-} do
1371+ sln <- liftIO $ subscribePushSubscribed subscribed sub
1372+ return (sln, subscribed)
1373+ Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1374+ subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1375+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1376+ s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
1377+ subscription@(EventSubscription _ subd) <- subscribe (pushParent p) s
1378+ parentOcc <- liftIO $ readEventSubscribed subd
1379+ occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1380+ occRef <- liftIO $ newIORef occ
1381+ when (isJust occ) $ scheduleClear occRef
1382+ weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1383+ let !cached = pushSubscribed p
1384+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1385+ let subscribed = PushSubscribed
1386+ { pushSubscribedCachedSubscribed = cached
1387+ , pushSubscribedOccurrence = occRef
1388+ , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1389+ , pushSubscribedSubscribers = subs
1390+ , pushSubscribedSelf = s
1391+ , pushSubscribedWeakSelf = weakSelf
1392+ , pushSubscribedParent = subscription
16401393#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1394+ , pushSubscribedNodeId = unsafeNodeId p
16421395#endif
1643− return $ FanInt
1644− { _fanInt_subscribers = subscribers
1645− , _fanInt_subscriptionRef = subscriptionRef
1646− , _fanInt_occRef = occRef
1396+ }
1397+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1398+ liftIO $ writeIORef subscribedRef $! subscribed
1399+ liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1400+ return (sln, subscribed)
1401+
1402+cleanupPushSubscribed :: PushSubscribed a b -> IO ()
1403+cleanupPushSubscribed self = do
1404+ unsubscribe $ pushSubscribedParent self
1405+ writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1406+
1407+{-# INLINE subscribePushSubscribed #-}
1408+subscribePushSubscribed :: PushSubscribed a b -> Subscriber b -> IO (SubscriberListTicket b)
1409+subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1410+
1411+{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge k -> Subscriber (DMap k Identity) -> EventM x (SubscriberListTicket (DMap k Identity), MergeSubscribed k) #-}
1412+getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge k -> Subscriber (DMap k Identity) -> m (SubscriberListTicket (DMap k Identity), MergeSubscribed k)
1413+getMergeSubscribed m sub = do
1414+ mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1415+ case mSubscribed of
1416+ Just subscribed -> {-# SCC "hitMerge" #-} do
1417+ sln <- liftIO $ subscribeMergeSubscribed subscribed sub
1418+ return (sln, subscribed)
1419+ Nothing -> {-# SCC "missMerge" #-} do
1420+ subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1421+ subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1422+ initialParents <- readBehaviorUntracked $ current $ mergeParents m
1423+ subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent k))] <- forM (DMap.toList initialParents) $ {-# SCC "getMergeSubscribed.a" #-} \(k :=> e) -> do
1424+ s <- {-# SCC "getMergeSubscribed.a.1" #-} liftIO $ newSubscriberMerge k subscribedUnsafe
1425+ subscription@(EventSubscription _ parentSubd) <- {-# SCC "getMergeSubscribed.a.2" #-} subscribe e s
1426+ parentOcc <- {-# SCC "getMergeSubscribed.a.3" #-} liftIO $ readEventSubscribed parentSubd
1427+ height <- {-# SCC "getMergeSubscribed.a.4" #-} liftIO $ getEventSubscribedHeight parentSubd
1428+ {-# SCC "getMergeSubscribed.a.5" #-} return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1429+ let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1430+ heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1431+ myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1432+ myHeight = if invalidHeight `elem` heights
1433+ then invalidHeight
1434+ else succHeight $ heightBagMax myHeightBag
1435+ currentHeight <- getCurrentHeight
1436+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1437+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1438+ else (Nothing, dm)
1439+ unless (DMap.null accum) $ do
1440+ scheduleMerge myHeight subscribedUnsafe
1441+ occRef <- liftIO $ newIORef occ
1442+ when (isJust occ) $ scheduleClear occRef
1443+ accumRef <- liftIO $ newIORef accum
1444+ heightRef <- liftIO $ newIORef myHeight
1445+ heightMapRef <- liftIO $ newIORef myHeightBag
1446+ weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1447+ (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1448+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1449+ parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1450+ let !subscribed = MergeSubscribed
1451+ { mergeSubscribedCachedSubscribed = mergeSubscribed m
1452+ , mergeSubscribedOccurrence = occRef
1453+ , mergeSubscribedAccum = accumRef
1454+ , mergeSubscribedHeight = heightRef
1455+ , mergeSubscribedHeightBag = heightMapRef
1456+ , mergeSubscribedSubscribers = subs
1457+ , mergeSubscribedChange = changeSubdRef
1458+ , mergeSubscribedParents = parentsRef
1459+ , mergeSubscribedWeakSelf = weakSelf
16471460#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
1461+ , mergeSubscribedNodeId = unsafeNodeId m
17021462#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))
1463+ }
1464+ defer $ SomeMergeInit subscribed $ updated $ mergeParents m
1465+ liftIO $ writeIORef subscribedRef $! subscribed
1466+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1467+ liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1468+ return (sln, subscribed)
1469+
1470+cleanupMergeSubscribed :: MergeSubscribed k -> IO ()
1471+cleanupMergeSubscribed subscribed = do
1472+ parents <- readIORef $ mergeSubscribedParents subscribed
1473+ forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1474+ -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1475+ writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1476+
1477+{-# INLINE subscribeMergeSubscribed #-}
1478+subscribeMergeSubscribed :: MergeSubscribed k -> Subscriber (DMap k Identity) -> IO (SubscriberListTicket (DMap k Identity))
1479+subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1480+
1481+{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan k -> Subscriber a -> EventM x (SubscriberListTicket a, FanSubscribed k) #-}
1482+getFanSubscribed :: (Defer SomeAssignment m, Defer SomeHoldInit m, Defer SomeMergeInit m, Defer SomeClear m, HasCurrentHeight m, Defer SomeResetCoincidence m, HasSpiderTimeline x m, GCompare k) => k a -> Fan k -> Subscriber a -> m (SubscriberListTicket a, FanSubscribed k)
17081483getFanSubscribed k f sub = do
17091484 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101485 case mSubscribed of
1711− Just subscribed -> {-# SCC "hitFan" #-} liftIO $ do
1712− sln <- subscribeFanSubscribed k subscribed sub
1713− occ <- readIORef $ fanSubscribedOccurrence subscribed
1714− return (sln, subscribed, coerce $ DMap.lookup k =<< occ)
1486+ Just subscribed -> {-# SCC "hitFan" #-} do
1487+ sln <- liftIO $ subscribeFanSubscribed k subscribed sub
1488+ return (sln, subscribed)
17151489 Nothing -> {-# SCC "missFan" #-} do
17161490 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
17171491 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
17181492 s <- liftIO $ newSubscriberFan subscribedUnsafe
1719− (subscription, parentOcc) <- subscribeAndRead (fanParent f) s
1493+ subscription <- subscribe (fanParent f) s
17201494 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
17211495 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
17221496 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723− occRef <- liftIO $ newIORef parentOcc
1724− when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281497 let subscribed = FanSubscribed
17291498 { fanSubscribedCachedSubscribed = fanSubscribed f
1730− , fanSubscribedOccurrence = occRef
17311499 , fanSubscribedParent = subscription
17321500 , fanSubscribedSubscribers = subscribersRef
17331501#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1502+ , fanSubscribedNodeId = unsafeNodeId f
17351503#endif
17361504 }
17371505 let !self = (k, subscribed)
@@ -1739,9 +1507,9 @@ getFanSubscribed k f sub = do
17391507 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
17401508 liftIO $ writeIORef subscribedRef $! subscribed
17411509 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742− return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1510+ return (slnForSub, subscribed)
17431511
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1512+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed k) -> IO ()
17451513cleanupFanSubscribed (k, subscribed) = do
17461514 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471515 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1521,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531521 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541522
17551523{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1524+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed k -> Subscriber a -> IO (SubscriberListTicket a)
17571525subscribeFanSubscribed k subscribed sub = do
17581526 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591527 case DMap.lookup k subscribers of
@@ -1761,19 +1529,18 @@ subscribeFanSubscribed k subscribed sub = do
17611529 let !self = (k, subscribed)
17621530 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
17631531 (list, sln) <- WeakBag.singleton sub weakSelf cleanupFanSubscribed
1764− writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeFanSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
1532+ writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeEventSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
17651533 return sln
17661534 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671535
1768−{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1536+{-# SPECIALIZE getSwitchSubscribed :: Switch a -> Subscriber a -> EventM x (SubscriberListTicket a, SwitchSubscribed a) #-}
1537+getSwitchSubscribed :: (Defer SomeHoldInit m, Defer SomeAssignment m, Defer SomeMergeInit m, Defer SomeClear m, Defer SomeResetCoincidence m, HasCurrentHeight m, HasSpiderTimeline x m) => Switch a -> Subscriber a -> m (SubscriberListTicket a, SwitchSubscribed a)
17701538getSwitchSubscribed s sub = do
17711539 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721540 case mSubscribed of
1773− Just subscribed -> {-# SCC "hitSwitch" #-} liftIO $ do
1774− sln <- subscribeSwitchSubscribed subscribed sub
1775− occ <- readIORef $ switchSubscribedOccurrence subscribed
1776− return (sln, subscribed, occ)
1541+ Just subscribed -> {-# SCC "hitSwitch" #-} do
1542+ sln <- liftIO $ subscribeSwitchSubscribed subscribed sub
1543+ return (sln, subscribed)
17771544 Nothing -> {-# SCC "missSwitch" #-} do
17781545 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
17791546 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
@@ -1784,16 +1551,14 @@ getSwitchSubscribed s sub = do
17841551 parentsRef <- liftIO $ newIORef [] --TODO: This should be unnecessary, because it will always be filled with just the single parent behavior
17851552 holdInits <- getDeferralQueue
17861553 e <- liftIO $ runBehaviorM (readBehaviorTracked (switchParent s)) (Just (wi, parentsRef)) holdInits
1787− (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead e mySub
1788− heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
1554+ subscription@(EventSubscription _ subd) <- subscribe e mySub
17891555 subscriptionRef <- liftIO $ newIORef subscription
1556+ parentOcc <- liftIO $ readEventSubscribed subd
17901557 occRef <- liftIO $ newIORef parentOcc
17911558 when (isJust parentOcc) $ scheduleClear occRef
1559+ heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
17921560 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931561 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971562 let !subscribed = SwitchSubscribed
17981563 { switchSubscribedCachedSubscribed = switchSubscribed s
17991564 , switchSubscribedOccurrence = occRef
@@ -1806,38 +1571,38 @@ getSwitchSubscribed s sub = do
18061571 , switchSubscribedCurrentParent = subscriptionRef
18071572 , switchSubscribedWeakSelf = weakSelf
18081573#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1574+ , switchSubscribedNodeId = unsafeNodeId s
18101575#endif
18111576 }
18121577 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
18131578 liftIO $ writeIORef subscribedRef $! subscribed
18141579 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1815− return (slnForSub, subscribed, parentOcc)
1580+ return (slnForSub, subscribed)
18161581
1817−cleanupSwitchSubscribed :: SwitchSubscribed x a -> IO ()
1582+cleanupSwitchSubscribed :: SwitchSubscribed a -> IO ()
18181583cleanupSwitchSubscribed subscribed = do
18191584 unsubscribe =<< readIORef (switchSubscribedCurrentParent subscribed)
18201585 finalize =<< readIORef (switchSubscribedOwnWeakInvalidator subscribed) -- We don't need to get invalidated if we're dead
18211586 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
18221587
18231588{-# INLINE subscribeSwitchSubscribed #-}
1824−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1589+subscribeSwitchSubscribed :: SwitchSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
18251590subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261591
1827−{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1592+{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence a -> Subscriber a -> EventM x (SubscriberListTicket a, CoincidenceSubscribed a) #-}
1593+getCoincidenceSubscribed :: forall x a m. (Defer SomeAssignment m, Defer SomeHoldInit m, Defer SomeMergeInit m, Defer SomeClear m, HasCurrentHeight m, Defer SomeResetCoincidence m, HasSpiderTimeline x m) => Coincidence a -> Subscriber a -> m (SubscriberListTicket a, CoincidenceSubscribed a)
18291594getCoincidenceSubscribed c sub = do
18301595 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311596 case mSubscribed of
1832− Just subscribed -> {-# SCC "hitCoincidence" #-} liftIO $ do
1833− sln <- subscribeCoincidenceSubscribed subscribed sub
1834− occ <- readIORef $ coincidenceSubscribedOccurrence subscribed
1835− return (sln, subscribed, occ)
1597+ Just subscribed -> {-# SCC "hitCoincidence" #-} do
1598+ sln <- liftIO $ subscribeCoincidenceSubscribed subscribed sub
1599+ return (sln, subscribed)
18361600 Nothing -> {-# SCC "missCoincidence" #-} do
18371601 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
18381602 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
18391603 subOuter <- liftIO $ newSubscriberCoincidenceOuter subscribedUnsafe
1840− (outerSubscription@(EventSubscription _ outerSubd), outerOcc) <- subscribeAndRead (coincidenceParent c) subOuter
1604+ outerSubscription@(EventSubscription _ outerSubd) <- subscribe (coincidenceParent c) subOuter
1605+ outerOcc <- liftIO $ readEventSubscribed outerSubd
18411606 outerHeight <- liftIO $ getEventSubscribedHeight outerSubd
18421607 (occ, height, mInnerSubd) <- case outerOcc of
18431608 Nothing -> return (Nothing, outerHeight, Nothing)
@@ -1851,9 +1616,6 @@ getCoincidenceSubscribed c sub = do
18511616 scheduleClear innerSubdRef
18521617 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531618 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571619 let subscribed = CoincidenceSubscribed
18581620 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591621 , coincidenceSubscribedOccurrence = occRef
@@ -1864,549 +1626,160 @@ getCoincidenceSubscribed c sub = do
18641626 , coincidenceSubscribedInnerParent = innerSubdRef
18651627 , coincidenceSubscribedWeakSelf = weakSelf
18661628#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1629+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681630#endif
18691631 }
18701632 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
18711633 liftIO $ writeIORef subscribedRef $! subscribed
18721634 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1873− return (slnForSub, subscribed, occ)
1635+ return (slnForSub, subscribed)
18741636
1875−cleanupCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO ()
1637+cleanupCoincidenceSubscribed :: CoincidenceSubscribed a -> IO ()
18761638cleanupCoincidenceSubscribed subscribed = do
18771639 unsubscribe $ coincidenceSubscribedOuterParent subscribed
18781640 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
18791641
18801642{-# INLINE subscribeCoincidenceSubscribed #-}
1881−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1643+subscribeCoincidenceSubscribed :: CoincidenceSubscribed a -> Subscriber a -> IO (SubscriberListTicket a)
18821644subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831645
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
1646+{-# INLINE merge #-}
1647+merge :: GCompare k => Dynamic R.PatchDMap (DMap k Event) -> Event (DMap k Identity)
1648+merge m = EventMerge $ Merge
1649+ { mergeParents = m
1650+ , mergeSubscribed = unsafeNewIORef m Nothing
20951651 }
20961652
2097−--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100− where updateMe = do
2101− oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103− liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104− return subscriptionsToKill
2105−
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110− initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111− accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112− heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113− heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114− parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120−#ifdef DEBUG_CYCLES
2121− , eventSubscribedGetParents = do
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123− fmap getParent' . DMap.toList <$> readIORef parentsRef
2124− , eventSubscribedHasOwnHeightRef = False
2125− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126−#endif
2127− }
2128−
2129− m = Merge
2130− { _merge_parentsRef = parentsRef
2131− , _merge_heightBagRef = heightBagRef
2132− , _merge_heightRef = heightRef
2133− , _merge_sub = sub
2134− , _merge_accumRef = accumRef
2135− }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
2137− let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138− myHeight = if invalidHeight `elem` heights
2139− then invalidHeight
2140− else succHeight $ heightBagMax myHeightBag
2141− currentHeight <- getCurrentHeight
2142− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2143− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144− else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
2146− liftIO $ writeIORef accumRef $! accum
2147− liftIO $ writeIORef heightRef $! myHeight
2148− liftIO $ writeIORef heightBagRef $! myHeightBag
2149− liftIO $ writeIORef parentsRef $! initialParentState
2150− defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
2152− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
2155− , subscriberInvalidateHeight = \_ -> return ()
2156− , subscriberRecalculateHeight = \_ -> return ()
2157− }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2160− -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2161− -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162− -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2164− let unsubscribeAll = destroy =<< readIORef parentsRef
2165−
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2167−
2168−
2169−mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170−mergeInt = cacheEvent . mergeIntCheap
2171−
2172−{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174−mergeIntCheap d = Event $ \sub -> do
2175− initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176− accum <- liftIO $ FastMutableIntMap.newEmpty
2177− heightRef <- liftIO $ newIORef zeroHeight
2178− heightBagRef <- liftIO $ newIORef heightBagEmpty
2179− parents <- liftIO $ FastMutableIntMap.newEmpty
2180− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181− let subscribed = EventSubscribed
2182− { eventSubscribedHeightRef = heightRef
2183− , eventSubscribedRetained = toAny (parents, changeSubdRef)
2184−#ifdef DEBUG_CYCLES
2185− , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186− , eventSubscribedHasOwnHeightRef = False
2187− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188−#endif
2189− }
2190− let scheduleSelf = do
2191− height <- liftIO $ readIORef $ heightRef
2192− scheduleMerge' height heightRef $ do
2193− vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194− subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196− recalculateMyHeight = do
2197− currentHeight <- readIORef heightRef
2198− when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
2199− heights <- readIORef heightBagRef
2200− numParents <- FastMutableIntMap.size parents
2201− case heightBagSize heights `compare` numParents of
2202− LT -> return ()
2203− EQ -> do
2204− let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206− writeIORef heightRef $! height
2207− subscriberRecalculateHeight sub height
2208− GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209− mySubscriber k = Subscriber
2210− { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
2213− wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214− liftIO $ FastMutableIntMap.insert accum k a
2215− when wasEmpty scheduleSelf
2216− , subscriberInvalidateHeight = \old -> do
2217− modifyIORef' heightBagRef $ heightBagRemove old
2218− invalidateMyHeight
2219− , subscriberRecalculateHeight = \new -> do
2220− modifyIORef' heightBagRef $ heightBagAdd new
2221− recalculateMyHeight
2222− }
2223− forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2225− liftIO $ do
2226− forM_ parentOcc $ FastMutableIntMap.insert accum k
2227− FastMutableIntMap.insert parents k subscription
2228− height <- getEventSubscribedHeight parentSubd
2229− if height == invalidHeight
2230− then writeIORef heightRef invalidHeight
2231− else do
2232− modifyIORef' heightBagRef $ heightBagAdd height
2233− modifyIORef' heightRef $ \oldHeight ->
2234− if oldHeight == invalidHeight
2235− then invalidHeight
2236− else max (succHeight height) oldHeight
2237− myHeight <- liftIO $ readIORef heightRef
2238− currentHeight <- getCurrentHeight
2239− isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240− occ <- if currentHeight >= myHeight -- If we should have fired by now
2241− then if isEmpty
2242− then return Nothing
2243− else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244− else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245− return Nothing
2246− defer $ SomeMergeInit $ do
2247− let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2248− where
2249− u = do
2250− let f k newParent = do
2251− subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252− newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253− liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254− return subscription
2255− newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256− oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257− liftIO $ for_ oldParents $ \oldParent -> do
2258− oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
2261− modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262− return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2264− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265− tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266− defer $ updateMe a
2267− , subscriberInvalidateHeight = \_ -> return ()
2268− , subscriberRecalculateHeight = \_ -> return ()
2269− }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271− forM_ change $ \c -> defer $ updateMe c
2272− -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273− -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274− -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276− let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
1653+newtype EventSelector k = EventSelector { select :: forall a. k a -> Event a }
22801654
2281−newtype 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) }
2283−
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1655+fan :: GCompare k => Event (DMap k Identity) -> EventSelector k
1656+fan e =
22871657 let f = Fan
22881658 { fanParent = e
2289− , fanSubscribed = ref
1659+ , fanSubscribed = unsafeNewIORef e Nothing
22901660 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1661+ in EventSelector $ \k -> EventFan k f
22921662
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1663+runHoldInits :: IORef [SomeHoldInit] -> IORef [SomeMergeInit] -> EventM x ()
1664+runHoldInits holdInitRef mergeInitRef = do
22951665 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
22971666 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1667+ unless (null holdInits && null mergeInits) $ do
22991668 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
23011669 liftIO $ writeIORef mergeInitRef []
23021670 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
2304− mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1671+ mapM_ initMerge mergeInits
1672+ runHoldInits holdInitRef mergeInitRef
23061673
2307−initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
1674+initHold :: SomeHoldInit -> EventM x ()
23081675initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
23091676
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
1677+initMerge :: SomeMergeInit -> EventM x ()
1678+initMerge (SomeMergeInit subscribed changed) = do
1679+ changeSub <- liftIO $ newSubscriberMergeChange subscribed
1680+ EventSubscription _ changeSubd <- subscribe changed changeSub
1681+ change <- liftIO $ readEventSubscribed changeSubd
1682+ forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1683+ liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
23121684
2313−newEventEnv :: IO (EventEnv x)
2314−newEventEnv = do
1685+-- | Run an event action outside of a frame
1686+runFrame :: EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1687+runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1688+ -- Clear out pending unsubscriptions; these will need to happen eventually anyway, and might cause us a lot of extra work during the frame, so get rid of them now
1689+ pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1690+ {-# SCC "cleanups" #-} sequence_ pendingCleanups
23151691 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
23161692 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
23181693 mergeUpdateRef <- newIORef []
23191694 mergeInitRef <- newIORef []
23201695 heightRef <- newIORef zeroHeight
23211696 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231697 toClearRootRef <- newIORef []
23241698 coincidenceInfosRef <- newIORef []
2325− delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
2327−
2328−clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
2330− writeIORef toAssignRef []
2331− writeIORef holdInitRef []
2332− writeIORef dynInitRef []
2333− writeIORef mergeUpdateRef []
2334− writeIORef mergeInitRef []
2335− writeIORef heightRef zeroHeight
2336− writeIORef toClearRef []
2337− writeIORef toClearIntRef []
2338− writeIORef toClearRootRef []
2339− writeIORef coincidenceInfosRef []
2340− writeIORef delayedRef IntMap.empty
2341−
2342−-- | Run an event action outside of a frame
2343−runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344−runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1699+ delayedRef <- liftIO $ newIORef IntMap.empty
1700+ let env = EventEnv spiderEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23461701 let go = do
23471702 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
1703+ runHoldInits holdInitRef mergeInitRef -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
23491704 return result
2350− result <- runEventM go
2351− toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2353− toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2355− toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2357− toAssign <- readIORef $ eventEnvAssignments env
1705+ result <- runEventM go env
1706+ toClear <- readIORef toClearRef
1707+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1708+ toClearRoot <- readIORef toClearRootRef
1709+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1710+ toAssign <- readIORef toAssignRef
23581711 toReconnectRef <- newIORef []
2359− coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
1712+ coincidenceInfos <- readIORef coincidenceInfosRef
23601713 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611714 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1715+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631716 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364− mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365− writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2367− mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1717+ mergeUpdates <- readIORef mergeUpdateRef
1718+ writeIORef mergeUpdateRef []
1719+ let updateMerge :: SomeMergeUpdate -> IO [SomeEventSubscription]
1720+ updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k Event)) m) = do
1721+ oldParents <- readIORef $ mergeSubscribedParents m
1722+ let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1723+ (mOldSubd, newPs) <- case me of
1724+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1725+ Just e -> do
1726+ s <- liftIO $ newSubscriberMerge k m
1727+ subscription@(EventSubscription _ subd) <- subscribe e s
1728+ let newParent = MergeSubscribedParent subscription s
1729+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1730+ liftIO $ addMergeHeight newParentHeight m
1731+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1732+ forM_ mOldSubd $ \oldSubd -> do
1733+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1734+ liftIO $ removeMergeHeight oldHeight m
1735+ return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1736+ (subscriptionsToKill, newParents) <- flip runEventM env $ foldM f ([], oldParents) $ DMap.toList p --TODO: I think this runEventM is OK, since no events are firing at this time, but it might not be
1737+ writeIORef (mergeSubscribedParents m) $! newParents
1738+ return subscriptionsToKill
1739+ when debugPropagate $ putStrLn "Updating merges"
1740+ mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1741+ when debugPropagate $ putStrLn "Updating merges done"
23691742 toReconnect <- readIORef toReconnectRef
2370− clearEventEnv env
23711743 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721744 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731745 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1746+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751747 finalize wi
23761748 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771749 wi' <- mkWeakPtrWithDebug i "wi'"
23781750 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
23791751 writeIORef (switchSubscribedBehaviorParents subscribed) []
2380− writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
2381− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
2382− runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
1752+ writeIORef holdInitRef [] --TODO: Should we reuse this?
1753+ e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1754+ runEventM (runHoldInits holdInitRef mergeInitRef) env --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
23831755 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841756 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
1757+ subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderEnv --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
23861758 {-
23871759 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1760+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891761 EventRoot _ -> "EventRoot"
23901762 EventNever -> "EventNever"
23911763 _ -> "something else"
23921764 -}
23931765 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
2394− return oldSubscription
2395− liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
2396− liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
1766+ return $ SomeEventSubscription oldSubscription
1767+ forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
1768+ forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
23971769 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23981770 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
23991771 parentHeight <- getEventSubscribedHeight subd'
24001772 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011773 when (parentHeight /= myHeight) $ do
24021774 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2404− mapM_ _someMergeUpdate_invalidateHeight mergeUpdates --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
1775+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1776+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1777+ invalidateMergeHeight m --TODO: In addition to when the patch is completely empty, we should also not run this if it has some Nothing values, but none of them have actually had any effect; potentially, we could even check for Just values with no effect (e.g. by comparing their IORefs and ignoring them if they are unchanged); actually, we could just check if the new height is different
24051778 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061779 unsubscribe subscription
24071780 mapM_ invalidateCoincidenceHeight mcs
24081781 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
2409− mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
1782+ forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
24101783 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
24111784 height <- calculateSwitchHeight subscribed
24121785 updateSwitchHeight height subscribed
@@ -2422,12 +1795,10 @@ zeroHeight = Height 0
24221795invalidHeight :: Height
24231796invalidHeight = Height (-1000)
24241797
2425−#ifdef DEBUG_CYCLES
24261798-- | An invalid height that is currently being traversed, e.g. by walkInvalidHeightParents
24271799{-# INLINE invalidHeightBeingTraversed #-}
24281800invalidHeightBeingTraversed :: Height
24291801invalidHeightBeingTraversed = Height (-1001)
2430−#endif
24311802
24321803{-# INLINE succHeight #-}
24331804succHeight :: Height -> Height
@@ -2436,42 +1807,149 @@ succHeight h@(Height a) =
24361807 then invalidHeight
24371808 else Height $ succ a
24381809
2439−invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1810+invalidateSubscriberHeight :: Height -> Subscriber a -> IO ()
1811+invalidateSubscriberHeight old s = case s of
1812+ SubscriberPush _ subscribed -> do
1813+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
1814+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
1815+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
1816+ SubscriberMerge _ subscribed -> do
1817+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
1818+ removeMergeHeight old subscribed
1819+ invalidateMergeHeight subscribed
1820+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
1821+ SubscriberMergeChange _ -> return () -- Doesn't affect the height of the merge, because its changes are delayed
1822+ SubscriberFan subscribed -> do
1823+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
1824+ subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1825+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
1826+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
1827+ SubscriberHold _ -> return ()
1828+ SubscriberHoldIdentity _ -> return ()
1829+ SubscriberSwitch subscribed -> do
1830+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
1831+ oldHeight <- readIORef $ switchSubscribedHeight subscribed
1832+ when (oldHeight /= invalidHeight) $ do
1833+ writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1834+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1835+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
1836+ SubscriberCoincidenceOuter subscribed -> do
1837+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
1838+ invalidateCoincidenceHeight subscribed
1839+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
1840+ SubscriberCoincidenceInner subscribed -> do
1841+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
1842+ invalidateCoincidenceHeight subscribed
1843+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
1844+ SubscriberHandle -> return ()
1845+
1846+removeMergeHeight :: Height -> MergeSubscribed k -> IO ()
1847+removeMergeHeight oldParentHeight subscribed = do
1848+ when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1849+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1850+ let newHeights = heightBagRemove oldParentHeight oldHeights
1851+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1852+
1853+invalidateMergeHeight :: MergeSubscribed k -> IO ()
1854+invalidateMergeHeight subscribed = do
1855+ oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1856+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1857+ when (oldHeight /= invalidHeight) $ do
1858+ writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1859+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1860+
1861+addMergeHeight :: Height -> MergeSubscribed k -> IO ()
1862+addMergeHeight newParentHeight subscribed = do
1863+ when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1864+ oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1865+ let newHeights = heightBagAdd newParentHeight oldHeights
1866+ writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1867+
1868+revalidateMergeHeight :: MergeSubscribed k -> IO ()
1869+revalidateMergeHeight subscribed = do
1870+ currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1871+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1872+ heights <- readIORef $ mergeSubscribedHeightBag subscribed
1873+ parents <- readIORef $ mergeSubscribedParents subscribed
1874+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1875+ case heightBagSize heights `compare` DMap.size parents of
1876+ LT -> return ()
1877+ EQ -> do
1878+ let height = succHeight $ heightBagMax heights
1879+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1880+ writeIORef (mergeSubscribedHeight subscribed) $! height
1881+ WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1882+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1883+
1884+invalidateCoincidenceHeight :: CoincidenceSubscribed a -> IO ()
24401885invalidateCoincidenceHeight subscribed = do
24411886 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421887 when (oldHeight /= invalidHeight) $ do
24431888 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2445−
2446−updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
1889+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1890+
1891+recalculateSubscriberHeight :: Height -> Subscriber a -> IO ()
1892+recalculateSubscriberHeight new s = case s of
1893+ SubscriberPush _ subscribed -> do
1894+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
1895+ WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1896+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
1897+ SubscriberMerge _ subscribed -> do
1898+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
1899+ addMergeHeight new subscribed
1900+ revalidateMergeHeight subscribed
1901+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
1902+ SubscriberMergeChange _ -> return ()
1903+ SubscriberFan subscribed -> do
1904+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
1905+ subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1906+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
1907+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
1908+ SubscriberHold _ -> return ()
1909+ SubscriberHoldIdentity _ -> return ()
1910+ SubscriberSwitch subscribed -> do
1911+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
1912+ updateSwitchHeight new subscribed
1913+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
1914+ SubscriberCoincidenceOuter subscribed -> do
1915+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
1916+ recalculateCoincidenceHeight subscribed
1917+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
1918+ SubscriberCoincidenceInner subscribed -> do
1919+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
1920+ recalculateCoincidenceHeight subscribed
1921+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
1922+ SubscriberHandle -> return ()
1923+
1924+updateSwitchHeight :: Height -> SwitchSubscribed a -> IO ()
24471925updateSwitchHeight new subscribed = do
24481926 oldHeight <- readIORef $ switchSubscribedHeight subscribed
24491927 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501928 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511929 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1930+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531931
2454−recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
1932+recalculateCoincidenceHeight :: CoincidenceSubscribed a -> IO ()
24551933recalculateCoincidenceHeight subscribed = do
24561934 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24571935 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24581936 height <- calculateCoincidenceHeight subscribed
24591937 when (height /= invalidHeight) $ do
24601938 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1939+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621940
2463−calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
1941+calculateSwitchHeight :: SwitchSubscribed a -> IO Height
24641942calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
24651943
2466−calculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO Height
1944+calculateCoincidenceHeight :: CoincidenceSubscribed a -> IO Height
24671945calculateCoincidenceHeight subscribed = do
24681946 outerHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
24691947 innerHeight <- maybe (return zeroHeight) getEventSubscribedHeight =<< readIORef (coincidenceSubscribedInnerParent subscribed)
24701948 return $ if outerHeight == invalidHeight || innerHeight == invalidHeight then invalidHeight else max outerHeight innerHeight
24711949
2472−data SomeSwitchSubscribed x = forall a. SomeSwitchSubscribed {-# NOUNPACK #-} (SwitchSubscribed x a)
1950+data SomeSwitchSubscribed = forall a. SomeSwitchSubscribed {-# NOUNPACK #-} (SwitchSubscribed a)
24731951
2474−invalidate :: IORef [SomeSwitchSubscribed x] -> WeakList (Invalidator x) -> IO (WeakList (Invalidator x))
1952+invalidate :: IORef [SomeSwitchSubscribed] -> WeakList Invalidator -> IO (WeakList Invalidator)
24751953invalidate toReconnectRef wis = do
24761954 forM_ wis $ \wi -> do
24771955 mi <- deRefWeak wi
@@ -2497,328 +1975,174 @@ invalidate toReconnectRef wis = do
24971975-- Reflex integration
24981976--------------------------------------------------------------------------------
24991977
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
25041978-- | The default, global Spider environment
25051979type Spider = SpiderTimeline Global
25061980
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−
1981+-- | Designates the default, global Spider timeline
1982+data Global
25491983
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
1984+{-# NOINLINE globalSpiderTimeline #-}
1985+globalSpiderTimeline :: SpiderTimeline Global
1986+globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
25611987
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564−newJoinDyn d =
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571−
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575−
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2579−
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581− pure = SpiderDynamic . dynamicConst
2582−#if MIN_VERSION_base(4,10,0)
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
1988+-- | Stores all global data relevant to a particular Spider timeline; only one
1989+-- value should exist for each type @x@
1990+data SpiderTimeline x = SpiderTimeline
1991+ { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription])
1992+ , _spiderEnv_lock :: !(MVar ())
1993+ , _spiderEnv_cleanups :: !(IORef [IO ()])
1994+#ifdef DEBUG
1995+ , _spiderEnv_depth :: !(IORef Int)
25841996#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
1997+ }
1998+type role SpiderTimeline nominal
27071999
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
2000+instance GEq SpiderTimeline where
2001+ a `geq` b = if _spiderEnv_toUnsubscribe a == _spiderEnv_toUnsubscribe b
2002+ then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
2003+ else Nothing
27122004
2713−unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714−unsafeNewSpiderTimelineEnv = do
2005+unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
2006+unsafeNewSpiderTimeline = do
2007+ toUnsubscribe <- newIORef []
27152008 lock <- newMVar ()
2716− env <- newEventEnv
2009+ cleanups <- newIORef []
27172010#ifdef DEBUG
27182011 depthRef <- newIORef 0
27192012#endif
2720− return $ STE $ SpiderTimelineEnv
2721− { _spiderTimeline_lock = lock
2722− , _spiderTimeline_eventEnv = env
2013+ return $ SpiderTimeline
2014+ { _spiderEnv_toUnsubscribe = toUnsubscribe
2015+ , _spiderEnv_lock = lock
2016+ , _spiderEnv_cleanups = cleanups
27232017#ifdef DEBUG
2724− , _spiderTimeline_depth = depthRef
2018+ , _spiderEnv_depth = depthRef
27252019#endif
27262020 }
27272021
2728−-- | Create a new SpiderTimelineEnv
2729−newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2731−
2732−data LocalSpiderTimeline (x :: Type) s
2733−
2734−instance Reifies s (SpiderTimelineEnv x) =>
2735− HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2737−
2738−localSpiderTimeline
2739− :: proxy s
2740− -> SpiderTimelineEnv x
2741− -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2022+-- | Create a new SpiderTimeline
2023+newSpiderTimeline :: IO (Some SpiderTimeline)
2024+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27432025
27442026-- | Pass a new timeline to the given function.
2745−withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746−withSpiderTimeline k = do
2747− env <- unsafeNewSpiderTimelineEnv
2748− reify env $ \s -> k $ localSpiderTimeline s env
2749−
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2027+withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
2028+withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
27512029
2752−type ComputeM = EventM
2030+newtype SpiderPullM x a = SpiderPullM (BehaviorM a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27532031
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2032+newtype SpiderPushM x a = SpiderPushM (ComputeM a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552033
2756−instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757− {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2034+instance R.Reflex (SpiderTimeline x) where
2035+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior a }
2036+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event a }
2037+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic Identity a } deriving (Functor, Applicative, Monad)
2038+ newtype Incremental (SpiderTimeline x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic p a }
27622039 type PullM (SpiderTimeline x) = SpiderPullM x
27632040 type PushM (SpiderTimeline x) = SpiderPushM x
27642041 {-# INLINABLE never #-}
2765− never = SpiderEvent eventNever
2042+ never = SpiderEvent EventNever
27662043 {-# INLINABLE constant #-}
2767− constant = SpiderBehavior . behaviorConst
2768− {-# INLINE push #-}
2044+ constant = SpiderBehavior . BehaviorConst
2045+ {-# INLINABLE push #-}
27692046 push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770− {-# INLINE pushCheap #-}
2771− pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722047 {-# INLINABLE pull #-}
27732048 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
2049+ {-# INLINABLE merge #-}
2050+ merge = SpiderEvent . merge . DynamicConst . (unsafeCoerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k Event)
2051+ {-# INLINABLE fan #-}
2052+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832053 {-# INLINABLE switch #-}
2784− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2054+ switch = SpiderEvent . switch . (unsafeCoerce :: Behavior (R.Event (SpiderTimeline x) a) -> Behavior (Event a)) . unSpiderBehavior
27852055 {-# INLINABLE coincidence #-}
2786− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2056+ coincidence = SpiderEvent . coincidence . (unsafeCoerce :: Event (R.Event (SpiderTimeline x) a) -> Event (Event a)) . unSpiderEvent
27872057 {-# INLINABLE current #-}
2788− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2058+ current = SpiderBehavior . current . unSpiderDynamic
27892059 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2060+ updated = SpiderEvent . fmap runIdentity . updated . unSpiderDynamic
27912061 {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2062+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (coerce readV0) $ addIdentity $ unSpiderEvent v'
27932063 {-# 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
2064+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ DynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2065+ {-# INLINABLE mergeIncremental #-}
2066+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic R.PatchDMap (DMap k (R.Event (SpiderTimeline x))) -> Dynamic R.PatchDMap (DMap k Event)) . unSpiderIncremental
27992067 {-# INLINABLE currentIncremental #-}
2800− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2068+ currentIncremental = SpiderBehavior . current . unSpiderIncremental
28012069 {-# INLINABLE updatedIncremental #-}
2802− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2070+ updatedIncremental = SpiderEvent . updated . unSpiderIncremental
28032071 {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805− c <- readBehaviorUntracked $ dynamicCurrent i
2806− return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807− eventCoercion Coercion = Coercion
2808− behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2811− {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813− {-# INLINABLE fanInt #-}
2814− fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2815−
2816−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2817−
2818−data SpiderEventHandle x a = SpiderEventHandle
2819− { spiderEventHandleSubscription :: EventSubscription x
2820− , spiderEventHandleValue :: IORef (Maybe a)
2821− }
2072+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ current i) $ flip push (updated i) $ \p -> do
2073+ c <- readBehaviorUntracked $ current i
2074+ return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2075+
2076+instance R.MonadSample (SpiderTimeline x) (EventM x) where
2077+ {-# INLINABLE sample #-}
2078+ sample (SpiderBehavior b) = readBehaviorUntracked b
2079+
2080+instance R.MonadHold (SpiderTimeline x) (EventM x) where
2081+ {-# INLINABLE hold #-}
2082+ hold = holdSpiderEventM
2083+ {-# INLINABLE holdDyn #-}
2084+ holdDyn = holdDynSpiderEventM
2085+ {-# INLINABLE holdIncremental #-}
2086+ holdIncremental = holdIncrementalSpiderEventM
2087+
2088+holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2089+holdSpiderEventM v0 e = fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2090+
2091+holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2092+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2093+
2094+holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderTimeline x) (p a) -> EventM x (R.Incremental (SpiderTimeline x) p a)
2095+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2096+
2097+instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
2098+ {-# INLINABLE hold #-}
2099+ hold v0 e = R.runHostFrame $ R.hold v0 e
2100+ {-# INLINABLE holdDyn #-}
2101+ holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2102+ {-# INLINABLE holdIncremental #-}
2103+ holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2104+
2105+instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
2106+ {-# INLINABLE sample #-}
2107+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2108+
2109+instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2110+ {-# INLINABLE sample #-}
2111+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2112+
2113+instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2114+ {-# INLINABLE sample #-}
2115+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2116+
2117+instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2118+ {-# INLINABLE hold #-}
2119+ hold v0 e = R.current <$> R.holdDyn v0 e
2120+ {-# INLINABLE holdDyn #-}
2121+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity e
2122+ {-# INLINABLE holdIncremental #-}
2123+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . DynamicHold <$> hold v0 e
2124+
2125+data RootTrigger a = forall k. GCompare k => RootTrigger (SubscriberList a, IORef (DMap k Identity), k a)
2126+newtype SpiderEventHandle a = SpiderEventHandle { unSpiderEventHandle :: EventSubscription a }
2127+
2128+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2129+ {-# INLINABLE subscribeEvent #-}
2130+ subscribeEvent e = SpiderHostFrame $ do
2131+ subscription <- subscribe (unSpiderEvent e) SubscriberHandle --TODO: Unsubscribe eventually (manually and/or with weak ref)
2132+ return $ SpiderEventHandle subscription
2133+
2134+instance R.ReflexHost (SpiderTimeline x) where
2135+ type EventTrigger (SpiderTimeline x) = RootTrigger
2136+ type EventHandle (SpiderTimeline x) = SpiderEventHandle
2137+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2138+
2139+instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2140+ {-# INLINABLE readEvent #-}
2141+ readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2142+ let EventSubscription sln subscribed = unSpiderEventHandle h
2143+ result <- readEventSubscribed subscribed
2144+ touch sln
2145+ return result
28222146
28232147instance MonadRef (EventM x) where
28242148 type Ref (EventM x) = Ref IO
@@ -2834,7 +2158,7 @@ instance MonadAtomicRef (EventM x) where
28342158 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352159
28362160-- | 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)
2161+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382162
28392163instance Monad (SpiderHost x) where
28402164 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2167,20 @@ instance Monad (SpiderHost x) where
28432167 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442168 {-# INLINABLE return #-}
28452169 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
28522170 {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2171+ fail s = SpiderHost $ fail s
28542172
28552173-- | Run an action affecting the global Spider timeline; this will be guarded by
28562174-- a mutex for that timeline
28572175runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2176+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
28592177
28602178-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612179-- mutex for that timeline
2862−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2180+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2181+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
28642182
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2183+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672184
28682185instance Monad (SpiderHostFrame x) where
28692186 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2189,30 @@ instance Monad (SpiderHostFrame x) where
28722189 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732190 {-# INLINABLE return #-}
28742191 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762192 {-# INLINABLE fail #-}
28772193 fail s = SpiderHostFrame $ fail s
2878−#endif
28792194
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
2195+instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2196+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2197+
2198+addIdentity :: Event a -> Event (Identity a)
2199+--addIdentity = fmap Identity
2200+addIdentity = unsafeCoerce
2201+
2202+instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2203+ {-# INLINABLE hold #-}
2204+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2205+ {-# INLINABLE holdDyn #-}
2206+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2207+ {-# INLINABLE holdIncremental #-}
2208+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
28832209
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2210+newEventWithTriggerIO :: forall a. (RootTrigger a -> IO (IO ())) -> IO (Event a)
28852211newEventWithTriggerIO f = do
28862212 es <- newFanEventWithTriggerIO $ \Refl -> f
28872213 return $ select es Refl
28882214
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2215+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger a -> IO (IO ())) -> IO (EventSelector k)
28902216newFanEventWithTriggerIO f = do
28912217 occRef <- newIORef DMap.empty
28922218 subscribedRef <- newIORef DMap.empty
@@ -2895,10 +2221,48 @@ newFanEventWithTriggerIO f = do
28952221 , rootSubscribed = subscribedRef
28962222 , rootInit = f
28972223 }
2898− return $ EventSelector $ \k -> eventRoot k r
2224+ return $ EventSelector $ \k -> EventRoot k r
2225+
2226+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2227+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2228+ newFanEventWithTrigger f = SpiderHost $ lift $ do
2229+ es <- newFanEventWithTriggerIO f
2230+ return $ R.EventSelector $ SpiderEvent . select es
2231+
2232+instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2233+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2234+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2235+ es <- newFanEventWithTriggerIO f
2236+ return $ R.EventSelector $ SpiderEvent . select es
2237+
2238+instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2239+ {-# INLINABLE subscribeEvent #-}
2240+ subscribeEvent = subscribeEventSpiderHost
2241+
2242+subscribeEventSpiderHost :: R.Event (SpiderTimeline x) a -> SpiderHost x (R.EventHandle (SpiderTimeline x) a)
2243+subscribeEventSpiderHost e = do
2244+ subscription <- runFrame $ subscribe (unSpiderEvent e) SubscriberHandle --TODO: Unsubscribe eventually (manually and/or with weak ref)
2245+ return $ SpiderEventHandle subscription
28992246
29002247newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
29012248
2249+instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2250+ {-# INLINABLE sample #-}
2251+ sample = ReadPhase . R.sample
2252+
2253+instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2254+ {-# INLINABLE hold #-}
2255+ hold v0 e = ReadPhase $ R.hold v0 e
2256+ {-# INLINABLE holdDyn #-}
2257+ holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2258+ {-# INLINABLE holdIncremental #-}
2259+ holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2260+
2261+instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2262+ type ReadPhase (SpiderHost x) = ReadPhase x
2263+ fireEventsAndRead es (ReadPhase a) = run es a
2264+ runHostFrame = runFrame . runSpiderHostFrame
2265+
29022266instance MonadRef (SpiderHost x) where
29032267 type Ref (SpiderHost x) = Ref IO
29042268 newRef = SpiderHost . newRef
@@ -2921,10 +2285,9 @@ instance PrimMonad (SpiderHostFrame x) where
29212285 type PrimState (SpiderHostFrame x) = PrimState IO
29222286 primitive = SpiderHostFrame . EventM . primitive
29232287
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2288+--------------------------------------------------------------------------------
2289+-- Deprecated items
2290+--------------------------------------------------------------------------------
29272291
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()
2292+{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2293+type SpiderEnv = SpiderTimeline