@@ -9,79 +9,125 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MagicHash #-}
13−{-# LANGUAGE MultiParamTypeClasses #-}
14−{-# LANGUAGE MultiWayIf #-}
1512{-# LANGUAGE RankNTypes #-}
1613{-# LANGUAGE RoleAnnotations #-}
1714{-# LANGUAGE ScopedTypeVariables #-}
1815{-# LANGUAGE TypeFamilies #-}
1916{-# LANGUAGE TypeOperators #-}
2017{-# LANGUAGE UndecidableInstances #-}
18+{-# LANGUAGE PolyKinds #-}
19+{-# LANGUAGE DeriveFunctor #-}
20+{-# LANGUAGE StandaloneDeriving #-}
21+{-# LANGUAGE InstanceSigs #-}
22+{-# LANGUAGE MultiWayIf #-}
23+
24+#ifdef USE_REFLEX_OPTIMIZER
25+{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
26+#endif
27+{-# OPTIONS_GHC -Wunused-binds #-}
2128-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2229-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
23−module Reflex.Spider.Internal
24− ( Spider
25− , SpiderEnv (..)
26− , Global
27− , SpiderHost
28− , runSpiderHost
29− , newSpiderEnv
30− , askSpiderEnv
31− , SpiderEventHandle
32− ) where
33−
34−import Control.Applicative
30+module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
31+
32+#if MIN_VERSION_base(4,10,0)
33+import Control.Applicative (liftA2)
34+#endif
3535import Control.Concurrent
3636import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
3838import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4040import Control.Monad.Primitive
41−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
41+import Control.Monad.Reader.Class
42+import Control.Monad.IO.Class
43+import Control.Monad.ReaderIO
4244import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
4347import Data.Align
4448import Data.Coerce
45−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
4650import 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
4754import Data.Foldable hiding (concat, elem, sequence_)
48−import Data.Function
49−import Data.Functor.Compose
5055import Data.Functor.Constant
56+import Data.Functor.Misc
5157import Data.Functor.Product
5258import Data.GADT.Compare
5359import Data.IntMap.Strict (IntMap)
5460import qualified Data.IntMap.Strict as IntMap
5561import Data.IORef
56−import Data.List hiding (foldl')
57−import Data.Maybe
58−import Data.Monoid ((<>))
59−import Data.Some (Some)
60−import qualified Data.Some as Some
62+import Data.Kind (Type)
63+import Data.Maybe hiding (mapMaybe)
64+import Data.Monoid (mempty, (<>))
65+import Data.Proxy
6166import Data.These
6267import Data.Traversable
63−import Data.Word
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
6471import GHC.IORef (IORef (..))
6572import GHC.Stack
73+import Reflex.FastWeak
6674import System.IO.Unsafe
6775import System.Mem.Weak
6876import Unsafe.Coerce
6977
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+
7087#ifdef DEBUG_CYCLES
7188import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
7291import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
7392import qualified Data.List.NonEmpty as NonEmpty
74−import Data.Monoid (mempty)
7593import Data.Tree (Forest, Tree (..), drawForest)
76−#endif
94+import Data.List (isPrefixOf)
95+
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97+import qualified Data.FastWeakBag as FastWeakBag
7798
78−import Data.WeakBag (WeakBag, WeakBagTicket)
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)
79104import qualified Data.WeakBag as WeakBag
105+import qualified Reflex.Class
80106import qualified Reflex.Class as R
81−import qualified Reflex.Host.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
82122
83−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
84−import Prelude hiding (any, concat, mapM, mapM_, sequence)
123+#ifdef DEBUG_TRACE_EVENTS
124+withStackOneLine :: (BS8.ByteString -> a) -> a
125+withStackOneLine expr = unsafePerformIO $ do
126+ stack <- currentCallStack
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
129+
130+#endif
85131
86132debugPropagate :: Bool
87133
@@ -90,31 +136,42 @@ debugInvalidateHeight :: Bool
90136debugInvalidate :: Bool
91137
92138#ifdef DEBUG
93−
94139#define DEBUG_NODEIDS
95140
141+#ifdef DEBUG_TRACE_PROPAGATION
96142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
97146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
98150debugInvalidateHeight = False
151+#endif
99152
153+#ifdef DEBUG_TRACE_INVALIDATION
100154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
101158
102159class HasNodeId a where
103160 getNodeId :: a -> Int
104161
105−instance HasNodeId (Hold x p a) where
106− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
107164
108−instance HasNodeId (PushSubscribed x a b) where
109− getNodeId = pushSubscribedNodeId
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
110170
111171instance HasNodeId (SwitchSubscribed x a) where
112172 getNodeId = switchSubscribedNodeId
113173
114−instance HasNodeId (MergeSubscribed x a) where
115− getNodeId = mergeSubscribedNodeId
116−
117−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
118175 getNodeId = fanSubscribedNodeId
119176
120177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -128,41 +185,16 @@ instance HasNodeId (Pull x a) where
128185
129186{-# INLINE showNodeId #-}
130187showNodeId :: HasNodeId a => a -> String
131−showNodeId = ("#"<>) . show . getNodeId
132−
133−showSubscriberType :: Subscriber x a -> String
134−showSubscriberType = \case
135− SubscriberPush _ _ -> "SubscriberPush"
136− SubscriberMerge _ _ -> "SubscriberMerge"
137− SubscriberFan _ -> "SubscriberFan"
138− SubscriberMergeChange _ -> "SubscriberMergeChange"
139− SubscriberHold _ -> "SubscriberHold"
140− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
141− SubscriberSwitch _ -> "SubscriberSwitch"
142− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
143− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
144− SubscriberHandle -> "SubscriberHandle"
145−
146−showEventType :: Event x a -> String
147−showEventType = \case
148− EventRoot _ _ -> "EventRoot"
149− EventNever -> "EventNever"
150− EventPush _ -> "EventPush"
151− EventMerge _ -> "EventMerge"
152− EventFan _ _ -> "EventFan"
153− EventSwitch _ -> "EventSwitch"
154− EventCoincidence _ -> "EventCoincidence"
155− EventHold _ -> "EventHold"
156− EventDyn _ -> "EventDyn"
157− EventHoldIdentity _ -> "EventHoldIdentity"
158− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
159193
160194#else
161195
162196debugPropagate = False
163−
164197debugInvalidateHeight = False
165−
166198debugInvalidate = False
167199
168200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -170,6 +202,10 @@ debugInvalidate = False
170202showNodeId :: a -> String
171203showNodeId _ = ""
172204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
173209#endif
174210
175211#ifdef DEBUG_NODEIDS
@@ -179,59 +215,237 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
179215
180216newNodeId :: IO Int
181217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
182−
183−{-# NOINLINE unsafeNodeId #-}
184−unsafeNodeId :: a -> Int
185−unsafeNodeId a = unsafePerformIO $ do
186− touch a
187− newNodeId
188218#endif
189219
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+ }
230+
231+unsubscribe :: EventSubscription x -> IO ()
232+unsubscribe (EventSubscription u _) = u
233+
190234--------------------------------------------------------------------------------
191235-- Event
192236--------------------------------------------------------------------------------
193237
194−newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x a, Maybe a) }
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+ }
195309
196−subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x a)
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)
197414subscribe e s = fst <$> subscribeAndRead e s
198415
199416{-# INLINE wrap #-}
200−wrap :: MonadIO m => (t -> EventSubscribed x a) -> (Subscriber x a -> m (WeakBagTicket (Subscriber x a), t, Maybe a)) -> Subscriber x a -> m (EventSubscription x a, Maybe a)
417+wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
201418wrap tag getSpecificSubscribed sub = do
202419 (sln, subd, occ) <- getSpecificSubscribed sub
203420 let es = tag subd
204− return (EventSubscription (Just sln) es, occ)
421+ return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
205422
206−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
207424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
208425
209−eventNever :: Event x a
210−eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
211−
212−eventPush :: Push x b a -> Event x a
213−eventPush !p = Event $ wrap eventSubscribedPush $ getPushSubscribed p
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
214428
215−eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
216−eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
429+eventNever :: Event x a
430+eventNever = Event $ const subscribeAndReadNever
217431
218−eventFan :: GCompare k => k a -> Fan x k -> Event x a
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
219433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
220434
221−eventSwitch :: Switch x a -> Event x a
435+eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
222436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
223437
224−eventCoincidence :: Coincidence x a -> Event x a
438+eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
225439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
226440
227−eventHold :: a ~ p b => Hold x p b -> Event x a
441+eventHold :: Hold x p -> Event x p
228442eventHold !h = Event $ subscribeHoldEvent h
229443
230−eventDyn :: (a ~ p b, R.Patch p) => Dyn x p b -> Event x a
444+eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
231445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
232446
233447{-# INLINE subscribeCoincidenceInner #-}
234−subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x a)
448+subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
235449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
236450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
237451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -250,171 +464,75 @@ data Subscriber x a = Subscriber
250464 , subscriberRecalculateHeight :: !(Height -> IO ())
251465 }
252466
253−--TODO: Move this comment to WeakBag
254−-- These function are constructor functions that are marked NOINLINE so they are
255−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
256−-- so any weak references that are attached to the constructors will have their
257−-- finalizer run. Using the opaque constructor, does not see the
258−-- constructor application, so it behaves like an IORef and cannot be fused away.
259−--
260−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
261−-- the weak pointer to it in some cases.
262−
263−newSubscriberPush :: (a -> ComputeM x (Maybe b)) -> PushSubscribed x a b -> IO (Subscriber x a)
264−newSubscriberPush compute subscribed = return $ Subscriber
265− { subscriberPropagate = \a -> {-# SCC "traversePush" #-} do
266− tracePropagate $ "SubscriberPush" <> showNodeId subscribed
267− occ <- runComputeM $ compute a
268− case occ of
269− Nothing -> return () -- No need to write a Nothing back into the Ref
270− Just o -> do
271− liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
272− scheduleClear $ pushSubscribedOccurrence subscribed
273− propagate o $ pushSubscribedSubscribers subscribed
274− , subscriberInvalidateHeight = \old -> do
275− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
276− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
277− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
278− , subscriberRecalculateHeight = \new -> do
279− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
280− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
281− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
282− }
283−
284−newSubscriberHold :: R.Patch p => Hold x p a -> IO (Subscriber x (p a))
467+newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
285468newSubscriberHold h = return $ Subscriber
286469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
287470 , subscriberInvalidateHeight = \_ -> return ()
288471 , subscriberRecalculateHeight = \_ -> return ()
289472 }
290473
291−newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
292−newSubscriberMerge k subscribed = return $ Subscriber
293− { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
294− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
295− oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
296− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
297− tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
298− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
299− when (DMap.null oldM) $ do -- Only schedule the firing once
300− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
301− --TODO: assertions about height
302− currentHeight <- getCurrentHeight
303− when (height <= currentHeight) $ do
304− if height /= invalidHeight
305− then do
306− myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
307− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
308− else liftIO $ do
309−#ifdef DEBUG_CYCLES
310− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
311− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
312− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
313−#else
314− let cycleInfo = ""
315−#endif
316− error $ "Causality loop found" <> cycleInfo
317− scheduleMerge height subscribed
318− , subscriberInvalidateHeight = \old -> do
319− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
320− removeMergeHeight old subscribed
321− invalidateMergeHeight subscribed
322− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
323− , subscriberRecalculateHeight = \new -> do
324− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
325− addMergeHeight new subscribed
326− revalidateMergeHeight subscribed
327− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
328− }
329−
330−newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap (DMap k (Event x))))
331−newSubscriberMergeChange subscribed = return $ Subscriber
332− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
333− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
334− defer $ SomeMergeUpdate a subscribed
335− , subscriberInvalidateHeight = \_ -> return ()
336− , subscriberRecalculateHeight = \_ -> return ()
337− }
338−
339−newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
340−newSubscriberFan subscribed = return $ Subscriber
474+newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475+newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
341476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
342477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
343− tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
344479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
345480 scheduleClear $ fanSubscribedOccurrence subscribed
346− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
347482 propagate v $ _fanSubscribedChildren_list subsubs
348483 return $ Constant ()
349484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
350485 return ()
351486 , subscriberInvalidateHeight = \old -> do
352− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
353487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
354− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
355− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
356489 , subscriberRecalculateHeight = \new -> do
357− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
358490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
359− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
360− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
361492 }
362493
363−newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
364−newSubscriberSwitch subscribed = return $ Subscriber
494+newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495+newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
365496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
366− tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
367497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
368498 scheduleClear $ switchSubscribedOccurrence subscribed
369499 propagate a $ switchSubscribedSubscribers subscribed
370500 , subscriberInvalidateHeight = \_ -> do
371− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
372501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
373502 when (oldHeight /= invalidHeight) $ do
374503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
375− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
376− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
377− , subscriberRecalculateHeight = \new -> do
378− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
379− updateSwitchHeight new subscribed
380− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
381− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
382507
383−newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
384−newSubscriberCoincidenceOuter subscribed = return $ Subscriber
508+newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509+newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
385510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
386− tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
387511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
388− tracePropagate $ " outerHeight = " <> show outerHeight
512+ tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
389513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
390− tracePropagate $ " isJust occ = " <> show (isJust occ)
391− tracePropagate $ " innerHeight = " <> show innerHeight
514+ tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515+ tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
392517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
393518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
394519 case occ of
395− Nothing -> do
520+ Nothing ->
396521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
397522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
398− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
399− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
400525 Just o -> do -- Since it's already firing, no need to adjust height
401526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
402527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
403528 propagate o $ coincidenceSubscribedSubscribers subscribed
404− , subscriberInvalidateHeight = \_ -> do
405− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
406− invalidateCoincidenceHeight subscribed
407− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
408− , subscriberRecalculateHeight = \_ -> do
409− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
410− recalculateCoincidenceHeight subscribed
411− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
412531 }
413532
414−newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
415−newSubscriberCoincidenceInner subscribed = return $ Subscriber
533+newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534+newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
416535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
417− tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
418536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
419537 case occ of
420538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -422,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
422540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
423541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
424542 propagate a $ coincidenceSubscribedSubscribers subscribed
425− , subscriberInvalidateHeight = \_ -> do
426− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
427− invalidateCoincidenceHeight subscribed
428− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
429− , subscriberRecalculateHeight = \_ -> do
430− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
431− recalculateCoincidenceHeight subscribed
432− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
433545 }
434546
435547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -439,30 +551,45 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
439551recalculateSubscriberHeight = flip subscriberRecalculateHeight
440552
441553-- | Propagate everything at the current height
442−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
443−propagate a subscribers = withIncreasedDepth $ do
554+propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
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) $
444563 -- 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
445564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
446− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
447566
448567--------------------------------------------------------------------------------
449568-- EventSubscribed
450569--------------------------------------------------------------------------------
451570
452−data EventSubscribed x a = forall b. EventSubscribed
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
453580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
454− , eventSubscribedRetained :: {-# NOUNPACK #-} !b
581+ , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
455582#ifdef DEBUG_CYCLES
456− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
457584 , eventSubscribedHasOwnHeightRef :: !Bool
458585 , eventSubscribedWhoCreated :: !(IO [String])
459586#endif
460587 }
461588
462−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x a
589+eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
463590eventSubscribedRoot !r = EventSubscribed
464591 { eventSubscribedHeightRef = zeroRef
465− , eventSubscribedRetained = r
592+ , eventSubscribedRetained = toAny r
466593#ifdef DEBUG_CYCLES
467594 , eventSubscribedGetParents = return []
468595 , eventSubscribedHasOwnHeightRef = False
@@ -470,125 +597,99 @@ eventSubscribedRoot !r = EventSubscribed
470597#endif
471598 }
472599
473−eventSubscribedNever :: EventSubscribed x a
600+eventSubscribedNever :: EventSubscribed x
474601eventSubscribedNever = EventSubscribed
475602 { eventSubscribedHeightRef = zeroRef
476− , eventSubscribedRetained = ()
603+ , eventSubscribedRetained = toAny ()
477604#ifdef DEBUG_CYCLES
478605 , eventSubscribedGetParents = return []
479606 , eventSubscribedHasOwnHeightRef = False
480607 , eventSubscribedWhoCreated = return ["never"]
481608#endif
482609 }
483−
484−eventSubscribedPush :: PushSubscribed x b a -> EventSubscribed x a
485−eventSubscribedPush !subscribed = EventSubscribed
486− { eventSubscribedHeightRef = pushSubscribedHeight subscribed
487− , eventSubscribedRetained = subscribed
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
488614#ifdef DEBUG_CYCLES
489− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
615+ , eventSubscribedGetParents = return []
490616 , eventSubscribedHasOwnHeightRef = False
491− , eventSubscribedWhoCreated = whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
617+ , eventSubscribedWhoCreated = return ["now"]
492618#endif
493619 }
494620
495−eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x a
496−eventSubscribedMerge !subscribed = EventSubscribed
497− { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
498− , eventSubscribedRetained = subscribed
499−#ifdef DEBUG_CYCLES
500− , eventSubscribedGetParents = do
501− ps <- readIORef $ mergeSubscribedParents subscribed
502− return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
503− , eventSubscribedHasOwnHeightRef = True
504− , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
505−#endif
506− }
507−
508−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x a
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
509622eventSubscribedFan !subscribed = EventSubscribed
510623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
511− , eventSubscribedRetained = subscribed
624+ , eventSubscribedRetained = toAny subscribed
512625#ifdef DEBUG_CYCLES
513− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
514627 , eventSubscribedHasOwnHeightRef = False
515628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
516629#endif
517630 }
518631
519−eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x a
632+eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
520633eventSubscribedSwitch !subscribed = EventSubscribed
521634 { eventSubscribedHeightRef = switchSubscribedHeight subscribed
522− , eventSubscribedRetained = subscribed
635+ , eventSubscribedRetained = toAny subscribed
523636#ifdef DEBUG_CYCLES
524637 , eventSubscribedGetParents = do
525638 s <- readIORef $ switchSubscribedCurrentParent subscribed
526− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
527640 , eventSubscribedHasOwnHeightRef = True
528641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
529642#endif
530643 }
531644
532−eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x a
645+eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
533646eventSubscribedCoincidence !subscribed = EventSubscribed
534647 { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
535− , eventSubscribedRetained = subscribed
648+ , eventSubscribedRetained = toAny subscribed
536649#ifdef DEBUG_CYCLES
537650 , eventSubscribedGetParents = do
538651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
539− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
540− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
541654 return $ outerParent : innerParents
542655 , eventSubscribedHasOwnHeightRef = True
543656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
544657#endif
545658 }
546659
547−getEventSubscribedHeight :: EventSubscribed x a -> IO Height
660+getEventSubscribedHeight :: EventSubscribed x -> IO Height
548661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
549662
550663#ifdef DEBUG_CYCLES
551−whoCreatedEventSubscribed :: EventSubscribed x a -> IO [String]
664+whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
552665whoCreatedEventSubscribed = eventSubscribedWhoCreated
553666
554−walkInvalidHeightParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
555668walkInvalidHeightParents s0 = do
556− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
557670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
558671 when (h == invalidHeight) $ do
559672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
560− modify (Some.This s :)
673+ modify (s :)
561674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
562− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
563676 return subscribers
564677#endif
565678
566679{-# INLINE subscribeHoldEvent #-}
567−subscribeHoldEvent :: CanSubscribe x m => Hold x p a -> Subscriber x (p a) -> m (EventSubscription x (p a), Maybe (p a))
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
568681subscribeHoldEvent = subscribeAndRead . holdEvent
569682
570−--------------------------------------------------------------------------------
571−-- EventSubscription
572−--------------------------------------------------------------------------------
573−
574−data EventSubscription x a = EventSubscription
575− { _eventSubscription_ticket :: !(Maybe (WeakBagTicket (Subscriber x a)))
576− , _eventSubscription_subscribed :: !(EventSubscribed x a)
577− }
578−
579−unsubscribe :: EventSubscription x a -> IO ()
580−unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
581−
582683--------------------------------------------------------------------------------
583684-- Behavior
584685--------------------------------------------------------------------------------
585686
586687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
587688
588−behaviorHold :: Hold x p a -> Behavior x a
689+behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
589690behaviorHold !h = Behavior $ readHoldTracked h
590691
591−behaviorHoldIdentity :: Hold x Identity a -> Behavior x a
692+behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
592693behaviorHoldIdentity = behaviorHold
593694
594695behaviorConst :: a -> Behavior x a
@@ -599,7 +700,7 @@ behaviorPull !p = Behavior $ do
599700 val <- liftIO $ readIORef $ pullValue p
600701 case val of
601702 Just subscribed -> do
602− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
603704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
604705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
605706 return $ pullSubscribedValue subscribed
@@ -608,7 +709,7 @@ behaviorPull !p = Behavior $ do
608709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
609710 parentsRef <- liftIO $ newIORef []
610711 holdInits <- askBehaviorHoldInits
611− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
612713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
613714 parents <- liftIO $ readIORef parentsRef
614715 let subscribed = PullSubscribed
@@ -618,22 +719,22 @@ behaviorPull !p = Behavior $ do
618719 , pullSubscribedParents = parents
619720 }
620721 liftIO $ writeIORef (pullValue p) $ Just subscribed
621− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
622723 return a
623724
624−behaviorDyn :: R.Patch p => Dyn x p a -> Behavior x a
725+behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
625726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
626727
627728{-# INLINE readHoldTracked #-}
628−readHoldTracked :: Hold x p a -> BehaviorM x a
729+readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
629730readHoldTracked h = do
630731 result <- liftIO $ readIORef $ holdValue h
631732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
632− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734+ liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
633735 return result
634736
635−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
636−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
737+{-# INLINABLE readBehaviorUntracked #-}
637738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
638739readBehaviorUntracked b = do
639740 holdInits <- getDeferralQueue
@@ -643,69 +744,108 @@ readBehaviorUntracked b = do
643744-- Dynamic
644745--------------------------------------------------------------------------------
645746
646−data Dynamic x p a = Dynamic
647− { dynamicCurrent :: !(Behavior x a)
648− , dynamicUpdated :: !(Event x (p a))
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`?
649752 }
650753
651−dynamicHold :: Hold x p a -> Dynamic x p a
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
652760dynamicHold !h = Dynamic
653761 { dynamicCurrent = behaviorHold h
654762 , dynamicUpdated = eventHold h
655763 }
656764
657−dynamicHoldIdentity :: Hold x Identity a -> Dynamic x Identity a
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
658766dynamicHoldIdentity = dynamicHold
659767
660−dynamicConst :: a -> Dynamic x p a
768+dynamicConst :: PatchTarget p -> DynamicS x p
661769dynamicConst !a = Dynamic
662770 { dynamicCurrent = behaviorConst a
663771 , dynamicUpdated = eventNever
664772 }
665773
666−dynamicDyn :: R.Patch p => Dyn x p a -> Dynamic x p a
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
667775dynamicDyn !d = Dynamic
668776 { dynamicCurrent = behaviorDyn d
669777 , dynamicUpdated = eventDyn d
670778 }
671779
672−dynamicDynIdentity :: Dyn x Identity a -> Dynamic x Identity a
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
673781dynamicDynIdentity = dynamicDyn
674782
675783--------------------------------------------------------------------------------
676784-- Combinators
677785--------------------------------------------------------------------------------
678786
679−--TODO: Figure out why certain things are not 'representational', then make them
680−--representational so we can use coerce
681−
682787--type role Hold representational
683−data Hold x p a
684− = Hold { holdValue :: !(IORef a)
788+data Hold x p
789+ = Hold { holdValue :: !(IORef (PatchTarget p))
685790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
686− , holdEvent :: Event x (p a) -- This must be lazy, or holds cannot be defined before their input Events
687− , holdParent :: !(IORef (Maybe (EventSubscription x (p a)))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
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
688793#ifdef DEBUG_NODEIDS
689794 , holdNodeId :: Int
690795#endif
691796 }
692797
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+
693829data EventEnv x
694− = EventEnv { eventEnvSpiderEnv :: !(SpiderEnv x)
695− , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
830+ = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
696831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832+ , eventEnvDynInits :: !(IORef [SomeDynInit x])
697833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
698834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
699− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
700− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
701838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
702839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
703− , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
840+ , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
704841 }
705842
706843{-# INLINE runEventM #-}
707−runEventM :: EventM x a -> EventEnv x -> IO a
708−runEventM = runReaderT . unEventM
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))
709849
710850class MonadIO m => Defer a m where
711851 getDeferralQueue :: m (IORef [a])
@@ -716,81 +856,87 @@ defer a = do
716856 q <- getDeferralQueue
717857 liftIO $ modifyIORef' q (a:)
718858
719−instance Defer (SomeAssignment x) (EventM x) where
859+instance HasSpiderTimeline x => Defer (SomeAssignment x) (EventM x) where
860+ {-# INLINE getDeferralQueue #-}
861+ getDeferralQueue = asksEventEnv eventEnvAssignments
862+
863+instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
720864 {-# INLINE getDeferralQueue #-}
721− getDeferralQueue = EventM $ asks eventEnvAssignments
865+ getDeferralQueue = asksEventEnv eventEnvHoldInits
722866
723−instance Defer (SomeHoldInit x) (EventM x) where
867+instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
724868 {-# INLINE getDeferralQueue #-}
725− getDeferralQueue = EventM $ asks eventEnvHoldInits
869+ getDeferralQueue = asksEventEnv eventEnvDynInits
726870
727871instance Defer (SomeHoldInit x) (BehaviorM x) where
728872 {-# INLINE getDeferralQueue #-}
729873 getDeferralQueue = BehaviorM $ asks snd
730874
731−instance Defer (SomeMergeUpdate x) (EventM x) where
875+instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
732876 {-# INLINE getDeferralQueue #-}
733− getDeferralQueue = EventM $ asks eventEnvMergeUpdates
877+ getDeferralQueue = asksEventEnv eventEnvMergeUpdates
734878
735−instance Defer (SomeMergeInit x) (EventM x) where
879+instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
736880 {-# INLINE getDeferralQueue #-}
737− getDeferralQueue = EventM $ asks eventEnvMergeInits
881+ getDeferralQueue = asksEventEnv eventEnvMergeInits
738882
739−class HasCurrentHeight x m | m -> x where
883+class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
740884 getCurrentHeight :: m Height
741− scheduleMerge :: Height -> MergeSubscribed x a -> m ()
885+ scheduleMerge :: Height -> EventM x () -> m ()
742886
743−instance HasCurrentHeight x (EventM x) where
887+instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
744888 {-# INLINE getCurrentHeight #-}
745− getCurrentHeight = EventM $ do
746− heightRef <- asks eventEnvCurrentHeight
889+ getCurrentHeight = do
890+ heightRef <- asksEventEnv eventEnvCurrentHeight
747891 liftIO $ readIORef heightRef
748892 {-# INLINE scheduleMerge #-}
749− scheduleMerge height subscribed = EventM $ do
750− delayedRef <- asks eventEnvDelayedMerges
751− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
752−
753−class HasSpiderEnv x m | m -> x where
754− -- | Retrieve the current SpiderEnv
755− askSpiderEnv :: m (SpiderEnv x)
893+ scheduleMerge height subscribed = do
894+ delayedRef <- asksEventEnv eventEnvDelayedMerges
895+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
756896
757−instance HasSpiderEnv x (EventM x) where
758− {-# INLINE askSpiderEnv #-}
759− askSpiderEnv = EventM $ asks eventEnvSpiderEnv
897+class HasSpiderTimeline x where
898+ -- | Retrieve the current SpiderTimelineEnv
899+ spiderTimeline :: SpiderTimelineEnv x
760900
761−instance HasSpiderEnv x (SpiderHost x) where
762− {-# INLINE askSpiderEnv #-}
763− askSpiderEnv = SpiderHost ask
901+instance HasSpiderTimeline Global where
902+ spiderTimeline = globalSpiderTimelineEnv
764903
765−putCurrentHeight :: Height -> EventM x ()
766−putCurrentHeight h = EventM $ do
767− heightRef <- asks eventEnvCurrentHeight
904+putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905+putCurrentHeight h = do
906+ heightRef <- asksEventEnv eventEnvCurrentHeight
768907 liftIO $ writeIORef heightRef $! h
769908
770−instance Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
771910 {-# INLINE getDeferralQueue #-}
772− getDeferralQueue = EventM $ asks eventEnvClears
911+ getDeferralQueue = asksEventEnv eventEnvClears
773912
774913{-# INLINE scheduleClear #-}
775−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
776−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
777916
778−instance Defer SomeRootClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
779918 {-# INLINE getDeferralQueue #-}
780− getDeferralQueue = EventM $ asks eventEnvRootClears
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
781928
782929{-# INLINE scheduleRootClear #-}
783−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
784−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
785932
786−instance Defer (SomeResetCoincidence x) (EventM x) where
933+instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
787934 {-# INLINE getDeferralQueue #-}
788− getDeferralQueue = EventM $ asks eventEnvResetCoincidences
935+ getDeferralQueue = asksEventEnv eventEnvResetCoincidences
789936
790937-- Note: hold cannot examine its event until after the phase is over
791−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> EventM x (Hold x p a) #-}
792−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> ComputeM x (Hold x p a) #-}
793−hold :: (R.Patch p, Defer (SomeHoldInit x) m) => a -> Event x (p a) -> m (Hold x p a)
938+{-# INLINE [1] hold #-}
939+hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
794940hold v0 e = do
795941 valRef <- liftIO $ newIORef v0
796942 invsRef <- liftIO $ newIORef []
@@ -811,7 +957,7 @@ hold v0 e = do
811957 return h
812958
813959{-# INLINE getHoldEventSubscription #-}
814−getHoldEventSubscription :: forall m p a x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, R.Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderEnv x m, m ~ EventM x) => Hold x p a -> m (EventSubscription x (p a))
960+getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
815961getHoldEventSubscription h = do
816962 ep <- liftIO $ readIORef $ holdParent h
817963 case ep of
@@ -825,7 +971,7 @@ getHoldEventSubscription h = do
825971 Nothing -> return ()
826972 Just o -> do
827973 old <- liftIO $ readIORef $ holdValue h
828− case R.apply o old of
974+ case apply o old of
829975 Nothing -> return ()
830976 Just new -> do
831977 -- Need to evaluate these so that we don't retain the Hold itself
@@ -837,9 +983,9 @@ getHoldEventSubscription h = do
837983
838984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
839985
840−--type role BehaviorM representational
841986-- BehaviorM can sample behaviors
842−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
987+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988+ deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
843989
844990instance Monad (BehaviorM x) where
845991 {-# INLINE (>>=) #-}
@@ -848,14 +994,16 @@ instance Monad (BehaviorM x) where
848994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
849995 {-# INLINE return #-}
850996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
851998 {-# INLINE fail #-}
852999 fail s = BehaviorM $ fail s
1000+#endif
8531001
8541002data BehaviorSubscribed x a
855− = forall p. BehaviorSubscribedHold (Hold x p a)
1003+ = forall p. BehaviorSubscribedHold (Hold x p)
8561004 | BehaviorSubscribedPull (PullSubscribed x a)
8571005
858−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
8591007
8601008--type role PullSubscribed representational
8611009data PullSubscribed x a
@@ -890,55 +1038,33 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
8901038#endif
8911039 }
8921040
893−data Root x (k :: * -> *)
1041+data Root x k
8941042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
8951043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
8961044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
8971045 }
8981046
899−data SomeHoldInit x = forall p a. R.Patch p => SomeHoldInit !(Hold x p a)
1047+data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
9001048
901−data SomeMergeUpdate x = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap (DMap k (Event x))) (MergeSubscribed x k)
1049+data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
9021050
903−data SomeMergeInit x = forall k. GCompare k => SomeMergeInit !(MergeSubscribed x k) !(Event x (R.PatchDMap (DMap k (Event x))))
1051+data SomeMergeUpdate x = SomeMergeUpdate
1052+ { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053+ , _someMergeUpdate_invalidateHeight :: !(IO ())
1054+ , _someMergeUpdate_recalculateHeight :: !(IO ())
1055+ }
9041056
905−data SomeEventSubscription x = forall a. SomeEventSubscription (EventSubscription x a)
1057+newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
9061058
9071059-- EventM can do everything BehaviorM can, plus create holds
908−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
909−
910−data PushSubscribed x a b
911− = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed x a b)))
912− , 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)
913− , pushSubscribedHeight :: !(IORef Height)
914− , pushSubscribedSubscribers :: !(WeakBag (Subscriber x b))
915− , pushSubscribedSelf :: !(Subscriber x a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
916− , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed x a b)))
917− , pushSubscribedParent :: !(EventSubscription x a)
918−#ifdef DEBUG_NODEIDS
919− , pushSubscribedNodeId :: Int
920−#endif
921− }
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9221061
923−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1062+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9241063
925−instance Defer (SomeHoldInit x) (ComputeM x) where
926− getDeferralQueue = ComputeM ask
927−
928−{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
929−runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
930−runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
931−
932−data Push x a b
933− = Push { pushCompute :: !(a -> ComputeM x (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?)
934− , pushParent :: !(Event x a)
935− , pushSubscribed :: !(IORef (Maybe (PushSubscribed x a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
936− }
937−
938−data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x a) !(Subscriber x a)
939−
940−mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x a
941−mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1064+data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065+ { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066+ , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067+ }
9421068
9431069data HeightBag = HeightBag
9441070 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -956,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
9561082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
9571083
9581084heightBagAdd :: Height -> HeightBag -> HeightBag
959−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1085+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086+ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
9601087
9611088heightBagRemove :: Height -> HeightBag -> HeightBag
9621089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -965,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
9651092 0 -> IntMap.delete h c
9661093 _ -> IntMap.insert h (pred old) c
9671094
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+
9681102heightBagMax :: HeightBag -> Height
9691103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
9701104 Just ((h, _), _) -> Height h
@@ -982,46 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
9821116heightBagVerify = id
9831117#endif
9841118
985−data MergeSubscribed x k
986− = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
987− , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
988− , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
989− , mergeSubscribedHeight :: !(IORef Height)
990− , mergeSubscribedHeightBag :: !(IORef HeightBag)
991− , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
992− , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap (DMap k (Event x))), EventSubscribed x (R.PatchDMap (DMap k (Event x)))))
993− , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
994− , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
995−#ifdef DEBUG_NODEIDS
996− , mergeSubscribedNodeId :: Int
997−#endif
998− }
999−
1000−--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
1001−data Merge x k
1002− = Merge { mergeParents :: !(Dynamic x R.PatchDMap (DMap k (Event x)))
1003− , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1004− }
1005−
1006−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1007− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1008− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1009− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1119+data FanSubscribedChildren x k v a = FanSubscribedChildren
1120+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1121+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1122+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
10101123 }
10111124
1012−data FanSubscribed (x :: *) k
1013− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1014− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1015− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1016− , fanSubscribedParent :: !(EventSubscription x (DMap k Identity))
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)
10171130#ifdef DEBUG_NODEIDS
10181131 , fanSubscribedNodeId :: Int
10191132#endif
10201133 }
10211134
1022−data Fan x k
1023− = Fan { fanParent :: !(Event x (DMap k Identity))
1024− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1135+data Fan x k v
1136+ = Fan { fanParent :: !(Event x (DMap k v))
1137+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
10251138 }
10261139
10271140data SwitchSubscribed x a
@@ -1033,7 +1146,7 @@ data SwitchSubscribed x a
10331146 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
10341147 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
10351148 , switchSubscribedParent :: !(Behavior x (Event x a))
1036− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x a))
1149+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
10371150 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
10381151#ifdef DEBUG_NODEIDS
10391152 , switchSubscribedNodeId :: Int
@@ -1045,15 +1158,17 @@ data Switch x a
10451158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
10461159 }
10471160
1161+#ifdef USE_TEMPLATE_HASKELL
10481162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163+#endif
10491164data CoincidenceSubscribed x a
10501165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
10511166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
10521167 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
10531168 , coincidenceSubscribedHeight :: !(IORef Height)
10541169 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1055− , coincidenceSubscribedOuterParent :: !(EventSubscription x (Event x a))
1056− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x a)))
1170+ , coincidenceSubscribedOuterParent :: !(EventSubscription x)
1171+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
10571172 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
10581173#ifdef DEBUG_NODEIDS
10591174 , coincidenceSubscribedNodeId :: Int
@@ -1073,29 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
10731188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
10741189newInvalidatorPull p = return $! InvalidatorPull p
10751190
1076−instance R.FunctorMaybe (Event x) where
1077− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
10781193
1079−instance Align (Event x) where
1194+instance HasSpiderTimeline x => Align (Event x) where
10801195 nil = eventNever
1081− align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
1196+#if MIN_VERSION_these(0, 8, 0)
1197+instance HasSpiderTimeline x => Semialign (Event x) where
1198+#endif
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
10821201
1083−newtype Dyn x p a = Dyn { unDyn :: IORef (Either (BehaviorM x a, Event x (p a)) (Hold x p a)) }
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
10841208
1085−newMapDyn :: (a -> b) -> Dynamic x Identity a -> Dynamic x Identity b
1086−newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
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)
10871212
1088−instance Functor (Dynamic x Identity) where
1089− fmap = newMapDyn
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
10901214
1091−instance Applicative (Dynamic x Identity) where
1092− pure = dynamicConst
1093− (<*>) = zipDynWith ($)
1094− _ *> b = b
1095− a <* _ = a
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)
10961217
10971218--TODO: Avoid the duplication between this and R.zipDynWith
1098−zipDynWith :: (a -> b -> c) -> Dynamic x Identity a -> Dynamic x Identity b -> Dynamic x Identity c
1219+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
10991220zipDynWith f da db =
11001221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11011222 ec = flip push eab $ \o -> do
@@ -1108,82 +1229,70 @@ zipDynWith f da db =
11081229 return (a, b)
11091230 These (Identity a) (Identity b) -> return (a, b)
11101231 return $ Just $ Identity $ f a b
1111− in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1232+ in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11121233
1113−instance Monad (Dynamic x Identity) where
1114− {-# INLINE return #-}
1115− return = pure
1116− {-# INLINE (>>=) #-}
1117− x >>= f = dynamicDynIdentity $ newJoinDyn $ newMapDyn f x
1118− {-# INLINE (>>) #-}
1119− _ >> y = y
1120− {-# INLINE fail #-}
1121− fail _ = error "Dynamic does not support 'fail'"
1122−
1123−unsafeDyn :: BehaviorM x a -> Event x (p a) -> Dyn x p a
1124−unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1125− where x = (readV0, v')
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
11261240
1127−newJoinDyn :: Dynamic x Identity (Dynamic x Identity a) -> Dyn x Identity a
1128−newJoinDyn d =
1129− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1130− eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1131− eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1132− eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1133− v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1134− in unsafeDyn readV0 v'
1241+unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11351244
11361245-- ResultM can read behaviors and events
11371246type ResultM = EventM
11381247
1139−{-# NOINLINE unsafeNewIORef #-}
1140−unsafeNewIORef :: a -> b -> IORef b
1141−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1142−
1143−instance Functor (Event x) where
1248+instance HasSpiderTimeline x => Functor (Event x) where
11441249 fmap f = push $ return . Just . f
11451250
11461251instance Functor (Behavior x) where
11471252 fmap f = pull . fmap f . readBehaviorTracked
11481253
1149−{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1150−push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1151−push f e = eventPush $ Push
1152− { pushCompute = f
1153− , pushParent = e
1154− , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1155− }
1156−-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
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)
11571257
1158−{-# NOINLINE pull #-}
1258+{-# INLINABLE pull #-}
11591259pull :: BehaviorM x a -> Behavior x a
1160−pull a = behaviorPull $ Pull
1161− { pullCompute = a
1162− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11631262#ifdef DEBUG_NODEIDS
1164− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
11651264#endif
1166− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
11671272
1168−{-# NOINLINE switch #-}
1169−switch :: Behavior x (Event x a) -> Event x a
1170−switch a = eventSwitch $ Switch
1171− { switchParent = a
1172− , switchSubscribed = unsafeNewIORef a Nothing
1173− }
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+ }
11741281
1175−coincidence :: Event x (Event x a) -> Event x a
1176−coincidence a = eventCoincidence $ Coincidence
1177− { coincidenceParent = a
1178− , coincidenceSubscribed = unsafeNewIORef a Nothing
1179− }
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+ }
11801289
11811290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1182−run :: [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1291+run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
11831292run roots after = do
1184− tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1185− spiderEnv <- SpiderHost ask
1186− result <- SpiderHost $ lift $ withMVar (_spiderEnv_lock spiderEnv) $ \_ -> flip runReaderT spiderEnv $ unSpiderHost $ runFrame $ 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
11871296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
11881297 occBefore <- liftIO $ do
11891298 occBefore <- readIORef occRef
@@ -1195,42 +1304,39 @@ run roots after = do
11951304 else return Nothing
11961305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
11971306 propagate a subscribersRef
1198− delayedRef <- EventM $ asks eventEnvDelayedMerges
1307+ delayedRef <- asksEventEnv eventEnvDelayedMerges
11991308 let go = do
12001309 delayed <- liftIO $ readIORef delayedRef
12011310 case IntMap.minViewWithKey delayed of
12021311 Nothing -> return ()
12031312 Just ((currentHeight, cur), future) -> do
1204− tracePropagate $ "Running height " ++ show currentHeight
1313+ tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
12051314 putCurrentHeight $ Height currentHeight
12061315 liftIO $ writeIORef delayedRef $! future
1207− forM_ cur $ \d -> case d of
1208− DelayedMerge subscribed -> do
1209− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1210− case height `compare` Height currentHeight of
1211− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1212− GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1213− EQ -> do
1214− m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1215− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1216− --TODO: Assert that m is not empty
1217− liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1218− scheduleClear $ mergeSubscribedOccurrence subscribed
1219− propagate m $ mergeSubscribedSubscribers subscribed
1316+ sequence_ cur
12201317 go
12211318 go
12221319 putCurrentHeight maxBound
12231320 after
1224− tracePropagate "Done running an event frame"
1321+ tracePropagate (Proxy :: Proxy x) "Done running an event frame"
12251322 return result
12261323
1227−data SomeClear = forall a. SomeClear (IORef (Maybe a))
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
12281332
1229−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1333+newtype Clear a = Clear (IORef (Maybe a))
12301334
1231−data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1335+newtype IntClear a = IntClear (IORef (IntMap a))
12321336
1233−data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
1338+
1339+data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12341340
12351341debugFinalize :: Bool
12361342debugFinalize = False
@@ -1240,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12401346 x' <- evaluate x
12411347 mkWeakPtr x' $
12421348 if debugFinalize
1243− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12441350 else Nothing
12451351
12461352type WeakList a = [Weak a]
12471353
1248−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12491359#ifdef DEBUG
1250−withIncreasedDepth :: CanTrace x m => m a -> m a
1251−withIncreasedDepth a = do
1252− spiderEnv <- askSpiderEnv
1253− liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) succ
1360+
1361+debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362+debugSubscriber description = return . debugSubscriber' description
1363+
1364+debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365+debugSubscriber' description subscribed = Subscriber
1366+ {
1367+ subscriberPropagate = \m -> do
1368+ tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369+ subscriberPropagate subscribed m
1370+ , subscriberInvalidateHeight = \old -> do
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372+ subscriberInvalidateHeight subscribed old
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374+ , subscriberRecalculateHeight = \new -> do
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376+ subscriberRecalculateHeight subscribed new
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378+ }
1379+
1380+
1381+{-# INLINE withIncreasedDepth #-}
1382+withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383+withIncreasedDepth _ a = do
1384+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
12541385 result <- a
1255− liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12561387 return result
1257−#else
1258−withIncreasedDepth :: m a -> m a
1259−withIncreasedDepth = id
1260−#endif
1261−
1262−type CanTrace x m = (HasSpiderEnv x m, MonadIO m)
12631388
12641389{-# INLINE tracePropagate #-}
1265−tracePropagate :: (CanTrace x m) => String -> m ()
1266−tracePropagate = traceWhen debugPropagate
1390+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391+tracePropagate p = when debugPropagate . trace p
12671392
12681393{-# INLINE traceInvalidate #-}
12691394traceInvalidate :: String -> IO ()
1270−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
12711396
1272−{-# INLINE traceWhen #-}
1273−traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1274−traceWhen b message = traceMWhen b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
12751400
1276−{-# INLINE traceMWhen #-}
1277−traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1278−traceMWhen b getMessage = when b $ do
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
12791408 message <- getMessage
1280−#ifdef DEBUG
1281− spiderEnv <- askSpiderEnv
1282− d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
12831412#else
1284− let d = 0
1413+
1414+{-# INLINE withIncreasedDepth #-}
1415+withIncreasedDepth :: proxy x -> m a -> m a
1416+withIncreasedDepth _ = id
1417+
1418+{-# INLINE tracePropagate #-}
1419+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420+tracePropagate _ _ = return ()
1421+
1422+{-# INLINE traceInvalidate #-}
1423+traceInvalidate :: String -> IO ()
1424+traceInvalidate _ = return ()
1425+
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1429+
1430+{-# INLINE debugSubscriber #-}
1431+debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432+debugSubscriber _ = return
1433+
1434+{-# INLINE debugSubscriber' #-}
1435+debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436+debugSubscriber' _ = id
1437+
1438+
1439+
1440+{-# INLINE trace #-}
1441+trace :: (CanTrace x m) => proxy x -> String -> m ()
1442+trace _ _ = return ()
1443+
1444+{-# INLINE traceM #-}
1445+traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446+traceM _ _ = return ()
1447+
12851448#endif
1286− liftIO $ putStrLn $ replicate d ' ' <> message
12871449
12881450whoCreatedIORef :: IORef a -> IO [String]
12891451whoCreatedIORef (IORef a) = whoCreated $! a
12901452
1291−#ifdef DEBUG_CYCLES
12921453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
12931454groupByHead = \case
12941455 [] -> []
@@ -1299,77 +1460,108 @@ groupByHead = \case
12991460 | otherwise -> (x, xs :| []) : l
13001461
13011462listsToForest :: Eq a => [[a]] -> Forest a
1302−listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1463+listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464+ where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465+
1466+showStacks :: [[String]] -> String
1467+showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468+
1469+filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1471+filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472+#else
1473+filterStack prefix = id
13031474#endif
13041475
1476+#ifdef DEBUG_CYCLES
1477+
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1480+
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1485+
1486+#else
1487+
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1490+
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494+
1495+#endif
1496+
1497+
13051498{-# INLINE propagateSubscriberHold #-}
1306−propagateSubscriberHold :: R.Patch p => Hold x p a -> p a -> EventM x ()
1499+propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13071500propagateSubscriberHold h a = do
1308− {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13091502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13101503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13111505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1312− case {-# SCC "apply" #-} R.apply a v of
1506+ case {-# SCC "apply" #-} apply a v of
13131507 Nothing -> return ()
13141508 Just v' -> do
1315− {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510+ tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
13161511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13171512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13181513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
13191514
1320−data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x a) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
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
13211516
13221517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1323−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13241519
13251520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13261521askInvalidator = do
1327− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13281523 case m of
13291524 Nothing -> return Nothing
13301525 Just (!wi, _) -> return $ Just wi
13311526
13321527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13331528askParentsRef = do
1334− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13351530 case m of
13361531 Nothing -> return Nothing
13371532 Just (_, !p) -> return $ Just p
13381533
13391534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13401535askBehaviorHoldInits = do
1341− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13421537 return his
13431538
13441539{-# INLINE getDynHold #-}
1345−getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p a -> m (Hold x p a)
1540+getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
13461541getDynHold d = do
13471542 mh <- liftIO $ readIORef $ unDyn d
13481543 case mh of
1349− Right h -> return h
1350− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13511546 holdInits <- getDeferralQueue
13521547 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
13531554 h <- hold v0 v'
1354− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13551556 return h
13561557
1558+
13571559-- Always refers to 0
13581560{-# NOINLINE zeroRef #-}
13591561zeroRef :: IORef Height
13601562zeroRef = unsafePerformIO $ newIORef zeroHeight
13611563
1362−type CanSubscribe x m =
1363− ( HasSpiderEnv x m
1364− , HasCurrentHeight x m
1365− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1366− , Defer SomeClear m -- Wiping out event firings
1367− , Defer (SomeAssignment x) m -- Updating state
1368− , Defer (SomeResetCoincidence x) m
1369− , m ~ EventM x
1370− )
1371−
1372−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a), RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
13731565getRootSubscribed k r sub = do
13741566 mSubscribed <- readIORef $ rootSubscribed r
13751567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1383,10 +1575,15 @@ getRootSubscribed k r sub = do
13831575 let !cached = rootSubscribed r
13841576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
13851577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1386− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
13871581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13881582 writeIORef uninitRef $! uninit
1389− let subscribed = RootSubscribed
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
1586+ let !subscribed = RootSubscribed
13901587 { rootSubscribedKey = k
13911588 , rootSubscribedCachedSubscribed = cached
13921589 , rootSubscribedOccurrence = getOcc
@@ -1394,143 +1591,120 @@ getRootSubscribed k r sub = do
13941591 , rootSubscribedUninit = uninit
13951592 , rootSubscribedWeakSelf = weakSelf
13961593#ifdef DEBUG_NODEIDS
1397− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
13981595#endif
13991596 }
1400− writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "RootSubscribed"
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)
14011608 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
14021609 occ <- getOcc
14031610 return (sln, subscribed, occ)
14041611
1612+#ifdef USE_TEMPLATE_HASKELL
14051613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614+#endif
14061615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1407−cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1616+cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
14081617 rootSubscribedUninit self
14091618 modifyIORef' cached $ DMap.delete k
14101619
14111620{-# INLINE subscribeRootSubscribed #-}
1412−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1621+subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
14131622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
14141623
1415−-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1416−{-# SPECIALIZE getPushSubscribed :: Push x a b -> Subscriber x b -> EventM x (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe b) #-}
1417−getPushSubscribed :: CanSubscribe x m => Push x a b -> Subscriber x b -> m (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe b)
1418−getPushSubscribed p sub = do
1419− mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1420− case mSubscribed of
1421− Just subscribed -> {-# SCC "hitPush" #-} liftIO $ do
1422− sln <- subscribePushSubscribed subscribed sub
1423− occ <- readIORef $ pushSubscribedOccurrence subscribed
1424− return (sln, subscribed, occ)
1425− Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1426− subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1427− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1428− s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
1429− (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead (pushParent p) s
1430− occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1431− occRef <- liftIO $ newIORef occ
1432− when (isJust occ) $ scheduleClear occRef
1433− weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1434− let !cached = pushSubscribed p
1435− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1436− let subscribed = PushSubscribed
1437− { pushSubscribedCachedSubscribed = cached
1438− , pushSubscribedOccurrence = occRef
1439− , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1440− , pushSubscribedSubscribers = subs
1441− , pushSubscribedSelf = s
1442− , pushSubscribedWeakSelf = weakSelf
1443− , pushSubscribedParent = subscription
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))
14441630#ifdef DEBUG_NODEIDS
1445− , pushSubscribedNodeId = unsafeNodeId p
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
14461632#endif
1447− }
1448− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1449− liftIO $ writeIORef subscribedRef $! subscribed
1450− liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1451− return (sln, subscribed, occ)
1452−
1453−cleanupPushSubscribed :: PushSubscribed x a b -> IO ()
1454−cleanupPushSubscribed self = do
1455− unsubscribe $ pushSubscribedParent self
1456− writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1457−
1458−{-# INLINE subscribePushSubscribed #-}
1459−subscribePushSubscribed :: PushSubscribed x a b -> Subscriber x b -> IO (WeakBagTicket (Subscriber x b))
1460−subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1633+ }
14611634
1462−{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1463−getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k, Maybe (DMap k Identity))
1464−getMergeSubscribed m sub = do
1465− mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1466− case mSubscribed of
1467− Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1468− sln <- subscribeMergeSubscribed subscribed sub
1469− occ <- readIORef $ mergeSubscribedOccurrence subscribed
1470− return (sln, subscribed, occ)
1471− Nothing -> {-# SCC "missMerge" #-} do
1472− subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1473− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1474− initialParents <- readBehaviorUntracked $ dynamicCurrent $ mergeParents m
1475− subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1476− s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1477− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1478− height <- liftIO $ getEventSubscribedHeight parentSubd
1479− return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1480− let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1481− heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1482− myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1483− myHeight = if invalidHeight `elem` heights
1484− then invalidHeight
1485− else succHeight $ heightBagMax myHeightBag
1486− currentHeight <- getCurrentHeight
1487− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1488− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1489− else (Nothing, dm)
1490− unless (DMap.null accum) $ do
1491− scheduleMerge myHeight subscribedUnsafe
1492− occRef <- liftIO $ newIORef occ
1493− when (isJust occ) $ scheduleClear occRef
1494− accumRef <- liftIO $ newIORef accum
1495− heightRef <- liftIO $ newIORef myHeight
1496− heightMapRef <- liftIO $ newIORef myHeightBag
1497− weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1498− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1499− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1500− parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1501− let !subscribed = MergeSubscribed
1502− { mergeSubscribedCachedSubscribed = mergeSubscribed m
1503− , mergeSubscribedOccurrence = occRef
1504− , mergeSubscribedAccum = accumRef
1505− , mergeSubscribedHeight = heightRef
1506− , mergeSubscribedHeightBag = heightMapRef
1507− , mergeSubscribedSubscribers = subs
1508− , mergeSubscribedChange = changeSubdRef
1509− , mergeSubscribedParents = parentsRef
1510− , mergeSubscribedWeakSelf = weakSelf
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"
15111640#ifdef DEBUG_NODEIDS
1512− , mergeSubscribedNodeId = unsafeNodeId m
1641+ nodeId <- newNodeId
15131642#endif
1514− }
1515− defer $ SomeMergeInit subscribed $ dynamicUpdated $ mergeParents m
1516− liftIO $ writeIORef subscribedRef $! subscribed
1517− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1518− liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1519− return (sln, subscribed, occ)
1643+ return $ FanInt
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
1650+ }
15201651
1521−cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1522−cleanupMergeSubscribed subscribed = do
1523− parents <- readIORef $ mergeSubscribedParents subscribed
1524− forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1525− -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1526− writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657+ when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660+ { subscriberPropagate = \m -> do
1661+ liftIO $ writeIORef (_fanInt_occRef self) m
1662+ scheduleIntClear $ _fanInt_occRef self
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664+ FastWeakBag.traverse_ b $ \s ->
1665+ subscriberPropagate s v
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
1669+ subscriberInvalidateHeight s old
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
1673+ subscriberRecalculateHeight s new
1674+ }
1675+ liftIO $ do
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1679+ liftIO $ do
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681+ Nothing -> do
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684+ return b
1685+ Just b -> return b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691+
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698+#ifdef DEBUG_CYCLES
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702+#endif
1703+ }
15271704
1528−{-# INLINE subscribeMergeSubscribed #-}
1529−subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO (WeakBagTicket (Subscriber x (DMap k Identity)))
1530−subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
15311705
1532−{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), FanSubscribed x k, Maybe a) #-}
1533−getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderEnv x m, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), FanSubscribed x k, Maybe a)
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))
15341708getFanSubscribed k f sub = do
15351709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15361710 case mSubscribed of
@@ -1548,13 +1722,16 @@ getFanSubscribed k f sub = do
15481722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15491723 occRef <- liftIO $ newIORef parentOcc
15501724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15511728 let subscribed = FanSubscribed
15521729 { fanSubscribedCachedSubscribed = fanSubscribed f
15531730 , fanSubscribedOccurrence = occRef
15541731 , fanSubscribedParent = subscription
15551732 , fanSubscribedSubscribers = subscribersRef
15561733#ifdef DEBUG_NODEIDS
1557− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15581735#endif
15591736 }
15601737 let !self = (k, subscribed)
@@ -1564,7 +1741,7 @@ getFanSubscribed k f sub = do
15641741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15651742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15661743
1567−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15681745cleanupFanSubscribed (k, subscribed) = do
15691746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15701747 let reducedSubscribers = DMap.delete k subscribers
@@ -1576,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15761753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15771754
15781755{-# INLINE subscribeFanSubscribed #-}
1579−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1756+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
15801757subscribeFanSubscribed k subscribed sub = do
15811758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15821759 case DMap.lookup k subscribers of
@@ -1588,8 +1765,8 @@ subscribeFanSubscribed k subscribed sub = do
15881765 return sln
15891766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
15901767
1591−{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), SwitchSubscribed x a, Maybe a) #-}
1592−getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderEnv x m, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), SwitchSubscribed x a, Maybe a)
1768+{-# INLINABLE getSwitchSubscribed #-}
1769+getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
15931770getSwitchSubscribed s sub = do
15941771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
15951772 case mSubscribed of
@@ -1614,6 +1791,9 @@ getSwitchSubscribed s sub = do
16141791 when (isJust parentOcc) $ scheduleClear occRef
16151792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16161793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16171797 let !subscribed = SwitchSubscribed
16181798 { switchSubscribedCachedSubscribed = switchSubscribed s
16191799 , switchSubscribedOccurrence = occRef
@@ -1626,7 +1806,7 @@ getSwitchSubscribed s sub = do
16261806 , switchSubscribedCurrentParent = subscriptionRef
16271807 , switchSubscribedWeakSelf = weakSelf
16281808#ifdef DEBUG_NODEIDS
1629− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16301810#endif
16311811 }
16321812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1641,11 +1821,11 @@ cleanupSwitchSubscribed subscribed = do
16411821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
16421822
16431823{-# INLINE subscribeSwitchSubscribed #-}
1644−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1824+subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16451825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
16461826
1647−{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a, Maybe a) #-}
1648−getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderEnv x m, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a, Maybe a)
1827+{-# INLINABLE getCoincidenceSubscribed #-}
1828+getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
16491829getCoincidenceSubscribed c sub = do
16501830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
16511831 case mSubscribed of
@@ -1671,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16711851 scheduleClear innerSubdRef
16721852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16731853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16741857 let subscribed = CoincidenceSubscribed
16751858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16761859 , coincidenceSubscribedOccurrence = occRef
@@ -1681,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16811864 , coincidenceSubscribedInnerParent = innerSubdRef
16821865 , coincidenceSubscribedWeakSelf = weakSelf
16831866#ifdef DEBUG_NODEIDS
1684− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16851868#endif
16861869 }
16871870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1695,145 +1878,535 @@ cleanupCoincidenceSubscribed subscribed = do
16951878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
16961879
16971880{-# INLINE subscribeCoincidenceSubscribed #-}
1698−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1881+subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16991882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
17001883
1701−{-# INLINE merge #-}
1702−merge :: GCompare k => Dynamic x R.PatchDMap (DMap k (Event x)) -> Event x (DMap k Identity)
1703−merge m = eventMerge $ Merge
1704− { mergeParents = m
1705− , mergeSubscribed = unsafeNewIORef m Nothing
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
17062095 }
17072096
2097+--TODO: Be able to run as much of this as possible promptly
2098+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100+ where updateMe = do
2101+ oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103+ liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104+ return subscriptionsToKill
2105+
2106+{-# INLINE mergeGCheap' #-}
2107+mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108+ => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110+ initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111+ accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112+ heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113+ heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114+ parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116+
2117+ let subscribed = EventSubscribed
2118+ { eventSubscribedHeightRef = heightRef
2119+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120+#ifdef DEBUG_CYCLES
2121+ , eventSubscribedGetParents = do
2122+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2124+ , eventSubscribedHasOwnHeightRef = False
2125+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126+#endif
2127+ }
2128+
2129+ m = Merge
2130+ { _merge_parentsRef = parentsRef
2131+ , _merge_heightBagRef = heightBagRef
2132+ , _merge_heightRef = heightRef
2133+ , _merge_sub = sub
2134+ , _merge_accumRef = accumRef
2135+ }
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
2137+ let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138+ myHeight = if invalidHeight `elem` heights
2139+ then invalidHeight
2140+ else succHeight $ heightBagMax myHeightBag
2141+ currentHeight <- getCurrentHeight
2142+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2143+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144+ else (Nothing, dm)
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
2146+ liftIO $ writeIORef accumRef $! accum
2147+ liftIO $ writeIORef heightRef $! myHeight
2148+ liftIO $ writeIORef heightBagRef $! myHeightBag
2149+ liftIO $ writeIORef parentsRef $! initialParentState
2150+ defer $ SomeMergeInit $ do
2151+ let changeSubscriber = Subscriber
2152+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
2155+ , subscriberInvalidateHeight = \_ -> return ()
2156+ , subscriberRecalculateHeight = \_ -> return ()
2157+ }
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2160+ -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2161+ -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162+ -- its subscription.
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2164+ let unsubscribeAll = destroy =<< readIORef parentsRef
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
2168+
2169+mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170+mergeInt = cacheEvent . mergeIntCheap
2171+
2172+{-# INLINABLE mergeIntCheap #-}
2173+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174+mergeIntCheap d = Event $ \sub -> do
2175+ initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176+ accum <- liftIO $ FastMutableIntMap.newEmpty
2177+ heightRef <- liftIO $ newIORef zeroHeight
2178+ heightBagRef <- liftIO $ newIORef heightBagEmpty
2179+ parents <- liftIO $ FastMutableIntMap.newEmpty
2180+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181+ let subscribed = EventSubscribed
2182+ { eventSubscribedHeightRef = heightRef
2183+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2184+#ifdef DEBUG_CYCLES
2185+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186+ , eventSubscribedHasOwnHeightRef = False
2187+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188+#endif
2189+ }
2190+ let scheduleSelf = do
2191+ height <- liftIO $ readIORef $ heightRef
2192+ scheduleMerge' height heightRef $ do
2193+ vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194+ subscriberPropagate sub vals
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196+ recalculateMyHeight = do
2197+ currentHeight <- readIORef heightRef
2198+ when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
2199+ heights <- readIORef heightBagRef
2200+ numParents <- FastMutableIntMap.size parents
2201+ case heightBagSize heights `compare` numParents of
2202+ LT -> return ()
2203+ EQ -> do
2204+ let height = succHeight $ heightBagMax heights
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206+ writeIORef heightRef $! height
2207+ subscriberRecalculateHeight sub height
2208+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209+ mySubscriber k = Subscriber
2210+ { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
2213+ wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214+ liftIO $ FastMutableIntMap.insert accum k a
2215+ when wasEmpty scheduleSelf
2216+ , subscriberInvalidateHeight = \old -> do
2217+ modifyIORef' heightBagRef $ heightBagRemove old
2218+ invalidateMyHeight
2219+ , subscriberRecalculateHeight = \new -> do
2220+ modifyIORef' heightBagRef $ heightBagAdd new
2221+ recalculateMyHeight
2222+ }
2223+ forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2225+ liftIO $ do
2226+ forM_ parentOcc $ FastMutableIntMap.insert accum k
2227+ FastMutableIntMap.insert parents k subscription
2228+ height <- getEventSubscribedHeight parentSubd
2229+ if height == invalidHeight
2230+ then writeIORef heightRef invalidHeight
2231+ else do
2232+ modifyIORef' heightBagRef $ heightBagAdd height
2233+ modifyIORef' heightRef $ \oldHeight ->
2234+ if oldHeight == invalidHeight
2235+ then invalidHeight
2236+ else max (succHeight height) oldHeight
2237+ myHeight <- liftIO $ readIORef heightRef
2238+ currentHeight <- getCurrentHeight
2239+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240+ occ <- if currentHeight >= myHeight -- If we should have fired by now
2241+ then if isEmpty
2242+ then return Nothing
2243+ else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244+ else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245+ return Nothing
2246+ defer $ SomeMergeInit $ do
2247+ let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2248+ where
2249+ u = do
2250+ let f k newParent = do
2251+ subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254+ return subscription
2255+ newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256+ oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257+ liftIO $ for_ oldParents $ \oldParent -> do
2258+ oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
2261+ modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262+ return $ IntMap.elems oldParents
2263+ let changeSubscriber = Subscriber
2264+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266+ defer $ updateMe a
2267+ , subscriberInvalidateHeight = \_ -> return ()
2268+ , subscriberRecalculateHeight = \_ -> return ()
2269+ }
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271+ forM_ change $ \c -> defer $ updateMe c
2272+ -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273+ -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274+ -- its subscription.
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276+ let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
2280+
17082281newtype 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) }
17092283
1710−fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
1711−fan e =
2284+fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285+fanG e = unsafePerformIO $ do
2286+ ref <- newIORef Nothing
17122287 let f = Fan
17132288 { fanParent = e
1714− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
17152290 }
1716− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
17172292
1718−runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1719−runHoldInits holdInitRef mergeInitRef = do
2293+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294+runHoldInits holdInitRef dynInitRef mergeInitRef = do
17202295 holdInits <- liftIO $ readIORef holdInitRef
2296+ dynInits <- liftIO $ readIORef dynInitRef
17212297 mergeInits <- liftIO $ readIORef mergeInitRef
1722− unless (null holdInits && null mergeInits) $ do
2298+ unless (null holdInits && null dynInits && null mergeInits) $ do
17232299 liftIO $ writeIORef holdInitRef []
2300+ liftIO $ writeIORef dynInitRef []
17242301 liftIO $ writeIORef mergeInitRef []
17252302 mapM_ initHold holdInits
1726− mapM_ initMerge mergeInits
1727− runHoldInits holdInitRef mergeInitRef
2303+ mapM_ initDyn dynInits
2304+ mapM_ unSomeMergeInit mergeInits
2305+ runHoldInits holdInitRef dynInitRef mergeInitRef
17282306
1729−initHold :: SomeHoldInit x -> EventM x ()
2307+initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
17302308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
17312309
1732−initMerge :: SomeMergeInit x -> EventM x ()
1733−initMerge (SomeMergeInit subscribed changed) = do
1734− changeSub <- liftIO $ newSubscriberMergeChange subscribed
1735− (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1736− forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1737− liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2310+initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311+initDyn (SomeDynInit d) = void $ getDynHold d
17382312
1739−-- | Run an event action outside of a frame
1740−runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1741−runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1742− -- 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
1743− pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1744− {-# SCC "cleanups" #-} sequence_ pendingCleanups
2313+newEventEnv :: IO (EventEnv x)
2314+newEventEnv = do
17452315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
17462316 holdInitRef <- newIORef []
2317+ dynInitRef <- newIORef []
17472318 mergeUpdateRef <- newIORef []
17482319 mergeInitRef <- newIORef []
17492320 heightRef <- newIORef zeroHeight
17502321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
17512323 toClearRootRef <- newIORef []
17522324 coincidenceInfosRef <- newIORef []
1753− delayedRef <- liftIO $ newIORef IntMap.empty
1754− let env = EventEnv spiderEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
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)
17552346 let go = do
17562347 result <- a
1757− 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
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
17582349 return result
1759− result <- runEventM go env
1760− toClear <- readIORef toClearRef
1761− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1762− toClearRoot <- readIORef toClearRootRef
1763− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1764− toAssign <- readIORef toAssignRef
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
17652358 toReconnectRef <- newIORef []
1766− coincidenceInfos <- readIORef coincidenceInfosRef
2359+ coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
17672360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
17682361 writeIORef vRef v
1769− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
17702363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1771− mergeUpdates <- readIORef mergeUpdateRef
1772− writeIORef mergeUpdateRef []
1773− let updateMerge :: SomeMergeUpdate x -> IO [SomeEventSubscription x]
1774− updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k (Event x))) m) = do
1775− oldParents <- readIORef $ mergeSubscribedParents m
1776− let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1777− (mOldSubd, newPs) <- case me of
1778− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1779− Just e -> do
1780− s <- liftIO $ newSubscriberMerge k m
1781− subscription@(EventSubscription _ subd) <- subscribe e s
1782− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1783− let newParent = MergeSubscribedParent subscription s
1784− liftIO $ addMergeHeight newParentHeight m
1785− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1786− forM_ mOldSubd $ \oldSubd -> do
1787− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1788− liftIO $ removeMergeHeight oldHeight m
1789− return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1790− (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
1791− writeIORef (mergeSubscribedParents m) $! newParents
1792− return subscriptionsToKill
1793− when debugPropagate $ putStrLn "Updating merges"
1794− mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1795− when debugPropagate $ putStrLn "Updating merges done"
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"
17962369 toReconnect <- readIORef toReconnectRef
2370+ clearEventEnv env
17972371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
17982372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
17992373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1800− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
18012375 finalize wi
18022376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
18032377 wi' <- mkWeakPtrWithDebug i "wi'"
18042378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
18052379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1806− writeIORef holdInitRef [] --TODO: Should we reuse this?
1807− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1808− 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
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
18092383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
18102384 sub <- newSubscriberSwitch subscribed
1811− 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
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
18122386 {-
18132387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1814− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
18152389 EventRoot _ -> "EventRoot"
18162390 EventNever -> "EventNever"
18172391 _ -> "something else"
18182392 -}
18192393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1820− return $ SomeEventSubscription oldSubscription
1821− forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
1822− forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2394+ return oldSubscription
2395+ liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
2396+ liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
18232397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
18242398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
18252399 parentHeight <- getEventSubscribedHeight subd'
18262400 myHeight <- readIORef $ switchSubscribedHeight subscribed
18272401 when (parentHeight /= myHeight) $ do
18282402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1829− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1830− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1831− 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
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
18322405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
18332406 unsubscribe subscription
18342407 mapM_ invalidateCoincidenceHeight mcs
18352408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1836− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2409+ mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
18372410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
18382411 height <- calculateSwitchHeight subscribed
18392412 updateSwitchHeight height subscribed
@@ -1863,50 +2436,12 @@ succHeight h@(Height a) =
18632436 then invalidHeight
18642437 else Height $ succ a
18652438
1866−removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1867−removeMergeHeight oldParentHeight subscribed = do
1868− when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1869− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1870− let newHeights = heightBagRemove oldParentHeight oldHeights
1871− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1872−
1873−invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1874−invalidateMergeHeight subscribed = do
1875− oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1876− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1877− when (oldHeight /= invalidHeight) $ do
1878− writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1879− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1880−
1881−addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1882−addMergeHeight newParentHeight subscribed = do
1883− when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1884− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1885− let newHeights = heightBagAdd newParentHeight oldHeights
1886− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1887−
1888−revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1889−revalidateMergeHeight subscribed = do
1890− currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1891− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1892− heights <- readIORef $ mergeSubscribedHeightBag subscribed
1893− parents <- readIORef $ mergeSubscribedParents subscribed
1894− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1895− case heightBagSize heights `compare` DMap.size parents of
1896− LT -> return ()
1897− EQ -> do
1898− let height = succHeight $ heightBagMax heights
1899− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1900− writeIORef (mergeSubscribedHeight subscribed) $! height
1901− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1902− GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1903−
19042439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19052440invalidateCoincidenceHeight subscribed = do
19062441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
19072442 when (oldHeight /= invalidHeight) $ do
19082443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1909− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
19102445
19112446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
19122447updateSwitchHeight new subscribed = do
@@ -1914,7 +2449,7 @@ updateSwitchHeight new subscribed = do
19142449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19152450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19162451 writeIORef (switchSubscribedHeight subscribed) $! new
1917− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
19182453
19192454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19202455recalculateCoincidenceHeight subscribed = do
@@ -1923,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
19232458 height <- calculateCoincidenceHeight subscribed
19242459 when (height /= invalidHeight) $ do
19252460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1926− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
19272462
19282463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
19292464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -1962,157 +2497,170 @@ invalidate toReconnectRef wis = do
19622497-- Reflex integration
19632498--------------------------------------------------------------------------------
19642499
1965−-- | The default, global Spider environment
1966−type Spider = SpiderEnv Global
1967−
19682500-- | Designates the default, global Spider timeline
1969−data Global
2501+data SpiderTimeline x
2502+type role SpiderTimeline nominal
19702503
1971−{-# NOINLINE globalSpiderEnv #-}
1972−globalSpiderEnv :: SpiderEnv Global
1973−globalSpiderEnv = unsafePerformIO unsafeNewSpiderEnv
1974−
1975−-- | Stores all global data relevant to a particular Spider timeline; only one
1976−-- value should exist for each type @x@
1977−data SpiderEnv x = SpiderEnv
1978− { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription x])
1979− , _spiderEnv_lock :: !(MVar ())
1980− , _spiderEnv_cleanups :: !(IORef [IO ()])
1981−#ifdef DEBUG
1982− , _spiderEnv_depth :: !(IORef Int)
1983−#endif
1984− }
1985−type role SpiderEnv nominal
1986−
1987−instance GEq SpiderEnv where
1988− a `geq` b = if _spiderEnv_lock a == _spiderEnv_lock b
1989− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderEnv can't have two different 'x' arguments
1990− else Nothing
1991−
1992−unsafeNewSpiderEnv :: forall x. IO (SpiderEnv x)
1993−unsafeNewSpiderEnv = do
1994− toUnsubscribe <- newIORef []
1995− lock <- newMVar ()
1996− cleanups <- newIORef []
1997−#ifdef DEBUG
1998− depthRef <- newIORef 0
1999−#endif
2000− return $ SpiderEnv
2001− { _spiderEnv_toUnsubscribe = toUnsubscribe
2002− , _spiderEnv_lock = lock
2003− , _spiderEnv_cleanups = cleanups
2004−#ifdef DEBUG
2005− , _spiderEnv_depth = depthRef
2006−#endif
2007− }
2008−
2009−-- | Create a new SpiderEnv
2010−newSpiderEnv :: IO (Some SpiderEnv)
2011−newSpiderEnv = Some.This <$> unsafeNewSpiderEnv
2012−
2013−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2014−
2015−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2016−
2017−instance R.Reflex (SpiderEnv x) where
2018− newtype Behavior (SpiderEnv x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2019− newtype Event (SpiderEnv x) a = SpiderEvent { unSpiderEvent :: Event x a }
2020− newtype Dynamic (SpiderEnv x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x Identity a } deriving (Functor, Applicative, Monad)
2021− newtype Incremental (SpiderEnv x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic x p a }
2022− type PullM (SpiderEnv x) = SpiderPullM x
2023− type PushM (SpiderEnv x) = SpiderPushM x
2024− {-# INLINABLE never #-}
2025− never = SpiderEvent eventNever
2026− {-# INLINABLE constant #-}
2027− constant = SpiderBehavior . behaviorConst
2028− {-# INLINABLE push #-}
2029− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2030− {-# INLINABLE pull #-}
2031− pull = SpiderBehavior . pull . coerce
2032− {-# INLINABLE merge #-}
2033− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderEnv x)) -> DMap k (Event x))
2034− {-# INLINABLE fan #-}
2035− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2036− {-# INLINABLE switch #-}
2037− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderEnv x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2038− {-# INLINABLE coincidence #-}
2039− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderEnv x) a) -> Event x (Event x a)) . unSpiderEvent
2040− {-# INLINABLE current #-}
2041− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2042− {-# INLINABLE updated #-}
2043− updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2044− {-# INLINABLE unsafeBuildDynamic #-}
2045− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2046− {-# INLINABLE unsafeBuildIncremental #-}
2047− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2048− {-# INLINABLE mergeIncremental #-}
2049− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x R.PatchDMap (DMap k (R.Event (SpiderEnv x))) -> Dynamic x R.PatchDMap (DMap k (Event x))) . unSpiderIncremental
2050− {-# INLINABLE currentIncremental #-}
2051− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2052− {-# INLINABLE updatedIncremental #-}
2053− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2054− {-# INLINABLE incrementalToDynamic #-}
2055− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2056− c <- readBehaviorUntracked $ dynamicCurrent i
2057− return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2504+-- | The default, global Spider environment
2505+type Spider = SpiderTimeline Global
20582506
2059−instance R.MonadSample (SpiderEnv x) (EventM x) where
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
20602508 {-# INLINABLE sample #-}
20612509 sample (SpiderBehavior b) = readBehaviorUntracked b
20622510
2063−instance R.MonadHold (SpiderEnv x) (EventM x) where
2511+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
20642512 {-# INLINABLE hold #-}
20652513 hold = holdSpiderEventM
20662514 {-# INLINABLE holdDyn #-}
20672515 holdDyn = holdDynSpiderEventM
20682516 {-# INLINABLE holdIncremental #-}
20692517 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+
20702549
2071−holdSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Behavior (SpiderEnv x) a)
2072−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551+ {-# INLINE return #-}
2552+ return = pure
2553+ {-# INLINE (>>=) #-}
2554+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555+ {-# INLINE (>>) #-}
2556+ (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2558+ {-# INLINE fail #-}
2559+ fail _ = error "Dynamic does not support 'fail'"
2560+#endif
2561+
2562+{-# INLINABLE newJoinDyn #-}
2563+newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564+newJoinDyn d =
2565+ let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566+ eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567+ eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568+ eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569+ v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570+ in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571+
2572+instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573+ fmap = mapDynamicSpider
2574+ x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575+
2576+mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577+mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578+{-# INLINE [1] mapDynamicSpider #-}
2579+
2580+instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581+ pure = SpiderDynamic . dynamicConst
2582+#if MIN_VERSION_base(4,10,0)
2583+ liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2584+#endif
2585+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586+ a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587+ (<*) = flip (*>) -- There are no effects, so order doesn't matter
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
20732591
2074−holdDynSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Dynamic (SpiderEnv x) a)
2075−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
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
20762594
2077−holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderEnv x) (p a) -> EventM x (R.Incremental (SpiderEnv x) p a)
2078−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
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
20792597
2080−instance R.MonadHold (SpiderEnv x) (SpiderHost x) where
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
20812602 {-# INLINABLE hold #-}
2082− hold v0 e = R.runHostFrame $ R.hold v0 e
2603+ hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
20832604 {-# INLINABLE holdDyn #-}
2084− holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2605+ holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
20852606 {-# INLINABLE holdIncremental #-}
2086− holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
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
20872618
2088−instance R.MonadSample (SpiderEnv x) (SpiderHost x) where
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
20892635 {-# INLINABLE sample #-}
20902636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
20912637
2092−instance R.MonadSample (SpiderEnv x) (SpiderPullM x) where
2093− {-# INLINABLE sample #-}
2094− sample = coerce . readBehaviorTracked . unSpiderBehavior
2095−
2096−instance R.MonadSample (SpiderEnv x) (SpiderPushM x) where
2638+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
20972639 {-# INLINABLE sample #-}
2098− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2640+ sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
20992641
2100−instance R.MonadHold (SpiderEnv x) (SpiderPushM x) where
2642+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
21012643 {-# INLINABLE hold #-}
2102− hold v0 e = R.current <$> R.holdDyn v0 e
2644+ hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
21032645 {-# INLINABLE holdDyn #-}
2104− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
2646+ holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
21052647 {-# INLINABLE holdIncremental #-}
2106− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
2107−
2108−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
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
21092655
2110−data SpiderEventHandle x a = SpiderEventHandle
2111− { spiderEventHandleSubscription :: EventSubscription x a
2112− , spiderEventHandleValue :: IORef (Maybe a)
2113− }
2656+--------------------------------------------------------------------------------
2657+-- Deprecated items
2658+--------------------------------------------------------------------------------
21142659
2115−instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHostFrame x) where
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
21162664 {-# INLINABLE subscribeEvent #-}
21172665 subscribeEvent e = SpiderHostFrame $ do
21182666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2129,18 +2677,149 @@ instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHostFrame x) where
21292677 , spiderEventHandleValue = val
21302678 }
21312679
2132−instance R.ReflexHost (SpiderEnv x) where
2133− type EventTrigger (SpiderEnv x) = RootTrigger x
2134− type EventHandle (SpiderEnv x) = SpiderEventHandle x
2135− type HostFrame (SpiderEnv x) = SpiderHostFrame x
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
21362684
2137−instance R.MonadReadEvent (SpiderEnv x) (ReadPhase x) where
2685+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
21382686 {-# NOINLINE readEvent #-}
2139− readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2687+ readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
21402688 result <- readIORef $ spiderEventHandleValue h
21412689 touch h
21422690 return result
21432691
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693+ newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694+ newFanEventWithTrigger f = SpiderHost $ do
2695+ es <- newFanEventWithTriggerIO f
2696+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697+
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701+ es <- newFanEventWithTriggerIO f
2702+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703+
2704+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705+ {-# INLINABLE subscribeEvent #-}
2706+ subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2707+
2708+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709+ type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710+ fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711+ runHostFrame = runFrame . runSpiderHostFrame
2712+
2713+unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714+unsafeNewSpiderTimelineEnv = do
2715+ lock <- newMVar ()
2716+ env <- newEventEnv
2717+#ifdef DEBUG
2718+ depthRef <- newIORef 0
2719+#endif
2720+ return $ STE $ SpiderTimelineEnv
2721+ { _spiderTimeline_lock = lock
2722+ , _spiderTimeline_eventEnv = env
2723+#ifdef DEBUG
2724+ , _spiderTimeline_depth = depthRef
2725+#endif
2726+ }
2727+
2728+-- | Create a new SpiderTimelineEnv
2729+newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
2731+
2732+data LocalSpiderTimeline (x :: Type) s
2733+
2734+instance Reifies s (SpiderTimelineEnv x) =>
2735+ HasSpiderTimeline (LocalSpiderTimeline x s) where
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2737+
2738+localSpiderTimeline
2739+ :: proxy s
2740+ -> SpiderTimelineEnv x
2741+ -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742+localSpiderTimeline _ = coerce
2743+
2744+-- | Pass a new timeline to the given function.
2745+withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746+withSpiderTimeline k = do
2747+ env <- unsafeNewSpiderTimelineEnv
2748+ reify env $ \s -> k $ localSpiderTimeline s env
2749+
2750+newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751+
2752+type ComputeM = EventM
2753+
2754+newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2755+
2756+instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757+ {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2762+ type PullM (SpiderTimeline x) = SpiderPullM x
2763+ type PushM (SpiderTimeline x) = SpiderPushM x
2764+ {-# INLINABLE never #-}
2765+ never = SpiderEvent eventNever
2766+ {-# INLINABLE constant #-}
2767+ constant = SpiderBehavior . behaviorConst
2768+ {-# INLINE push #-}
2769+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770+ {-# INLINE pushCheap #-}
2771+ pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772+ {-# INLINABLE pull #-}
2773+ pull = SpiderBehavior . pull . coerce
2774+ {-# INLINABLE fanG #-}
2775+ fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776+ {-# INLINABLE mergeG #-}
2777+ mergeG
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779+ => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780+ -> DMap k q
2781+ -> R.Event (SpiderTimeline x) (DMap k v)
2782+ mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783+ {-# INLINABLE switch #-}
2784+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785+ {-# INLINABLE coincidence #-}
2786+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2787+ {-# INLINABLE current #-}
2788+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789+ {-# INLINABLE updated #-}
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2791+ {-# INLINABLE unsafeBuildDynamic #-}
2792+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793+ {-# INLINABLE unsafeBuildIncremental #-}
2794+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795+ {-# INLINABLE mergeIncrementalG #-}
2796+ mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797+ {-# INLINABLE mergeIncrementalWithMoveG #-}
2798+ mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799+ {-# INLINABLE currentIncremental #-}
2800+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801+ {-# INLINABLE updatedIncremental #-}
2802+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803+ {-# INLINABLE incrementalToDynamic #-}
2804+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805+ c <- readBehaviorUntracked $ dynamicCurrent i
2806+ return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807+ eventCoercion Coercion = Coercion
2808+ behaviorCoercion Coercion = Coercion
2809+ dynamicCoercion Coercion = Coercion
2810+ incrementalCoercion Coercion Coercion = Coercion
2811+ {-# INLINABLE mergeIntIncremental #-}
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813+ {-# INLINABLE fanInt #-}
2814+ fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2815+
2816+data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2817+
2818+data SpiderEventHandle x a = SpiderEventHandle
2819+ { spiderEventHandleSubscription :: EventSubscription x
2820+ , spiderEventHandleValue :: IORef (Maybe a)
2821+ }
2822+
21442823instance MonadRef (EventM x) where
21452824 type Ref (EventM x) = Ref IO
21462825 {-# INLINABLE newRef #-}
@@ -2155,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
21552834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
21562835
21572836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2158−newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2837+newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
21592838
21602839instance Monad (SpiderHost x) where
21612840 {-# INLINABLE (>>=) #-}
@@ -2164,15 +2843,27 @@ instance Monad (SpiderHost x) where
21642843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
21652844 {-# INLINABLE return #-}
21662845 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
21672852 {-# INLINABLE fail #-}
2168− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
21692854
21702855-- | Run an action affecting the global Spider timeline; this will be guarded by
21712856-- a mutex for that timeline
21722857runSpiderHost :: SpiderHost Global a -> IO a
2173−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderEnv
2858+runSpiderHost (SpiderHost a) = a
2859+
2860+-- | Run an action affecting a given Spider timeline; this will be guarded by a
2861+-- mutex for that timeline
2862+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
21742864
2175−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866+ deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
21762867
21772868instance Monad (SpiderHostFrame x) where
21782869 {-# INLINABLE (>>=) #-}
@@ -2181,26 +2872,21 @@ instance Monad (SpiderHostFrame x) where
21812872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
21822873 {-# INLINABLE return #-}
21832874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
21842876 {-# INLINABLE fail #-}
21852877 fail s = SpiderHostFrame $ fail s
2878+#endif
21862879
2187−instance R.MonadSample (SpiderEnv x) (SpiderHostFrame x) where
2188− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2189−
2190−instance R.MonadHold (SpiderEnv x) (SpiderHostFrame x) where
2191− {-# INLINABLE hold #-}
2192− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2193− {-# INLINABLE holdDyn #-}
2194− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2195− {-# INLINABLE holdIncremental #-}
2196− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2880+instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881+ notReadyUntil _ = pure ()
2882+ notReady = pure ()
21972883
2198−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
21992885newEventWithTriggerIO f = do
22002886 es <- newFanEventWithTriggerIO $ \Refl -> f
22012887 return $ select es Refl
22022888
2203−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
22042890newFanEventWithTriggerIO f = do
22052891 occRef <- newIORef DMap.empty
22062892 subscribedRef <- newIORef DMap.empty
@@ -2211,41 +2897,8 @@ newFanEventWithTriggerIO f = do
22112897 }
22122898 return $ EventSelector $ \k -> eventRoot k r
22132899
2214−instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHost x) where
2215− newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2216− newFanEventWithTrigger f = SpiderHost $ lift $ do
2217− es <- newFanEventWithTriggerIO f
2218− return $ R.EventSelector $ SpiderEvent . select es
2219−
2220−instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHostFrame x) where
2221− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2222− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2223− es <- newFanEventWithTriggerIO f
2224− return $ R.EventSelector $ SpiderEvent . select es
2225−
2226−instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHost x) where
2227− {-# INLINABLE subscribeEvent #-}
2228− subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2229−
22302900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
22312901
2232−instance R.MonadSample (SpiderEnv x) (ReadPhase x) where
2233− {-# INLINABLE sample #-}
2234− sample = ReadPhase . R.sample
2235−
2236−instance R.MonadHold (SpiderEnv x) (ReadPhase x) where
2237− {-# INLINABLE hold #-}
2238− hold v0 e = ReadPhase $ R.hold v0 e
2239− {-# INLINABLE holdDyn #-}
2240− holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2241− {-# INLINABLE holdIncremental #-}
2242− holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2243−
2244−instance R.MonadReflexHost (SpiderEnv x) (SpiderHost x) where
2245− type ReadPhase (SpiderHost x) = ReadPhase x
2246− fireEventsAndRead es (ReadPhase a) = run es a
2247− runHostFrame = runFrame . runSpiderHostFrame
2248−
22492902instance MonadRef (SpiderHost x) where
22502903 type Ref (SpiderHost x) = Ref IO
22512904 newRef = SpiderHost . newRef
@@ -2263,3 +2916,15 @@ instance MonadRef (SpiderHostFrame x) where
22632916
22642917instance MonadAtomicRef (SpiderHostFrame x) where
22652918 atomicModifyRef r = SpiderHostFrame . atomicModifyRef r
2919+
2920+instance PrimMonad (SpiderHostFrame x) where
2921+ type PrimState (SpiderHostFrame x) = PrimState IO
2922+ primitive = SpiderHostFrame . EventM . primitive
2923+
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
2927+
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()