@@ -9,74 +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− ) where
32−
33−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
3435import Control.Concurrent
3536import Control.Exception
36−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
3738import Control.Monad.Exception
38−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3940import Control.Monad.Primitive
40−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
4144import Control.Monad.Ref
42−import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
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.List.NonEmpty (NonEmpty (..), nonEmpty)
58−import qualified Data.List.NonEmpty as NonEmpty
59−import Data.Maybe
62+import Data.Kind (Type)
63+import Data.Maybe hiding (mapMaybe)
6064import Data.Monoid (mempty, (<>))
61−import Data.Some (Some)
62−import qualified Data.Some as Some
65+import Data.Proxy
6366import Data.These
6467import Data.Traversable
65−import Data.Tree (Forest, Tree (..), drawForest)
66−import Data.Word
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
6771import GHC.IORef (IORef (..))
6872import GHC.Stack
73+import Reflex.FastWeak
6974import System.IO.Unsafe
7075import System.Mem.Weak
7176import Unsafe.Coerce
7277
73−import Data.WeakBag (WeakBag, WeakBagTicket)
78+#ifdef MIN_VERSION_semialign
79+#if MIN_VERSION_these(0,8,0)
80+import Data.These.Combinators (justThese)
81+#endif
82+#if MIN_VERSION_semialign(1,1,0)
83+import Data.Zip (Zip (..))
84+#endif
85+#endif
86+
87+#ifdef DEBUG_CYCLES
88+import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
91+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92+import qualified Data.List.NonEmpty as NonEmpty
93+import Data.Tree (Forest, Tree (..), drawForest)
94+import Data.List (isPrefixOf)
95+
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97+import qualified Data.FastWeakBag as FastWeakBag
98+
99+import Data.Reflection
100+import Data.Some (Some(Some))
101+import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
103+import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
74104import qualified Data.WeakBag as WeakBag
105+import qualified Reflex.Class
75106import qualified Reflex.Class as R
76−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
77122
78−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
79−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
80131
81132debugPropagate :: Bool
82133
@@ -85,31 +136,42 @@ debugInvalidateHeight :: Bool
85136debugInvalidate :: Bool
86137
87138#ifdef DEBUG
88−
89139#define DEBUG_NODEIDS
90140
141+#ifdef DEBUG_TRACE_PROPAGATION
91142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
92146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
93150debugInvalidateHeight = False
151+#endif
94152
153+#ifdef DEBUG_TRACE_INVALIDATION
95154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
96158
97159class HasNodeId a where
98160 getNodeId :: a -> Int
99161
100−instance HasNodeId (Hold x p a) where
101− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
102164
103−instance HasNodeId (PushSubscribed x a b) where
104− getNodeId = pushSubscribedNodeId
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
167+
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
105170
106171instance HasNodeId (SwitchSubscribed x a) where
107172 getNodeId = switchSubscribedNodeId
108173
109−instance HasNodeId (MergeSubscribed x a) where
110− getNodeId = mergeSubscribedNodeId
111−
112−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
113175 getNodeId = fanSubscribedNodeId
114176
115177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -123,41 +185,16 @@ instance HasNodeId (Pull x a) where
123185
124186{-# INLINE showNodeId #-}
125187showNodeId :: HasNodeId a => a -> String
126−showNodeId = ("#"<>) . show . getNodeId
127−
128−showSubscriberType :: Subscriber x a -> String
129−showSubscriberType = \case
130− SubscriberPush _ _ -> "SubscriberPush"
131− SubscriberMerge _ _ -> "SubscriberMerge"
132− SubscriberFan _ -> "SubscriberFan"
133− SubscriberMergeChange _ -> "SubscriberMergeChange"
134− SubscriberHold _ -> "SubscriberHold"
135− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
136− SubscriberSwitch _ -> "SubscriberSwitch"
137− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
138− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
139− SubscriberHandle -> "SubscriberHandle"
140−
141−showEventType :: Event x a -> String
142−showEventType = \case
143− EventRoot _ _ -> "EventRoot"
144− EventNever -> "EventNever"
145− EventPush _ -> "EventPush"
146− EventMerge _ -> "EventMerge"
147− EventFan _ _ -> "EventFan"
148− EventSwitch _ -> "EventSwitch"
149− EventCoincidence _ -> "EventCoincidence"
150− EventHold _ -> "EventHold"
151− EventDyn _ -> "EventDyn"
152− EventHoldIdentity _ -> "EventHoldIdentity"
153− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
154193
155194#else
156195
157196debugPropagate = False
158−
159197debugInvalidateHeight = False
160−
161198debugInvalidate = False
162199
163200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -165,6 +202,10 @@ debugInvalidate = False
165202showNodeId :: a -> String
166203showNodeId _ = ""
167204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
168209#endif
169210
170211#ifdef DEBUG_NODEIDS
@@ -174,64 +215,240 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
174215
175216newNodeId :: IO Int
176217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
177−
178−{-# NOINLINE unsafeNodeId #-}
179−unsafeNodeId :: a -> Int
180−unsafeNodeId a = unsafePerformIO $ do
181− touch a
182− newNodeId
183218#endif
184219
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+
185234--------------------------------------------------------------------------------
186235-- Event
187236--------------------------------------------------------------------------------
188237
189−newtype Event x a = Event { subscribe :: Subscriber x a -> EventM x (EventSubscription x 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+ }
190309
191−wrap :: Monad m => (t -> EventSubscribed x a) -> (Subscriber x a -> m (WeakBagTicket (Subscriber x a), t)) -> Subscriber x a -> m (EventSubscription x a)
192−wrap tag getSpecificSubscribed sub = do
193− (sln, subd) <- getSpecificSubscribed sub
194− return $ EventSubscription (Just sln) $ tag subd
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)
195411
196−eventRoot :: GCompare k => k a -> Root x k -> Event x a
197−eventRoot !k !r = Event $ wrap EventSubscribedRoot $ liftIO . getRootSubscribed k r
198412
199−eventNever :: Event x a
200−eventNever = Event $ \_ -> return $ EventSubscription Nothing EventSubscribedNever
413+subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414+subscribe e s = fst <$> subscribeAndRead e s
415+
416+{-# INLINE wrap #-}
417+wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
418+wrap tag getSpecificSubscribed sub = do
419+ (sln, subd, occ) <- getSpecificSubscribed sub
420+ let es = tag subd
421+ return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
201422
202−eventPush :: Push x b a -> Event x a
203−eventPush !p = Event $ wrap EventSubscribedPush $ getPushSubscribed p
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
424+eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
204425
205−eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
206−eventMerge !m = Event $ wrap EventSubscribedMerge $ getMergeSubscribed m
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
207428
208−eventFan :: GCompare k => k a -> Fan x k -> Event x a
209−eventFan !k !f = Event $ wrap (EventSubscribedFan k) $ getFanSubscribed k f
429+eventNever :: Event x a
430+eventNever = Event $ const subscribeAndReadNever
431+
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433+eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
210434
211−eventSwitch :: Switch x a -> Event x a
212−eventSwitch !s = Event $ wrap EventSubscribedSwitch $ getSwitchSubscribed s
435+eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
436+eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
213437
214−eventCoincidence :: Coincidence x a -> Event x a
215−eventCoincidence !c = Event $ wrap EventSubscribedCoincidence $ getCoincidenceSubscribed c
438+eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439+eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
216440
217−eventHold :: (a ~ p b, R.Patch p) => Hold x p b -> Event x a
441+eventHold :: Hold x p -> Event x p
218442eventHold !h = Event $ subscribeHoldEvent h
219443
220−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
221445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
222446
223−eventHoldIdentity :: (a ~ Identity b) => Hold x Identity b -> Event x a
224−eventHoldIdentity !h = Event $ subscribeHoldEvent h
225−
226−eventDynIdentity :: (a ~ Identity b) => Dyn x Identity b -> Event x a
227−eventDynIdentity !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
228−
229447{-# INLINE subscribeCoincidenceInner #-}
230−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)
231449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
232450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
233− subscription@(EventSubscription _ innerSubd) <- subscribe inner subInner
234− innerOcc <- liftIO $ readEventSubscribed innerSubd
451+ (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
235452 innerHeight <- liftIO $ getEventSubscribedHeight innerSubd
236453 let height = max innerHeight outerHeight
237454 defer $ SomeResetCoincidence subscription $ if height > outerHeight then Just subscribedUnsafe else Nothing
@@ -247,163 +464,75 @@ data Subscriber x a = Subscriber
247464 , subscriberRecalculateHeight :: !(Height -> IO ())
248465 }
249466
250−--TODO: Move this comment to WeakBag
251−-- These function are constructor functions that are marked NOINLINE so they are
252−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
253−-- so any weak references that are attached to the constructors will have their
254−-- finalizer run. Using the opaque constructor, does not see the
255−-- constructor application, so it behaves like an IORef and cannot be fused away.
256−--
257−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
258−-- the weak pointer to it in some cases.
259−
260−newSubscriberPush :: (a -> ComputeM x (Maybe b)) -> PushSubscribed x a b -> IO (Subscriber x a)
261−newSubscriberPush compute subscribed = return $ Subscriber
262− { subscriberPropagate = \a -> {-# SCC "traversePush" #-} do
263− tracePropagate $ "SubscriberPush" <> showNodeId subscribed
264− occ <- runComputeM $ compute a
265− case occ of
266− Nothing -> return () -- No need to write a Nothing back into the Ref
267− Just o -> do
268− liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
269− scheduleClear $ pushSubscribedOccurrence subscribed
270− propagate o $ pushSubscribedSubscribers subscribed
271− , subscriberInvalidateHeight = \old -> do
272− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
273− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
274− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
275− , subscriberRecalculateHeight = \new -> do
276− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
277− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
278− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
279− }
280−
281−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)
282468newSubscriberHold h = return $ Subscriber
283469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
284470 , subscriberInvalidateHeight = \_ -> return ()
285471 , subscriberRecalculateHeight = \_ -> return ()
286472 }
287473
288−newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
289−newSubscriberMerge k subscribed = return $ Subscriber
290− { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
291− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
292− oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
293− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
294− tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
295− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
296− when (DMap.null oldM) $ do -- Only schedule the firing once
297− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
298− --TODO: assertions about height
299− currentHeight <- getCurrentHeight
300− when (height <= currentHeight) $ do
301− myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
302− if height /= invalidHeight
303− then error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
304− else liftIO $ do
305− nodesInvolvedInCycle <- walkInvalidHeightParents $ EventSubscribedMerge subscribed
306− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
307− error $ "Causality loop found:\n" <> drawForest (listsToForest stacks)
308− scheduleMerge height subscribed
309− , subscriberInvalidateHeight = \old -> do
310− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
311− removeMergeHeight old subscribed
312− invalidateMergeHeight subscribed
313− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
314− , subscriberRecalculateHeight = \new -> do
315− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
316− addMergeHeight new subscribed
317− revalidateMergeHeight subscribed
318− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
319− }
320−
321−newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap (DMap k (Event x))))
322−newSubscriberMergeChange subscribed = return $ Subscriber
323− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
324− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
325− defer $ SomeMergeUpdate a subscribed
326− , subscriberInvalidateHeight = \_ -> return ()
327− , subscriberRecalculateHeight = \_ -> return ()
328− }
329−
330−newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
331−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
332476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
333477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
334− tracePropagate $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
335− let f _ (Pair (Identity v) subsubs) = do
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
479+ liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480+ scheduleClear $ fanSubscribedOccurrence subscribed
481+ let f _ (Pair v subsubs) = do
336482 propagate v $ _fanSubscribedChildren_list subsubs
337483 return $ Constant ()
338484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
339485 return ()
340486 , subscriberInvalidateHeight = \old -> do
341− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
342487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
343− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
344− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
345489 , subscriberRecalculateHeight = \new -> do
346− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
347490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
348− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
349− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
350492 }
351493
352−newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
353−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
354496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
355− tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
356497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
357498 scheduleClear $ switchSubscribedOccurrence subscribed
358499 propagate a $ switchSubscribedSubscribers subscribed
359500 , subscriberInvalidateHeight = \_ -> do
360− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
361501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
362502 when (oldHeight /= invalidHeight) $ do
363503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
364− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
365− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
366− , subscriberRecalculateHeight = \new -> do
367− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
368− updateSwitchHeight new subscribed
369− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
370− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
371507
372−newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
373−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
374510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
375− tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
376511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
377− tracePropagate $ " outerHeight = " <> show outerHeight
512+ tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
378513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
379− tracePropagate $ " isJust occ = " <> show (isJust occ)
380− tracePropagate $ " innerHeight = " <> show innerHeight
514+ tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515+ tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
381517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
382518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
383519 case occ of
384− Nothing -> do
520+ Nothing ->
385521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
386522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
387− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
388− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
389525 Just o -> do -- Since it's already firing, no need to adjust height
390526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
391527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
392528 propagate o $ coincidenceSubscribedSubscribers subscribed
393− , subscriberInvalidateHeight = \_ -> do
394− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
395− invalidateCoincidenceHeight subscribed
396− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
397− , subscriberRecalculateHeight = \_ -> do
398− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
399− recalculateCoincidenceHeight subscribed
400− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
401531 }
402532
403−newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
404−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
405535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
406− tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
407536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
408537 case occ of
409538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -411,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
411540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
412541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
413542 propagate a $ coincidenceSubscribedSubscribers subscribed
414− , subscriberInvalidateHeight = \_ -> do
415− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
416− invalidateCoincidenceHeight subscribed
417− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
418− , subscriberRecalculateHeight = \_ -> do
419− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
420− recalculateCoincidenceHeight subscribed
421− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
422545 }
423546
424547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -428,177 +551,301 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
428551recalculateSubscriberHeight = flip subscriberRecalculateHeight
429552
430553-- | Propagate everything at the current height
431−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
432−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) $
433563 -- 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
434564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
435− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
436566
437567--------------------------------------------------------------------------------
438568-- EventSubscribed
439569--------------------------------------------------------------------------------
440570
441−data EventSubscribed x a
442− = EventSubscribedRoot {-# NOUNPACK #-} (RootSubscribed x a)
443− | EventSubscribedNever
444− | forall b. EventSubscribedPush !(PushSubscribed x b a)
445− | forall k. (GCompare k, a ~ DMap k Identity) => EventSubscribedMerge !(MergeSubscribed x k)
446− | forall k. GCompare k => EventSubscribedFan !(k a) !(FanSubscribed x k)
447− | EventSubscribedSwitch !(SwitchSubscribed x a)
448− | EventSubscribedCoincidence !(CoincidenceSubscribed x a)
449−
450−readEventSubscribed :: EventSubscribed x a -> IO (Maybe a)
451−readEventSubscribed = \case
452− EventSubscribedRoot rs -> readRootSubscribed rs
453− EventSubscribedNever -> return Nothing
454− EventSubscribedPush ps -> readPushSubscribed ps
455− EventSubscribedMerge ms -> readMergeSubscribed ms
456− EventSubscribedFan k fs -> readFanSubscribed k fs
457− EventSubscribedSwitch ss -> readSwitchSubscribed ss
458− EventSubscribedCoincidence cs -> readCoincidenceSubscribed cs
459−
460−{-# INLINE subscribeEventSubscribed #-}
461−subscribeEventSubscribed :: EventSubscribed x a -> Subscriber x a -> IO (Maybe (WeakBagTicket (Subscriber x a)))
462−subscribeEventSubscribed es sub = case es of
463− EventSubscribedRoot r -> do
464− traceSubscribe $ "subscribeEventSubscribed Root"
465− Just <$> subscribeRootSubscribed r sub
466− EventSubscribedNever -> do
467− traceSubscribe $ "subscribeEventSubscribed Never"
468− return Nothing
469− EventSubscribedPush subscribed -> do
470− traceSubscribe $ "subscribeEventSubscribed Push"
471− Just <$> subscribePushSubscribed subscribed sub
472− EventSubscribedFan k subscribed -> do
473− traceSubscribe $ "subscribeEventSubscribed Fan"
474− Just <$> subscribeFanSubscribed k subscribed sub
475− EventSubscribedMerge subscribed -> do
476− traceSubscribe $ "subscribeEventSubscribed Merge"
477− Just <$> subscribeMergeSubscribed subscribed sub
478− EventSubscribedSwitch subscribed -> do
479− traceSubscribe $ "subscribeEventSubscribed Switch"
480− Just <$> subscribeSwitchSubscribed subscribed sub
481− EventSubscribedCoincidence subscribed -> do
482− traceSubscribe $ "subscribeEventSubscribed Coincidence"
483− Just <$> subscribeCoincidenceSubscribed subscribed sub
484−
485−{-# INLINE eventSubscribedGetParents #-}
486−eventSubscribedGetParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
487−eventSubscribedGetParents = \case
488− EventSubscribedRoot _ -> return []
489− EventSubscribedNever -> return []
490− EventSubscribedPush subscribed -> return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
491− EventSubscribedFan _ subscribed -> return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
492− EventSubscribedMerge subscribed -> do
493− ps <- readIORef $ mergeSubscribedParents subscribed
494− return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
495− EventSubscribedSwitch subscribed -> do
496− s <- readIORef $ switchSubscribedCurrentParent subscribed
497− return [Some.This $ _eventSubscription_subscribed s]
498− EventSubscribedCoincidence subscribed -> do
499− innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
500− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
501− innerParents = maybeToList $ fmap Some.This innerSubscription
502− return $ outerParent : innerParents
503−
504−getEventSubscribedHeight :: EventSubscribed x a -> IO Height
571+toAny :: a -> Any
572+toAny = unsafeCoerce
573+
574+-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575+-- existential type? Sadly, GHC does not currently know how to unbox types
576+-- with existentially quantified fields. So instead we just coerce values
577+-- to type Any on the way in. Since we never coerce them back, this is
578+-- perfectly safe.
579+data EventSubscribed x = EventSubscribed
580+ { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581+ , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582+#ifdef DEBUG_CYCLES
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
584+ , eventSubscribedHasOwnHeightRef :: !Bool
585+ , eventSubscribedWhoCreated :: !(IO [String])
586+#endif
587+ }
588+
589+eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
590+eventSubscribedRoot !r = EventSubscribed
591+ { eventSubscribedHeightRef = zeroRef
592+ , eventSubscribedRetained = toAny r
593+#ifdef DEBUG_CYCLES
594+ , eventSubscribedGetParents = return []
595+ , eventSubscribedHasOwnHeightRef = False
596+ , eventSubscribedWhoCreated = return ["root"]
597+#endif
598+ }
599+
600+eventSubscribedNever :: EventSubscribed x
601+eventSubscribedNever = EventSubscribed
602+ { eventSubscribedHeightRef = zeroRef
603+ , eventSubscribedRetained = toAny ()
604+#ifdef DEBUG_CYCLES
605+ , eventSubscribedGetParents = return []
606+ , eventSubscribedHasOwnHeightRef = False
607+ , eventSubscribedWhoCreated = return ["never"]
608+#endif
609+ }
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
614+#ifdef DEBUG_CYCLES
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
618+#endif
619+ }
620+
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622+eventSubscribedFan !subscribed = EventSubscribed
623+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624+ , eventSubscribedRetained = toAny subscribed
625+#ifdef DEBUG_CYCLES
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
627+ , eventSubscribedHasOwnHeightRef = False
628+ , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629+#endif
630+ }
631+
632+eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
633+eventSubscribedSwitch !subscribed = EventSubscribed
634+ { eventSubscribedHeightRef = switchSubscribedHeight subscribed
635+ , eventSubscribedRetained = toAny subscribed
636+#ifdef DEBUG_CYCLES
637+ , eventSubscribedGetParents = do
638+ s <- readIORef $ switchSubscribedCurrentParent subscribed
639+ return [_eventSubscription_subscribed s]
640+ , eventSubscribedHasOwnHeightRef = True
641+ , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642+#endif
643+ }
644+
645+eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
646+eventSubscribedCoincidence !subscribed = EventSubscribed
647+ { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
648+ , eventSubscribedRetained = toAny subscribed
649+#ifdef DEBUG_CYCLES
650+ , eventSubscribedGetParents = do
651+ innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
654+ return $ outerParent : innerParents
655+ , eventSubscribedHasOwnHeightRef = True
656+ , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
657+#endif
658+ }
659+
660+getEventSubscribedHeight :: EventSubscribed x -> IO Height
505661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
506662
507−{-# INLINE eventSubscribedHeightRef #-}
508−eventSubscribedHeightRef :: EventSubscribed x a -> IORef Height
509−eventSubscribedHeightRef = \case
510− EventSubscribedRoot _ -> zeroRef
511− EventSubscribedNever -> zeroRef
512− EventSubscribedPush subscribed -> pushSubscribedHeight subscribed
513− EventSubscribedFan _ subscribed -> eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
514− EventSubscribedMerge subscribed -> mergeSubscribedHeight subscribed
515− EventSubscribedSwitch subscribed -> switchSubscribedHeight subscribed
516− EventSubscribedCoincidence subscribed -> coincidenceSubscribedHeight subscribed
517−
518−whoCreatedEventSubscribed :: EventSubscribed x a -> IO [String]
519−whoCreatedEventSubscribed = \case
520− EventSubscribedRoot _ -> return ["root"]
521− EventSubscribedNever -> return ["never"]
522− EventSubscribedPush subscribed -> whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
523− EventSubscribedFan _ subscribed -> whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
524− EventSubscribedMerge subscribed -> whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
525− EventSubscribedSwitch subscribed -> whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
526− EventSubscribedCoincidence subscribed -> whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
527−
528−{-# INLINE eventSubscribedHasOwnHeightRef #-}
529−eventSubscribedHasOwnHeightRef :: EventSubscribed x a -> Bool
530−eventSubscribedHasOwnHeightRef = \case
531− EventSubscribedRoot _ -> False
532− EventSubscribedNever -> False
533− EventSubscribedPush _ -> False
534− EventSubscribedFan _ _ -> False
535− EventSubscribedMerge _ -> True
536− EventSubscribedSwitch _ -> True
537− EventSubscribedCoincidence _ -> True
538−
539−walkInvalidHeightParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
663+#ifdef DEBUG_CYCLES
664+whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665+whoCreatedEventSubscribed = eventSubscribedWhoCreated
666+
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
540668walkInvalidHeightParents s0 = do
541− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
542670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
543671 when (h == invalidHeight) $ do
544672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
545− modify (Some.This s :)
673+ modify (s :)
546674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
547− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
548676 return subscribers
677+#endif
549678
550679{-# INLINE subscribeHoldEvent #-}
551−subscribeHoldEvent :: (CanSubscribe x m, R.Patch p) => Hold x p a -> Subscriber x (p a) -> m (EventSubscription x (p a))
552−subscribeHoldEvent h sub = do
553− EventSubscription _ subd <- getHoldEventSubscription h
554− sln <- liftIO $ subscribeEventSubscribed subd sub
555− return $ EventSubscription sln subd
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681+subscribeHoldEvent = subscribeAndRead . holdEvent
556682
557683--------------------------------------------------------------------------------
558−-- EventSubscription
684+-- Behavior
685+--------------------------------------------------------------------------------
686+
687+newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
688+
689+behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
690+behaviorHold !h = Behavior $ readHoldTracked h
691+
692+behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
693+behaviorHoldIdentity = behaviorHold
694+
695+behaviorConst :: a -> Behavior x a
696+behaviorConst !a = Behavior $ return a
697+
698+behaviorPull :: Pull x a -> Behavior x a
699+behaviorPull !p = Behavior $ do
700+ val <- liftIO $ readIORef $ pullValue p
701+ case val of
702+ Just subscribed -> do
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
704+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705+ liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706+ return $ pullSubscribedValue subscribed
707+ Nothing -> do
708+ i <- liftIO $ newInvalidatorPull p
709+ wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710+ parentsRef <- liftIO $ newIORef []
711+ holdInits <- askBehaviorHoldInits
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713+ invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714+ parents <- liftIO $ readIORef parentsRef
715+ let subscribed = PullSubscribed
716+ { pullSubscribedValue = a
717+ , pullSubscribedInvalidators = invsRef
718+ , pullSubscribedOwnInvalidator = i
719+ , pullSubscribedParents = parents
720+ }
721+ liftIO $ writeIORef (pullValue p) $ Just subscribed
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
723+ return a
724+
725+behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
726+behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
727+
728+{-# INLINE readHoldTracked #-}
729+readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730+readHoldTracked h = do
731+ result <- liftIO $ readIORef $ holdValue h
732+ askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734+ liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735+ return result
736+
737+{-# INLINABLE readBehaviorUntracked #-}
738+readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
739+readBehaviorUntracked b = do
740+ holdInits <- getDeferralQueue
741+ liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
742+
559743--------------------------------------------------------------------------------
744+-- Dynamic
745+--------------------------------------------------------------------------------
746+
747+type DynamicS x p = Dynamic x (PatchTarget p) p
560748
561−data EventSubscription x a = EventSubscription
562− { _eventSubscription_ticket :: !(Maybe (WeakBagTicket (Subscriber x a)))
563− , _eventSubscription_subscribed :: !(EventSubscribed x a)
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`?
564752 }
565753
566−unsubscribe :: EventSubscription x a -> IO ()
567−unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
760+dynamicHold !h = Dynamic
761+ { dynamicCurrent = behaviorHold h
762+ , dynamicUpdated = eventHold h
763+ }
764+
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
766+dynamicHoldIdentity = dynamicHold
767+
768+dynamicConst :: PatchTarget p -> DynamicS x p
769+dynamicConst !a = Dynamic
770+ { dynamicCurrent = behaviorConst a
771+ , dynamicUpdated = eventNever
772+ }
773+
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
775+dynamicDyn !d = Dynamic
776+ { dynamicCurrent = behaviorDyn d
777+ , dynamicUpdated = eventDyn d
778+ }
779+
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
781+dynamicDynIdentity = dynamicDyn
568782
569783--------------------------------------------------------------------------------
570784-- Combinators
571785--------------------------------------------------------------------------------
572786
573−--TODO: Figure out why certain things are not 'representational', then make them
574−--representational so we can use coerce
575−
576787--type role Hold representational
577−data Hold x p a
578− = Hold { holdValue :: !(IORef a)
788+data Hold x p
789+ = Hold { holdValue :: !(IORef (PatchTarget p))
579790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
580− , holdParent :: !(IORef (Either (Event x (p a)) (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
581793#ifdef DEBUG_NODEIDS
582794 , holdNodeId :: Int
583795#endif
584796 }
585797
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+
586829data EventEnv x
587− = EventEnv { eventEnvSpiderEnv :: !(SpiderEnv x)
588− , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
830+ = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
589831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832+ , eventEnvDynInits :: !(IORef [SomeDynInit x])
590833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
591834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
592− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
593− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
594838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
595839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
596− , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
840+ , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
597841 }
598842
599843{-# INLINE runEventM #-}
600−runEventM :: EventM x a -> EventEnv x -> IO a
601−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))
602849
603850class MonadIO m => Defer a m where
604851 getDeferralQueue :: m (IORef [a])
@@ -609,91 +856,98 @@ defer a = do
609856 q <- getDeferralQueue
610857 liftIO $ modifyIORef' q (a:)
611858
612−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
613864 {-# INLINE getDeferralQueue #-}
614− getDeferralQueue = EventM $ asks eventEnvAssignments
865+ getDeferralQueue = asksEventEnv eventEnvHoldInits
615866
616−instance Defer (SomeHoldInit x) (EventM x) where
867+instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
617868 {-# INLINE getDeferralQueue #-}
618− getDeferralQueue = EventM $ asks eventEnvHoldInits
869+ getDeferralQueue = asksEventEnv eventEnvDynInits
619870
620871instance Defer (SomeHoldInit x) (BehaviorM x) where
621872 {-# INLINE getDeferralQueue #-}
622873 getDeferralQueue = BehaviorM $ asks snd
623874
624−instance Defer (SomeMergeUpdate x) (EventM x) where
875+instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
625876 {-# INLINE getDeferralQueue #-}
626− getDeferralQueue = EventM $ asks eventEnvMergeUpdates
877+ getDeferralQueue = asksEventEnv eventEnvMergeUpdates
627878
628−instance Defer (SomeMergeInit x) (EventM x) where
879+instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
629880 {-# INLINE getDeferralQueue #-}
630− getDeferralQueue = EventM $ asks eventEnvMergeInits
881+ getDeferralQueue = asksEventEnv eventEnvMergeInits
631882
632−class HasCurrentHeight x m | m -> x where
883+class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
633884 getCurrentHeight :: m Height
634− scheduleMerge :: Height -> MergeSubscribed x a -> m ()
885+ scheduleMerge :: Height -> EventM x () -> m ()
635886
636−instance HasCurrentHeight x (EventM x) where
887+instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
637888 {-# INLINE getCurrentHeight #-}
638− getCurrentHeight = EventM $ do
639− heightRef <- asks eventEnvCurrentHeight
889+ getCurrentHeight = do
890+ heightRef <- asksEventEnv eventEnvCurrentHeight
640891 liftIO $ readIORef heightRef
641892 {-# INLINE scheduleMerge #-}
642− scheduleMerge height subscribed = EventM $ do
643− delayedRef <- asks eventEnvDelayedMerges
644− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
645−
646−class HasSpiderEnv x m | m -> x where
647− -- | Retrieve the current SpiderEnv
648− askSpiderEnv :: m (SpiderEnv x)
893+ scheduleMerge height subscribed = do
894+ delayedRef <- asksEventEnv eventEnvDelayedMerges
895+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
649896
650−instance HasSpiderEnv x (EventM x) where
651− {-# INLINE askSpiderEnv #-}
652− askSpiderEnv = EventM $ asks eventEnvSpiderEnv
897+class HasSpiderTimeline x where
898+ -- | Retrieve the current SpiderTimelineEnv
899+ spiderTimeline :: SpiderTimelineEnv x
653900
654−instance HasSpiderEnv x (SpiderHost x) where
655− {-# INLINE askSpiderEnv #-}
656− askSpiderEnv = SpiderHost ask
901+instance HasSpiderTimeline Global where
902+ spiderTimeline = globalSpiderTimelineEnv
657903
658−putCurrentHeight :: Height -> EventM x ()
659−putCurrentHeight h = EventM $ do
660− heightRef <- asks eventEnvCurrentHeight
904+putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905+putCurrentHeight h = do
906+ heightRef <- asksEventEnv eventEnvCurrentHeight
661907 liftIO $ writeIORef heightRef $! h
662908
663−instance Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
664910 {-# INLINE getDeferralQueue #-}
665− getDeferralQueue = EventM $ asks eventEnvClears
911+ getDeferralQueue = asksEventEnv eventEnvClears
666912
667913{-# INLINE scheduleClear #-}
668−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
669−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
670916
671−instance Defer SomeRootClear (EventM x) where
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
672918 {-# INLINE getDeferralQueue #-}
673− 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
674928
675929{-# INLINE scheduleRootClear #-}
676−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
677−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
678932
679−instance Defer (SomeResetCoincidence x) (EventM x) where
933+instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
680934 {-# INLINE getDeferralQueue #-}
681− getDeferralQueue = EventM $ asks eventEnvResetCoincidences
935+ getDeferralQueue = asksEventEnv eventEnvResetCoincidences
682936
683937-- Note: hold cannot examine its event until after the phase is over
684−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> EventM x (Hold x p a) #-}
685−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> ComputeM x (Hold x p a) #-}
686−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)
687940hold v0 e = do
688941 valRef <- liftIO $ newIORef v0
689942 invsRef <- liftIO $ newIORef []
690− parentRef <- liftIO $ newIORef $ Left e
943+ parentRef <- liftIO $ newIORef Nothing
691944#ifdef DEBUG_NODEIDS
692945 nodeId <- liftIO newNodeId
693946#endif
694947 let h = Hold
695948 { holdValue = valRef
696949 , holdInvalidators = invsRef
950+ , holdEvent = e
697951 , holdParent = parentRef
698952#ifdef DEBUG_NODEIDS
699953 , holdNodeId = nodeId
@@ -703,35 +957,35 @@ hold v0 e = do
703957 return h
704958
705959{-# INLINE getHoldEventSubscription #-}
706−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)
707961getHoldEventSubscription h = do
708962 ep <- liftIO $ readIORef $ holdParent h
709963 case ep of
710− Right subd -> return subd
711− Left e -> do
964+ Just subd -> return subd
965+ Nothing -> do
966+ let e = holdEvent h
712967 subscriptionRef <- liftIO $ newIORef $ error "getHoldEventSubscription: subdRef uninitialized"
713− subscription@(EventSubscription _ subd) <- subscribe e =<< liftIO (newSubscriberHold h)
714− occ <- liftIO $ readEventSubscribed subd
968+ (subscription@(EventSubscription _ _), occ) <- subscribeAndRead e =<< liftIO (newSubscriberHold h)
715969 liftIO $ writeIORef subscriptionRef $! subscription
716970 case occ of
717971 Nothing -> return ()
718972 Just o -> do
719973 old <- liftIO $ readIORef $ holdValue h
720− case R.apply o old of
974+ case apply o old of
721975 Nothing -> return ()
722976 Just new -> do
723977 -- Need to evaluate these so that we don't retain the Hold itself
724978 v <- liftIO $ evaluate $ holdValue h
725979 i <- liftIO $ evaluate $ holdInvalidators h
726980 defer $ SomeAssignment v i new
727− liftIO $ writeIORef (holdParent h) $ Right subscription
981+ liftIO $ writeIORef (holdParent h) $ Just subscription
728982 return subscription
729983
730984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
731985
732−--type role BehaviorM representational
733986-- BehaviorM can sample behaviors
734−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))
735989
736990instance Monad (BehaviorM x) where
737991 {-# INLINE (>>=) #-}
@@ -740,14 +994,16 @@ instance Monad (BehaviorM x) where
740994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
741995 {-# INLINE return #-}
742996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
743998 {-# INLINE fail #-}
744999 fail s = BehaviorM $ fail s
1000+#endif
7451001
7461002data BehaviorSubscribed x a
747− = forall p. BehaviorSubscribedHold (Hold x p a)
1003+ = forall p. BehaviorSubscribedHold (Hold x p)
7481004 | BehaviorSubscribedPull (PullSubscribed x a)
7491005
750−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
7511007
7521008--type role PullSubscribed representational
7531009data PullSubscribed x a
@@ -782,55 +1038,33 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
7821038#endif
7831039 }
7841040
785−data Root x (k :: * -> *)
1041+data Root x k
7861042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
7871043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
7881044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
7891045 }
7901046
791−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)
7921048
793−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)
7941050
795−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+ }
7961056
797−data SomeEventSubscription x = forall a. SomeEventSubscription (EventSubscription x a)
1057+newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
7981058
7991059-- EventM can do everything BehaviorM can, plus create holds
800−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
801−
802−data PushSubscribed x a b
803− = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed x a b)))
804− , 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)
805− , pushSubscribedHeight :: !(IORef Height)
806− , pushSubscribedSubscribers :: !(WeakBag (Subscriber x b))
807− , pushSubscribedSelf :: !(Subscriber x a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
808− , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed x a b)))
809− , pushSubscribedParent :: !(EventSubscription x a)
810−#ifdef DEBUG_NODEIDS
811− , pushSubscribedNodeId :: Int
812−#endif
813− }
814−
815−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
816−
817−instance Defer (SomeHoldInit x) (ComputeM x) where
818− getDeferralQueue = ComputeM ask
819−
820−{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
821−runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
822−runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
823−
824−data Push x a b
825− = 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?)
826− , pushParent :: !(Event x a)
827− , pushSubscribed :: !(IORef (Maybe (PushSubscribed x a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
828− }
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
8291061
830−data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x a) !(Subscriber x a)
1062+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
8311063
832−mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x a
833−mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1064+data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065+ { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066+ , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067+ }
8341068
8351069data HeightBag = HeightBag
8361070 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -848,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
8481082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
8491083
8501084heightBagAdd :: Height -> HeightBag -> HeightBag
851−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
8521087
8531088heightBagRemove :: Height -> HeightBag -> HeightBag
8541089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -857,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
8571092 0 -> IntMap.delete h c
8581093 _ -> IntMap.insert h (pred old) c
8591094
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+
8601102heightBagMax :: HeightBag -> Height
8611103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
8621104 Just ((h, _), _) -> Height h
@@ -874,45 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
8741116heightBagVerify = id
8751117#endif
8761118
877−data MergeSubscribed x k
878− = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
879− , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
880− , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
881− , mergeSubscribedHeight :: !(IORef Height)
882− , mergeSubscribedHeightBag :: !(IORef HeightBag)
883− , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
884− , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap (DMap k (Event x))), EventSubscribed x (R.PatchDMap (DMap k (Event x)))))
885− , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
886− , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
887−#ifdef DEBUG_NODEIDS
888− , mergeSubscribedNodeId :: Int
889−#endif
890− }
891−
892−--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
893−data Merge x k
894− = Merge { mergeParents :: !(Dynamic x R.PatchDMap (DMap k (Event x)))
895− , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
896− }
897−
898−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
899− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
900− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
901− , _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)))
9021123 }
9031124
904−data FanSubscribed (x :: *) k
905− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
906− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
907− , 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)
9081130#ifdef DEBUG_NODEIDS
9091131 , fanSubscribedNodeId :: Int
9101132#endif
9111133 }
9121134
913−data Fan x k
914− = Fan { fanParent :: !(Event x (DMap k Identity))
915− , 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)))
9161138 }
9171139
9181140data SwitchSubscribed x a
@@ -924,7 +1146,7 @@ data SwitchSubscribed x a
9241146 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
9251147 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
9261148 , switchSubscribedParent :: !(Behavior x (Event x a))
927− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x a))
1149+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
9281150 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
9291151#ifdef DEBUG_NODEIDS
9301152 , switchSubscribedNodeId :: Int
@@ -936,15 +1158,17 @@ data Switch x a
9361158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
9371159 }
9381160
1161+#ifdef USE_TEMPLATE_HASKELL
9391162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163+#endif
9401164data CoincidenceSubscribed x a
9411165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
9421166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
9431167 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
9441168 , coincidenceSubscribedHeight :: !(IORef Height)
9451169 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
946− , coincidenceSubscribedOuterParent :: !(EventSubscription x (Event x a))
947− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x a)))
1170+ , coincidenceSubscribedOuterParent :: !(EventSubscription x)
1171+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
9481172 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
9491173#ifdef DEBUG_NODEIDS
9501174 , coincidenceSubscribedNodeId :: Int
@@ -964,152 +1188,111 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
9641188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
9651189newInvalidatorPull p = return $! InvalidatorPull p
9661190
967−data Dynamic x p a
968− = DynamicHold !(Hold x p a)
969− | p ~ Identity => DynamicHoldIdentity !(Hold x Identity a)
970− | DynamicConst !a
971− | DynamicDyn !(Dyn x p a)
972− | p ~ Identity => DynamicDynIdentity !(Dyn x Identity a)
973−
974−{-# INLINE current #-}
975−current :: R.Patch p => Dynamic x p a -> Behavior x a
976−current = \case
977− DynamicHold h -> BehaviorHold h
978− DynamicHoldIdentity h -> BehaviorHoldIdentity h
979− DynamicConst a -> BehaviorConst a
980− DynamicDyn d -> BehaviorDyn d
981− DynamicDynIdentity d -> BehaviorDynIdentity d
982−
983−--TODO: If you only need updated, not current, can we avoid actually constructing the Hold?
984−{-# INLINE updated #-}
985−updated :: R.Patch p => Dynamic x p a -> Event x (p a)
986−updated = \case
987− DynamicHold h -> eventHold h
988− DynamicHoldIdentity h -> eventHoldIdentity h
989− DynamicConst _ -> eventNever
990− DynamicDyn d -> eventDyn d
991− DynamicDynIdentity d -> eventDynIdentity d
992−
993−newMapDyn :: (a -> b) -> Dynamic x Identity a -> Dynamic x Identity b
994−newMapDyn f d = DynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ current d) (Identity . f . runIdentity <$> updated d)
995−
996−instance Functor (Dynamic x Identity) where
997− fmap = newMapDyn
998−
999−instance Applicative (Dynamic x Identity) where
1000− pure = DynamicConst
1001− (<*>) = zipDynWith ($)
1002− _ *> b = b
1003− a <* _ = a
1004−
1005−instance R.FunctorMaybe (Event x) where
1006− fmapMaybe f = push $ return . f
1007−
1008−instance Align (Event x) where
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
1193+
1194+instance HasSpiderTimeline x => Align (Event x) where
10091195 nil = eventNever
1010− 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]
1201+
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
1208+
1209+data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210+ | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211+ | HoldDyn !(Hold x p)
1212+
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1214+
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)
10111217
10121218--TODO: Avoid the duplication between this and R.zipDynWith
1013−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)
10141220zipDynWith f da db =
1015− let eab = align (updated da) (updated db)
1221+ let eab = align (dynamicUpdated da) (dynamicUpdated db)
10161222 ec = flip push eab $ \o -> do
10171223 (a, b) <- case o of
10181224 This (Identity a) -> do
1019− b <- readBehaviorUntracked $ current db
1225+ b <- readBehaviorUntracked $ dynamicCurrent db
10201226 return (a, b)
10211227 That (Identity b) -> do
1022− a <- readBehaviorUntracked $ current da
1228+ a <- readBehaviorUntracked $ dynamicCurrent da
10231229 return (a, b)
10241230 These (Identity a) (Identity b) -> return (a, b)
10251231 return $ Just $ Identity $ f a b
1026− in DynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (current da) <*> readBehaviorUntracked (current db)) ec
1027−
1028−instance Monad (Dynamic x Identity) where
1029− {-# INLINE return #-}
1030− return = pure
1031− {-# INLINE (>>=) #-}
1032− x >>= f = DynamicDynIdentity $ newJoinDyn $ newMapDyn f x --TODO: (>>), fail
1033− {-# INLINE (>>) #-}
1034− _ >> y = y
1035− {-# INLINE fail #-}
1036− fail _ = error "Dynamic does not support 'fail'"
1037−
1038−newtype Dyn x p a = Dyn { unDyn :: IORef (Either (BehaviorM x a, Event x (p a)) (Hold x p a)) }
1232+ in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
10391233
1040−unsafeDyn :: BehaviorM x a -> Event x (p a) -> Dyn x p a
1041−unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1042− 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
10431240
1044−newJoinDyn :: Dynamic x Identity (Dynamic x Identity a) -> Dyn x Identity a
1045−newJoinDyn d =
1046− let readV0 = readBehaviorTracked . current =<< readBehaviorTracked (current d)
1047− eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . current . runIdentity) $ updated d
1048− eInner = switch $ updated <$> current d
1049− eBoth = coincidence $ updated . runIdentity <$> updated d
1050− v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1051− in unsafeDyn readV0 v'
1052−
1053−--type role Behavior representational
1054−data Behavior x a
1055− = forall p. BehaviorHold !(Hold x p a)
1056− | BehaviorHoldIdentity !(Hold x Identity a)
1057− | BehaviorConst !a
1058− | BehaviorPull !(Pull x a)
1059− | BehaviorDynIdentity !(Dyn x Identity a)
1060− | forall p. R.Patch p => BehaviorDyn !(Dyn x p a)
1241+unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
10611244
10621245-- ResultM can read behaviors and events
10631246type ResultM = EventM
10641247
1065−{-# NOINLINE unsafeNewIORef #-}
1066−unsafeNewIORef :: a -> b -> IORef b
1067−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1068−
1069−instance Functor (Event x) where
1248+instance HasSpiderTimeline x => Functor (Event x) where
10701249 fmap f = push $ return . Just . f
10711250
10721251instance Functor (Behavior x) where
10731252 fmap f = pull . fmap f . readBehaviorTracked
10741253
1075−{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1076−push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1077−push f e = eventPush $ Push
1078− { pushCompute = f
1079− , pushParent = e
1080− , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1081− }
1082−-- 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)
10831257
1084−{-# NOINLINE pull #-}
1258+{-# INLINABLE pull #-}
10851259pull :: BehaviorM x a -> Behavior x a
1086−pull a = BehaviorPull $ Pull
1087− { pullCompute = a
1088− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
10891262#ifdef DEBUG_NODEIDS
1090− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
10911264#endif
1092− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
10931272
1094−{-# NOINLINE switch #-}
1095−switch :: Behavior x (Event x a) -> Event x a
1096−switch a = eventSwitch $ Switch
1097− { switchParent = a
1098− , switchSubscribed = unsafeNewIORef a Nothing
1099− }
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+ }
11001281
1101−coincidence :: Event x (Event x a) -> Event x a
1102−coincidence a = eventCoincidence $ Coincidence
1103− { coincidenceParent = a
1104− , coincidenceSubscribed = unsafeNewIORef a Nothing
1105− }
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+ }
11061289
11071290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1108−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
11091292run roots after = do
1110− tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1111− spiderEnv <- SpiderHost ask
1112− 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
11131296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
11141297 occBefore <- liftIO $ do
11151298 occBefore <- readIORef occRef
@@ -1121,42 +1304,39 @@ run roots after = do
11211304 else return Nothing
11221305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
11231306 propagate a subscribersRef
1124− delayedRef <- EventM $ asks eventEnvDelayedMerges
1307+ delayedRef <- asksEventEnv eventEnvDelayedMerges
11251308 let go = do
11261309 delayed <- liftIO $ readIORef delayedRef
11271310 case IntMap.minViewWithKey delayed of
11281311 Nothing -> return ()
11291312 Just ((currentHeight, cur), future) -> do
1130− tracePropagate $ "Running height " ++ show currentHeight
1313+ tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
11311314 putCurrentHeight $ Height currentHeight
11321315 liftIO $ writeIORef delayedRef $! future
1133− forM_ cur $ \d -> case d of
1134− DelayedMerge subscribed -> do
1135− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1136− case height `compare` Height currentHeight of
1137− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1138− GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1139− EQ -> do
1140− m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1141− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1142− --TODO: Assert that m is not empty
1143− liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1144− scheduleClear $ mergeSubscribedOccurrence subscribed
1145− propagate m $ mergeSubscribedSubscribers subscribed
1316+ sequence_ cur
11461317 go
11471318 go
11481319 putCurrentHeight maxBound
11491320 after
1150− tracePropagate "Done running an event frame"
1321+ tracePropagate (Proxy :: Proxy x) "Done running an event frame"
11511322 return result
11521323
1153−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
11541332
1155−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1333+newtype Clear a = Clear (IORef (Maybe a))
11561334
1157−data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1335+newtype IntClear a = IntClear (IORef (IntMap a))
11581336
1159−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
11601340
11611341debugFinalize :: Bool
11621342debugFinalize = False
@@ -1166,54 +1346,106 @@ mkWeakPtrWithDebug x debugNote = do
11661346 x' <- evaluate x
11671347 mkWeakPtr x' $
11681348 if debugFinalize
1169− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
11701350 else Nothing
11711351
11721352type WeakList a = [Weak a]
11731353
1174−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
11751359#ifdef DEBUG
1176−withIncreasedDepth :: CanTrace x m => m a -> m a
1177−withIncreasedDepth a = do
1178− spiderEnv <- askSpiderEnv
1179− 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
11801385 result <- a
1181− liftIO $ modifyIORef' (_spiderEnv_depth spiderEnv) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
11821387 return result
1183−#else
1184−withIncreasedDepth :: m a -> m a
1185−withIncreasedDepth = id
1186−#endif
1187−
1188−type CanTrace x m = (HasSpiderEnv x m, MonadIO m)
11891388
11901389{-# INLINE tracePropagate #-}
1191−tracePropagate :: (CanTrace x m) => String -> m ()
1192−tracePropagate = traceWhen debugPropagate
1193−
1194−{-# INLINE traceSubscribe #-}
1195−traceSubscribe :: String -> IO ()
1196−traceSubscribe = when debugSubscribe . liftIO . putStrLn
1390+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391+tracePropagate p = when debugPropagate . trace p
11971392
11981393{-# INLINE traceInvalidate #-}
11991394traceInvalidate :: String -> IO ()
1200−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
12011396
1202−{-# INLINE traceWhen #-}
1203−traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1204−traceWhen b message = traceMWhen b $ return message
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
12051400
1206−{-# INLINE traceMWhen #-}
1207−traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1208−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
12091408 message <- getMessage
1210−#ifdef DEBUG
1211− spiderEnv <- askSpiderEnv
1212− d <- liftIO $ readIORef $ _spiderEnv_depth spiderEnv
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
12131412#else
1214− 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+
12151448#endif
1216− liftIO $ putStrLn $ replicate d ' ' <> message
12171449
12181450whoCreatedIORef :: IORef a -> IO [String]
12191451whoCreatedIORef (IORef a) = whoCreated $! a
@@ -1228,339 +1460,278 @@ groupByHead = \case
12281460 | otherwise -> (x, xs :| []) : l
12291461
12301462listsToForest :: Eq a => [[a]] -> Forest a
1231−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
1474+#endif
1475+
1476+#ifdef DEBUG_CYCLES
1477+
1478+data EventLoopException = EventLoopException [[String]]
1479+instance Exception EventLoopException
1480+
1481+instance Show EventLoopException where
1482+ show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483+ then "no location information, compile with profiling enabled for stack tree"
1484+ else showStacks stacks
1485+
1486+#else
1487+
1488+data EventLoopException = EventLoopException
1489+instance Exception EventLoopException
1490+
1491+instance Show EventLoopException where
1492+ show EventLoopException = "causality loop detected: \n" <>
1493+ "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494+
1495+#endif
1496+
12321497
12331498{-# INLINE propagateSubscriberHold #-}
1234−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 ()
12351500propagateSubscriberHold h a = do
1236− {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
12371502 invalidators <- liftIO $ readIORef $ holdInvalidators h
12381503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
12391505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1240− case {-# SCC "apply" #-} R.apply a v of
1506+ case {-# SCC "apply" #-} apply a v of
12411507 Nothing -> return ()
12421508 Just v' -> do
1243− {-# 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)
12441511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
12451512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
12461513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
12471514
1248−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
1249−
1250−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
1251−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
1252−readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
1253−readBehaviorUntracked b = do
1254− holdInits <- getDeferralQueue
1255− liftIO $ runBehaviorM (readBehaviorTracked b) Nothing holdInits --TODO: Specialize readBehaviorTracked to the Nothing and Just cases
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
12561516
12571517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1258−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
12591519
12601520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
12611521askInvalidator = do
1262− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
12631523 case m of
12641524 Nothing -> return Nothing
12651525 Just (!wi, _) -> return $ Just wi
12661526
12671527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
12681528askParentsRef = do
1269− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
12701530 case m of
12711531 Nothing -> return Nothing
12721532 Just (_, !p) -> return $ Just p
12731533
12741534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
12751535askBehaviorHoldInits = do
1276− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
12771537 return his
12781538
1279−readBehaviorTracked :: Behavior x a -> BehaviorM x a
1280−readBehaviorTracked b = case b of
1281− BehaviorHold h -> readHoldTracked h
1282− BehaviorHoldIdentity h -> readHoldTracked h
1283− BehaviorConst a -> return a
1284− BehaviorPull p -> do
1285− val <- liftIO $ readIORef $ pullValue p
1286− case val of
1287− Just subscribed -> do
1288− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1289− askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
1290− liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
1291− return $ pullSubscribedValue subscribed
1292− Nothing -> do
1293− i <- liftIO $ newInvalidatorPull p
1294− wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
1295− parentsRef <- liftIO $ newIORef []
1296− holdInits <- askBehaviorHoldInits
1297− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
1298− invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
1299− parents <- liftIO $ readIORef parentsRef
1300− let subscribed = PullSubscribed
1301− { pullSubscribedValue = a
1302− , pullSubscribedInvalidators = invsRef
1303− , pullSubscribedOwnInvalidator = i
1304− , pullSubscribedParents = parents
1305− }
1306− liftIO $ writeIORef (pullValue p) $ Just subscribed
1307− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
1308− return a
1309− BehaviorDyn d -> readHoldTracked =<< getDynHold d
1310− BehaviorDynIdentity d -> readHoldTracked =<< getDynHold d
1311−
1312−{-# INLINE readHoldTracked #-}
1313−readHoldTracked :: Hold x p a -> BehaviorM x a
1314−readHoldTracked h = do
1315− result <- liftIO $ readIORef $ holdValue h
1316− askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
1317− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
1318− return result
1319−
13201539{-# INLINE getDynHold #-}
1321−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)
13221541getDynHold d = do
13231542 mh <- liftIO $ readIORef $ unDyn d
13241543 case mh of
1325− Right h -> return h
1326− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13271546 holdInits <- getDeferralQueue
13281547 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
13291554 h <- hold v0 v'
1330− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13311556 return h
13321557
1333−readRootSubscribed :: RootSubscribed x a -> IO (Maybe a)
1334−readRootSubscribed = rootSubscribedOccurrence
1335−
1336−readPushSubscribed :: PushSubscribed x b a -> IO (Maybe a)
1337−readPushSubscribed subscribed = do
1338− result <- readIORef $ pushSubscribedOccurrence subscribed -- Since ResultM is always called after the final height is reached, this will always be valid
1339− touch $ pushSubscribedSelf subscribed
1340− return result
1341−
1342−readMergeSubscribed :: MergeSubscribed x k -> IO (Maybe (DMap k Identity))
1343−readMergeSubscribed subscribed = do
1344− result <- readIORef $ mergeSubscribedOccurrence subscribed
1345− touch $ mergeSubscribedParents subscribed
1346− return result
1347−
1348−readFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> IO (Maybe a)
1349−readFanSubscribed k fs = do
1350− parentOcc <- readEventSubscribed $ _eventSubscription_subscribed $ fanSubscribedParent fs
1351− return $ coerce $ DMap.lookup k =<< parentOcc
1352−
1353−readSwitchSubscribed :: SwitchSubscribed x a -> IO (Maybe a)
1354−readSwitchSubscribed subscribed = do
1355− result <- readIORef $ switchSubscribedOccurrence subscribed
1356− touch $ switchSubscribedOwnInvalidator subscribed
1357− return result
1358−
1359−readCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO (Maybe a)
1360−readCoincidenceSubscribed subscribed = do
1361− result <- readIORef $ coincidenceSubscribedOccurrence subscribed
1362− touch $ coincidenceSubscribedOuter subscribed
1363− --TODO: do we need to touch the inner subscriber?
1364− return result
13651558
13661559-- Always refers to 0
13671560{-# NOINLINE zeroRef #-}
13681561zeroRef :: IORef Height
13691562zeroRef = unsafePerformIO $ newIORef zeroHeight
13701563
1371−{-# INLINE debugSubscribe #-}
1372−debugSubscribe :: Bool
1373−debugSubscribe = False
1374−
1375−type CanSubscribe x m =
1376− ( HasSpiderEnv x m
1377− , HasCurrentHeight x m
1378− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1379− , Defer SomeClear m -- Wiping out event firings
1380− , Defer (SomeAssignment x) m -- Updating state
1381− , Defer (SomeResetCoincidence x) m
1382− , m ~ EventM x
1383− )
1384−
1385−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a), RootSubscribed x 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)
13861565getRootSubscribed k r sub = do
13871566 mSubscribed <- readIORef $ rootSubscribed r
1567+ let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
13881568 case DMap.lookup k mSubscribed of
13891569 Just subscribed -> {-# SCC "hitRoot" #-} do
13901570 sln <- subscribeRootSubscribed subscribed sub
1391− return (sln, subscribed)
1571+ occ <- getOcc
1572+ return (sln, subscribed, occ)
13921573 Nothing -> {-# SCC "missRoot" #-} do
13931574 weakSelf <- newIORef $ error "getRootSubscribed: weakSelfRef not initialized"
13941575 let !cached = rootSubscribed r
13951576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
13961577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1397− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
13981581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13991582 writeIORef uninitRef $! uninit
1400− let subscribed = RootSubscribed
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
1586+ let !subscribed = RootSubscribed
14011587 { rootSubscribedKey = k
14021588 , rootSubscribedCachedSubscribed = cached
1403− , rootSubscribedOccurrence = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1589+ , rootSubscribedOccurrence = getOcc
14041590 , rootSubscribedSubscribers = subs
14051591 , rootSubscribedUninit = uninit
14061592 , rootSubscribedWeakSelf = weakSelf
14071593#ifdef DEBUG_NODEIDS
1408− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
14091595#endif
14101596 }
1411− 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)
14121608 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
1413− return (sln, subscribed)
1609+ occ <- getOcc
1610+ return (sln, subscribed, occ)
14141611
1612+#ifdef USE_TEMPLATE_HASKELL
14151613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614+#endif
14161615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1417−cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1616+cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
14181617 rootSubscribedUninit self
14191618 modifyIORef' cached $ DMap.delete k
14201619
14211620{-# INLINE subscribeRootSubscribed #-}
1422−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1621+subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
14231622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
14241623
1425−-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1426−{-# SPECIALIZE getPushSubscribed :: Push x a b -> Subscriber x b -> EventM x (WeakBagTicket (Subscriber x b), PushSubscribed x a b) #-}
1427−getPushSubscribed :: CanSubscribe x m => Push x a b -> Subscriber x b -> m (WeakBagTicket (Subscriber x b), PushSubscribed x a b)
1428−getPushSubscribed p sub = do
1429− mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1430− case mSubscribed of
1431− Just subscribed -> {-# SCC "hitPush" #-} do
1432− sln <- liftIO $ subscribePushSubscribed subscribed sub
1433− return (sln, subscribed)
1434− Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1435− subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1436− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1437− s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
1438− subscription@(EventSubscription _ subd) <- subscribe (pushParent p) s
1439− parentOcc <- liftIO $ readEventSubscribed subd
1440− occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1441− occRef <- liftIO $ newIORef occ
1442− when (isJust occ) $ scheduleClear occRef
1443− weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1444− let !cached = pushSubscribed p
1445− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1446− let subscribed = PushSubscribed
1447− { pushSubscribedCachedSubscribed = cached
1448− , pushSubscribedOccurrence = occRef
1449− , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1450− , pushSubscribedSubscribers = subs
1451− , pushSubscribedSelf = s
1452− , pushSubscribedWeakSelf = weakSelf
1453− , 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))
14541630#ifdef DEBUG_NODEIDS
1455− , pushSubscribedNodeId = unsafeNodeId p
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
14561632#endif
1457− }
1458− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1459− liftIO $ writeIORef subscribedRef $! subscribed
1460− liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1461− return (sln, subscribed)
1462−
1463−cleanupPushSubscribed :: PushSubscribed x a b -> IO ()
1464−cleanupPushSubscribed self = do
1465− unsubscribe $ pushSubscribedParent self
1466− writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1467−
1468−{-# INLINE subscribePushSubscribed #-}
1469−subscribePushSubscribed :: PushSubscribed x a b -> Subscriber x b -> IO (WeakBagTicket (Subscriber x b))
1470−subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1471−
1472−{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k) #-}
1473−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)
1474−getMergeSubscribed m sub = do
1475− mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1476− case mSubscribed of
1477− Just subscribed -> {-# SCC "hitMerge" #-} do
1478− sln <- liftIO $ subscribeMergeSubscribed subscribed sub
1479− return (sln, subscribed)
1480− Nothing -> {-# SCC "missMerge" #-} do
1481− subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1482− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1483− initialParents <- readBehaviorUntracked $ current $ mergeParents m
1484− subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1485− s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1486− subscription@(EventSubscription _ parentSubd) <- subscribe e s
1487− parentOcc <- liftIO $ readEventSubscribed parentSubd
1488− height <- liftIO $ getEventSubscribedHeight parentSubd
1489− return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1490− let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1491− heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1492− myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1493− myHeight = if invalidHeight `elem` heights
1494− then invalidHeight
1495− else succHeight $ heightBagMax myHeightBag
1496− currentHeight <- getCurrentHeight
1497− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1498− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1499− else (Nothing, dm)
1500− unless (DMap.null accum) $ do
1501− scheduleMerge myHeight subscribedUnsafe
1502− occRef <- liftIO $ newIORef occ
1503− when (isJust occ) $ scheduleClear occRef
1504− accumRef <- liftIO $ newIORef accum
1505− heightRef <- liftIO $ newIORef myHeight
1506− heightMapRef <- liftIO $ newIORef myHeightBag
1507− weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1508− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1509− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1510− parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1511− let !subscribed = MergeSubscribed
1512− { mergeSubscribedCachedSubscribed = mergeSubscribed m
1513− , mergeSubscribedOccurrence = occRef
1514− , mergeSubscribedAccum = accumRef
1515− , mergeSubscribedHeight = heightRef
1516− , mergeSubscribedHeightBag = heightMapRef
1517− , mergeSubscribedSubscribers = subs
1518− , mergeSubscribedChange = changeSubdRef
1519− , mergeSubscribedParents = parentsRef
1520− , mergeSubscribedWeakSelf = weakSelf
1633+ }
1634+
1635+newFanInt :: IO (FanInt x a)
1636+newFanInt = do
1637+ subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638+ subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639+ occRef <- newIORef $ error "fanInt: no occurrence"
15211640#ifdef DEBUG_NODEIDS
1522− , mergeSubscribedNodeId = unsafeNodeId m
1641+ nodeId <- newNodeId
15231642#endif
1524− }
1525− defer $ SomeMergeInit subscribed $ updated $ mergeParents m
1526− liftIO $ writeIORef subscribedRef $! subscribed
1527− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1528− liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1529− return (sln, subscribed)
1530−
1531−cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1532−cleanupMergeSubscribed subscribed = do
1533− parents <- readIORef $ mergeSubscribedParents subscribed
1534− forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1535− -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1536− writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1537−
1538−{-# INLINE subscribeMergeSubscribed #-}
1539−subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO (WeakBagTicket (Subscriber x (DMap k Identity)))
1540−subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
1541−
1542−{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), FanSubscribed x k) #-}
1543−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)
1643+ return $ FanInt
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
1650+ }
1651+
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657+ when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660+ { subscriberPropagate = \m -> do
1661+ liftIO $ writeIORef (_fanInt_occRef self) m
1662+ scheduleIntClear $ _fanInt_occRef self
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664+ FastWeakBag.traverse_ b $ \s ->
1665+ subscriberPropagate s v
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
1669+ subscriberInvalidateHeight s old
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
1673+ subscriberRecalculateHeight s new
1674+ }
1675+ liftIO $ do
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1679+ liftIO $ do
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681+ Nothing -> do
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684+ return b
1685+ Just b -> return b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691+
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698+#ifdef DEBUG_CYCLES
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702+#endif
1703+ }
1704+
1705+
1706+{-# INLINABLE getFanSubscribed #-}
1707+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
15441708getFanSubscribed k f sub = do
15451709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15461710 case mSubscribed of
1547− Just subscribed -> {-# SCC "hitFan" #-} do
1548− sln <- liftIO $ subscribeFanSubscribed k subscribed sub
1549− return (sln, subscribed)
1711+ Just subscribed -> {-# SCC "hitFan" #-} liftIO $ do
1712+ sln <- subscribeFanSubscribed k subscribed sub
1713+ occ <- readIORef $ fanSubscribedOccurrence subscribed
1714+ return (sln, subscribed, coerce $ DMap.lookup k =<< occ)
15501715 Nothing -> {-# SCC "missFan" #-} do
15511716 subscribedRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribedRef not yet initialized"
15521717 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
15531718 s <- liftIO $ newSubscriberFan subscribedUnsafe
1554− subscription <- subscribe (fanParent f) s
1719+ (subscription, parentOcc) <- subscribeAndRead (fanParent f) s
15551720 weakSelf <- liftIO $ newIORef $ error "getFanSubscribed: weakSelf not yet initialized"
15561721 (subsForK, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupFanSubscribed
15571722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723+ occRef <- liftIO $ newIORef parentOcc
1724+ when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15581728 let subscribed = FanSubscribed
15591729 { fanSubscribedCachedSubscribed = fanSubscribed f
1730+ , fanSubscribedOccurrence = occRef
15601731 , fanSubscribedParent = subscription
15611732 , fanSubscribedSubscribers = subscribersRef
15621733#ifdef DEBUG_NODEIDS
1563− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15641735#endif
15651736 }
15661737 let !self = (k, subscribed)
@@ -1568,9 +1739,9 @@ getFanSubscribed k f sub = do
15681739 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug self "FanSubscribed"
15691740 liftIO $ writeIORef subscribedRef $! subscribed
15701741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1571− return (slnForSub, subscribed)
1742+ return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15721743
1573−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15741745cleanupFanSubscribed (k, subscribed) = do
15751746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15761747 let reducedSubscribers = DMap.delete k subscribers
@@ -1582,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15821753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15831754
15841755{-# INLINE subscribeFanSubscribed #-}
1585−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
15861757subscribeFanSubscribed k subscribed sub = do
15871758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15881759 case DMap.lookup k subscribers of
@@ -1590,18 +1761,19 @@ subscribeFanSubscribed k subscribed sub = do
15901761 let !self = (k, subscribed)
15911762 weakSelf <- newIORef =<< mkWeakPtrWithDebug self "FanSubscribed"
15921763 (list, sln) <- WeakBag.singleton sub weakSelf cleanupFanSubscribed
1593− writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeEventSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
1764+ writeIORef (fanSubscribedSubscribers subscribed) $! DMap.insertWith (error "subscribeFanSubscribed: key that we just failed to find is present - should be impossible") k (FanSubscribedChildren list self weakSelf) subscribers
15941765 return sln
15951766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
15961767
1597−{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), SwitchSubscribed x a) #-}
1598−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)
1768+{-# INLINABLE getSwitchSubscribed #-}
1769+getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
15991770getSwitchSubscribed s sub = do
16001771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
16011772 case mSubscribed of
1602− Just subscribed -> {-# SCC "hitSwitch" #-} do
1603− sln <- liftIO $ subscribeSwitchSubscribed subscribed sub
1604− return (sln, subscribed)
1773+ Just subscribed -> {-# SCC "hitSwitch" #-} liftIO $ do
1774+ sln <- subscribeSwitchSubscribed subscribed sub
1775+ occ <- readIORef $ switchSubscribedOccurrence subscribed
1776+ return (sln, subscribed, occ)
16051777 Nothing -> {-# SCC "missSwitch" #-} do
16061778 subscribedRef <- liftIO $ newIORef $ error "getSwitchSubscribed: subscribed has not yet been created"
16071779 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
@@ -1612,14 +1784,16 @@ getSwitchSubscribed s sub = do
16121784 parentsRef <- liftIO $ newIORef [] --TODO: This should be unnecessary, because it will always be filled with just the single parent behavior
16131785 holdInits <- getDeferralQueue
16141786 e <- liftIO $ runBehaviorM (readBehaviorTracked (switchParent s)) (Just (wi, parentsRef)) holdInits
1615− subscription@(EventSubscription _ subd) <- subscribe e mySub
1616− parentOcc <- liftIO $ readEventSubscribed subd
1787+ (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead e mySub
1788+ heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
16171789 subscriptionRef <- liftIO $ newIORef subscription
16181790 occRef <- liftIO $ newIORef parentOcc
16191791 when (isJust parentOcc) $ scheduleClear occRef
1620− heightRef <- liftIO $ newIORef =<< getEventSubscribedHeight subd
16211792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16221793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16231797 let !subscribed = SwitchSubscribed
16241798 { switchSubscribedCachedSubscribed = switchSubscribed s
16251799 , switchSubscribedOccurrence = occRef
@@ -1632,13 +1806,13 @@ getSwitchSubscribed s sub = do
16321806 , switchSubscribedCurrentParent = subscriptionRef
16331807 , switchSubscribedWeakSelf = weakSelf
16341808#ifdef DEBUG_NODEIDS
1635− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16361810#endif
16371811 }
16381812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
16391813 liftIO $ writeIORef subscribedRef $! subscribed
16401814 liftIO $ writeIORef (switchSubscribed s) $ Just subscribed
1641− return (slnForSub, subscribed)
1815+ return (slnForSub, subscribed, parentOcc)
16421816
16431817cleanupSwitchSubscribed :: SwitchSubscribed x a -> IO ()
16441818cleanupSwitchSubscribed subscribed = do
@@ -1647,23 +1821,23 @@ cleanupSwitchSubscribed subscribed = do
16471821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
16481822
16491823{-# INLINE subscribeSwitchSubscribed #-}
1650−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1824+subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16511825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
16521826
1653−{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a) #-}
1654−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)
1827+{-# INLINABLE getCoincidenceSubscribed #-}
1828+getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
16551829getCoincidenceSubscribed c sub = do
16561830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
16571831 case mSubscribed of
1658− Just subscribed -> {-# SCC "hitCoincidence" #-} do
1659− sln <- liftIO $ subscribeCoincidenceSubscribed subscribed sub
1660− return (sln, subscribed)
1832+ Just subscribed -> {-# SCC "hitCoincidence" #-} liftIO $ do
1833+ sln <- subscribeCoincidenceSubscribed subscribed sub
1834+ occ <- readIORef $ coincidenceSubscribedOccurrence subscribed
1835+ return (sln, subscribed, occ)
16611836 Nothing -> {-# SCC "missCoincidence" #-} do
16621837 subscribedRef <- liftIO $ newIORef $ error "getCoincidenceSubscribed: subscribed has not yet been created"
16631838 subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
16641839 subOuter <- liftIO $ newSubscriberCoincidenceOuter subscribedUnsafe
1665− outerSubscription@(EventSubscription _ outerSubd) <- subscribe (coincidenceParent c) subOuter
1666− outerOcc <- liftIO $ readEventSubscribed outerSubd
1840+ (outerSubscription@(EventSubscription _ outerSubd), outerOcc) <- subscribeAndRead (coincidenceParent c) subOuter
16671841 outerHeight <- liftIO $ getEventSubscribedHeight outerSubd
16681842 (occ, height, mInnerSubd) <- case outerOcc of
16691843 Nothing -> return (Nothing, outerHeight, Nothing)
@@ -1677,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16771851 scheduleClear innerSubdRef
16781852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16791853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16801857 let subscribed = CoincidenceSubscribed
16811858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16821859 , coincidenceSubscribedOccurrence = occRef
@@ -1687,13 +1864,13 @@ getCoincidenceSubscribed c sub = do
16871864 , coincidenceSubscribedInnerParent = innerSubdRef
16881865 , coincidenceSubscribedWeakSelf = weakSelf
16891866#ifdef DEBUG_NODEIDS
1690− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16911868#endif
16921869 }
16931870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
16941871 liftIO $ writeIORef subscribedRef $! subscribed
16951872 liftIO $ writeIORef (coincidenceSubscribed c) $ Just subscribed
1696− return (slnForSub, subscribed)
1873+ return (slnForSub, subscribed, occ)
16971874
16981875cleanupCoincidenceSubscribed :: CoincidenceSubscribed x a -> IO ()
16991876cleanupCoincidenceSubscribed subscribed = do
@@ -1701,146 +1878,535 @@ cleanupCoincidenceSubscribed subscribed = do
17011878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
17021879
17031880{-# INLINE subscribeCoincidenceSubscribed #-}
1704−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1881+subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
17051882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
17061883
1707−{-# INLINE merge #-}
1708−merge :: GCompare k => Dynamic x R.PatchDMap (DMap k (Event x)) -> Event x (DMap k Identity)
1709−merge m = eventMerge $ Merge
1710− { mergeParents = m
1711− , 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))
17122015 }
17132016
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
2018+invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2019+
2020+invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021+invalidateMergeHeight' heightRef sub = do
2022+ oldHeight <- readIORef heightRef
2023+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024+ when (oldHeight /= invalidHeight) $ do
2025+ writeIORef heightRef $! invalidHeight
2026+ subscriberInvalidateHeight sub oldHeight
2027+
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
2029+revalidateMergeHeight m = do
2030+ currentHeight <- readIORef $ _merge_heightRef m
2031+
2032+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033+ when (currentHeight == invalidHeight) $ do
2034+ heights <- readIORef $ _merge_heightBagRef m
2035+ parents <- readIORef $ _merge_parentsRef m
2036+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037+ case heightBagSize heights `compare` DMap.size parents of
2038+ LT -> return ()
2039+ EQ -> do
2040+ let height = succHeight $ heightBagMax heights
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042+ writeIORef (_merge_heightRef m) $! height
2043+ subscriberRecalculateHeight (_merge_sub m) height
2044+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2045+
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047+scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048+ vals <- liftIO $ readIORef $ _merge_accumRef m
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052+ --TODO: Assert that m is not empty
2053+ subscriberPropagate (_merge_sub m) vals
2054+
2055+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056+checkCycle subscribed = liftIO $ do
2057+ height <- readIORef (eventSubscribedHeightRef subscribed)
2058+
2059+ -- currentHeight <- getCurrentHeight
2060+ -- when (height <= currentHeight) $ if height /= invalidHeight
2061+ -- then do
2062+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2064+ -- else liftIO $
2065+ when (height == invalidHeight) $
2066+#ifdef DEBUG_CYCLES
2067+ do
2068+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070+ throwIO (EventLoopException stacks)
2071+#else
2072+ throwIO EventLoopException
2073+#endif
2074+
2075+
2076+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077+mergeSubscriber subscribed m getKey = Subscriber
2078+ { subscriberPropagate = \a -> do
2079+ oldM <- liftIO $ readIORef $ _merge_accumRef m
2080+ k <- getKey
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083+ liftIO $ writeIORef (_merge_accumRef m) $! newM
2084+ when (DMap.null oldM) $ do -- Only schedule the firing once
2085+ height <- liftIO $ readIORef $ _merge_heightRef m
2086+ checkCycle subscribed
2087+
2088+ scheduleMergeSelf m height
2089+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090+ modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091+ invalidateMergeHeight m
2092+ , subscriberRecalculateHeight = \new -> do
2093+ modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094+ revalidateMergeHeight m
2095+ }
2096+
2097+--TODO: Be able to run as much of this as possible promptly
2098+updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099+updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100+ where updateMe = do
2101+ oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103+ liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104+ return subscriptionsToKill
2105+
2106+{-# INLINE mergeGCheap' #-}
2107+mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108+ => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109+mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110+ initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111+ accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112+ heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113+ heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114+ parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116+
2117+ let subscribed = EventSubscribed
2118+ { eventSubscribedHeightRef = heightRef
2119+ , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120+#ifdef DEBUG_CYCLES
2121+ , eventSubscribedGetParents = do
2122+ let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123+ fmap getParent' . DMap.toList <$> readIORef parentsRef
2124+ , eventSubscribedHasOwnHeightRef = False
2125+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126+#endif
2127+ }
2128+
2129+ m = Merge
2130+ { _merge_parentsRef = parentsRef
2131+ , _merge_heightBagRef = heightBagRef
2132+ , _merge_heightRef = heightRef
2133+ , _merge_sub = sub
2134+ , _merge_accumRef = accumRef
2135+ }
2136+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
2137+ let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138+ myHeight = if invalidHeight `elem` heights
2139+ then invalidHeight
2140+ else succHeight $ heightBagMax myHeightBag
2141+ currentHeight <- getCurrentHeight
2142+ let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2143+ then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144+ else (Nothing, dm)
2145+ unless (DMap.null accum) $ scheduleMergeSelf m myHeight
2146+ liftIO $ writeIORef accumRef $! accum
2147+ liftIO $ writeIORef heightRef $! myHeight
2148+ liftIO $ writeIORef heightBagRef $! myHeightBag
2149+ liftIO $ writeIORef parentsRef $! initialParentState
2150+ defer $ SomeMergeInit $ do
2151+ let changeSubscriber = Subscriber
2152+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153+ tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154+ defer $ updateMerge subscribed m updateFunc a
2155+ , subscriberInvalidateHeight = \_ -> return ()
2156+ , subscriberRecalculateHeight = \_ -> return ()
2157+ }
2158+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159+ forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
2160+ -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2161+ -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162+ -- its subscription.
2163+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2164+ let unsubscribeAll = destroy =<< readIORef parentsRef
2165+
2166+ return (EventSubscription unsubscribeAll subscribed, occ)
2167+
2168+
2169+mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170+mergeInt = cacheEvent . mergeIntCheap
2171+
2172+{-# INLINABLE mergeIntCheap #-}
2173+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174+mergeIntCheap d = Event $ \sub -> do
2175+ initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176+ accum <- liftIO $ FastMutableIntMap.newEmpty
2177+ heightRef <- liftIO $ newIORef zeroHeight
2178+ heightBagRef <- liftIO $ newIORef heightBagEmpty
2179+ parents <- liftIO $ FastMutableIntMap.newEmpty
2180+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2181+ let subscribed = EventSubscribed
2182+ { eventSubscribedHeightRef = heightRef
2183+ , eventSubscribedRetained = toAny (parents, changeSubdRef)
2184+#ifdef DEBUG_CYCLES
2185+ , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186+ , eventSubscribedHasOwnHeightRef = False
2187+ , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2188+#endif
2189+ }
2190+ let scheduleSelf = do
2191+ height <- liftIO $ readIORef $ heightRef
2192+ scheduleMerge' height heightRef $ do
2193+ vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194+ subscriberPropagate sub vals
2195+ invalidateMyHeight = invalidateMergeHeight' heightRef sub
2196+ recalculateMyHeight = do
2197+ currentHeight <- readIORef heightRef
2198+ when (currentHeight == invalidHeight) $ do --TODO: This will almost always be true; can we get rid of this check and just proceed to the next one always?
2199+ heights <- readIORef heightBagRef
2200+ numParents <- FastMutableIntMap.size parents
2201+ case heightBagSize heights `compare` numParents of
2202+ LT -> return ()
2203+ EQ -> do
2204+ let height = succHeight $ heightBagMax heights
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2206+ writeIORef heightRef $! height
2207+ subscriberRecalculateHeight sub height
2208+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209+ mySubscriber k = Subscriber
2210+ { subscriberPropagate = \a -> do
2211+ checkCycle subscribed
2212+
2213+ wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214+ liftIO $ FastMutableIntMap.insert accum k a
2215+ when wasEmpty scheduleSelf
2216+ , subscriberInvalidateHeight = \old -> do
2217+ modifyIORef' heightBagRef $ heightBagRemove old
2218+ invalidateMyHeight
2219+ , subscriberRecalculateHeight = \new -> do
2220+ modifyIORef' heightBagRef $ heightBagAdd new
2221+ recalculateMyHeight
2222+ }
2223+ forM_ (IntMap.toList initialParents) $ \(k, p) -> do
2224+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead p $ mySubscriber k
2225+ liftIO $ do
2226+ forM_ parentOcc $ FastMutableIntMap.insert accum k
2227+ FastMutableIntMap.insert parents k subscription
2228+ height <- getEventSubscribedHeight parentSubd
2229+ if height == invalidHeight
2230+ then writeIORef heightRef invalidHeight
2231+ else do
2232+ modifyIORef' heightBagRef $ heightBagAdd height
2233+ modifyIORef' heightRef $ \oldHeight ->
2234+ if oldHeight == invalidHeight
2235+ then invalidHeight
2236+ else max (succHeight height) oldHeight
2237+ myHeight <- liftIO $ readIORef heightRef
2238+ currentHeight <- getCurrentHeight
2239+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2240+ occ <- if currentHeight >= myHeight -- If we should have fired by now
2241+ then if isEmpty
2242+ then return Nothing
2243+ else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244+ else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245+ return Nothing
2246+ defer $ SomeMergeInit $ do
2247+ let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2248+ where
2249+ u = do
2250+ let f k newParent = do
2251+ subscription@(EventSubscription _ subd) <- subscribe newParent $ mySubscriber k
2252+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
2253+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
2254+ return subscription
2255+ newSubscriptions <- FastMutableIntMap.traverseIntMapPatchWithKey f a
2256+ oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257+ liftIO $ for_ oldParents $ \oldParent -> do
2258+ oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259+
2260+ print ("updateMe", oldParentHeight)
2261+ modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262+ return $ IntMap.elems oldParents
2263+ let changeSubscriber = Subscriber
2264+ { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266+ defer $ updateMe a
2267+ , subscriberInvalidateHeight = \_ -> return ()
2268+ , subscriberRecalculateHeight = \_ -> return ()
2269+ }
2270+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2271+ forM_ change $ \c -> defer $ updateMe c
2272+ -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273+ -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274+ -- its subscription.
2275+ liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2276+ let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277+
2278+
2279+ return (EventSubscription unsubscribeAll subscribed, occ)
2280+
17142281newtype 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) }
17152283
1716−fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
1717−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
17182287 let f = Fan
17192288 { fanParent = e
1720− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
17212290 }
1722− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
17232292
1724−runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1725−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
17262295 holdInits <- liftIO $ readIORef holdInitRef
2296+ dynInits <- liftIO $ readIORef dynInitRef
17272297 mergeInits <- liftIO $ readIORef mergeInitRef
1728− unless (null holdInits && null mergeInits) $ do
2298+ unless (null holdInits && null dynInits && null mergeInits) $ do
17292299 liftIO $ writeIORef holdInitRef []
2300+ liftIO $ writeIORef dynInitRef []
17302301 liftIO $ writeIORef mergeInitRef []
17312302 mapM_ initHold holdInits
1732− mapM_ initMerge mergeInits
1733− runHoldInits holdInitRef mergeInitRef
2303+ mapM_ initDyn dynInits
2304+ mapM_ unSomeMergeInit mergeInits
2305+ runHoldInits holdInitRef dynInitRef mergeInitRef
17342306
1735−initHold :: SomeHoldInit x -> EventM x ()
2307+initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
17362308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
17372309
1738−initMerge :: SomeMergeInit x -> EventM x ()
1739−initMerge (SomeMergeInit subscribed changed) = do
1740− changeSub <- liftIO $ newSubscriberMergeChange subscribed
1741− EventSubscription _ changeSubd <- subscribe changed changeSub
1742− change <- liftIO $ readEventSubscribed changeSubd
1743− forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1744− liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2310+initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311+initDyn (SomeDynInit d) = void $ getDynHold d
17452312
1746−-- | Run an event action outside of a frame
1747−runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1748−runFrame a = SpiderHost $ ask >>= \spiderEnv -> lift $ do
1749− -- 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
1750− pendingCleanups <- atomicModifyIORef (_spiderEnv_cleanups spiderEnv) $ \x -> ([], x)
1751− {-# SCC "cleanups" #-} sequence_ pendingCleanups
2313+newEventEnv :: IO (EventEnv x)
2314+newEventEnv = do
17522315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
17532316 holdInitRef <- newIORef []
2317+ dynInitRef <- newIORef []
17542318 mergeUpdateRef <- newIORef []
17552319 mergeInitRef <- newIORef []
17562320 heightRef <- newIORef zeroHeight
17572321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
17582323 toClearRootRef <- newIORef []
17592324 coincidenceInfosRef <- newIORef []
1760− delayedRef <- liftIO $ newIORef IntMap.empty
1761− 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)
17622346 let go = do
17632347 result <- a
1764− 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
17652349 return result
1766− result <- runEventM go env
1767− toClear <- readIORef toClearRef
1768− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1769− toClearRoot <- readIORef toClearRootRef
1770− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1771− 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
17722358 toReconnectRef <- newIORef []
1773− coincidenceInfos <- readIORef coincidenceInfosRef
2359+ coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
17742360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
17752361 writeIORef vRef v
1776− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
17772363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1778− mergeUpdates <- readIORef mergeUpdateRef
1779− writeIORef mergeUpdateRef []
1780− let updateMerge :: SomeMergeUpdate x -> IO [SomeEventSubscription x]
1781− updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k (Event x))) m) = do
1782− oldParents <- readIORef $ mergeSubscribedParents m
1783− let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1784− (mOldSubd, newPs) <- case me of
1785− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1786− Just e -> do
1787− s <- liftIO $ newSubscriberMerge k m
1788− subscription@(EventSubscription _ subd) <- subscribe e s
1789− let newParent = MergeSubscribedParent subscription s
1790− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1791− liftIO $ addMergeHeight newParentHeight m
1792− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1793− forM_ mOldSubd $ \oldSubd -> do
1794− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1795− liftIO $ removeMergeHeight oldHeight m
1796− return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1797− (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
1798− writeIORef (mergeSubscribedParents m) $! newParents
1799− return subscriptionsToKill
1800− when debugPropagate $ putStrLn "Updating merges"
1801− mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1802− 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"
18032369 toReconnect <- readIORef toReconnectRef
2370+ clearEventEnv env
18042371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
18052372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
18062373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1807− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
18082375 finalize wi
18092376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
18102377 wi' <- mkWeakPtrWithDebug i "wi'"
18112378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
18122379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1813− writeIORef holdInitRef [] --TODO: Should we reuse this?
1814− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1815− 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
18162383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
18172384 sub <- newSubscriberSwitch subscribed
1818− 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
18192386 {-
18202387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1821− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
18222389 EventRoot _ -> "EventRoot"
18232390 EventNever -> "EventNever"
18242391 _ -> "something else"
18252392 -}
18262393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1827− return $ SomeEventSubscription oldSubscription
1828− forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
1829− forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2394+ return oldSubscription
2395+ liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
2396+ liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
18302397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
18312398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
18322399 parentHeight <- getEventSubscribedHeight subd'
18332400 myHeight <- readIORef $ switchSubscribedHeight subscribed
18342401 when (parentHeight /= myHeight) $ do
18352402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1836− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1837− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1838− 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
18392405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
18402406 unsubscribe subscription
18412407 mapM_ invalidateCoincidenceHeight mcs
18422408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1843− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2409+ mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
18442410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
18452411 height <- calculateSwitchHeight subscribed
18462412 updateSwitchHeight height subscribed
@@ -1856,10 +2422,12 @@ zeroHeight = Height 0
18562422invalidHeight :: Height
18572423invalidHeight = Height (-1000)
18582424
2425+#ifdef DEBUG_CYCLES
18592426-- | An invalid height that is currently being traversed, e.g. by walkInvalidHeightParents
18602427{-# INLINE invalidHeightBeingTraversed #-}
18612428invalidHeightBeingTraversed :: Height
18622429invalidHeightBeingTraversed = Height (-1001)
2430+#endif
18632431
18642432{-# INLINE succHeight #-}
18652433succHeight :: Height -> Height
@@ -1868,50 +2436,12 @@ succHeight h@(Height a) =
18682436 then invalidHeight
18692437 else Height $ succ a
18702438
1871−removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1872−removeMergeHeight oldParentHeight subscribed = do
1873− when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1874− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1875− let newHeights = heightBagRemove oldParentHeight oldHeights
1876− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1877−
1878−invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1879−invalidateMergeHeight subscribed = do
1880− oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1881− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1882− when (oldHeight /= invalidHeight) $ do
1883− writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1884− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1885−
1886−addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1887−addMergeHeight newParentHeight subscribed = do
1888− when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1889− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1890− let newHeights = heightBagAdd newParentHeight oldHeights
1891− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1892−
1893−revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1894−revalidateMergeHeight subscribed = do
1895− currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1896− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1897− heights <- readIORef $ mergeSubscribedHeightBag subscribed
1898− parents <- readIORef $ mergeSubscribedParents subscribed
1899− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1900− case heightBagSize heights `compare` DMap.size parents of
1901− LT -> return ()
1902− EQ -> do
1903− let height = succHeight $ heightBagMax heights
1904− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1905− writeIORef (mergeSubscribedHeight subscribed) $! height
1906− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1907− GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1908−
19092439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19102440invalidateCoincidenceHeight subscribed = do
19112441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
19122442 when (oldHeight /= invalidHeight) $ do
19132443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1914− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
19152445
19162446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
19172447updateSwitchHeight new subscribed = do
@@ -1919,7 +2449,7 @@ updateSwitchHeight new subscribed = do
19192449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19202450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19212451 writeIORef (switchSubscribedHeight subscribed) $! new
1922− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
19232453
19242454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19252455recalculateCoincidenceHeight subscribed = do
@@ -1928,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
19282458 height <- calculateCoincidenceHeight subscribed
19292459 when (height /= invalidHeight) $ do
19302460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1931− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
19322462
19332463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
19342464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -1967,178 +2497,329 @@ invalidate toReconnectRef wis = do
19672497-- Reflex integration
19682498--------------------------------------------------------------------------------
19692499
2500+-- | Designates the default, global Spider timeline
2501+data SpiderTimeline x
2502+type role SpiderTimeline nominal
2503+
19702504-- | The default, global Spider environment
1971−type Spider = SpiderEnv Global
2505+type Spider = SpiderTimeline Global
19722506
1973−-- | Designates the default, global Spider timeline
1974−data Global
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508+ {-# INLINABLE sample #-}
2509+ sample (SpiderBehavior b) = readBehaviorUntracked b
19752510
1976−{-# NOINLINE globalSpiderEnv #-}
1977−globalSpiderEnv :: SpiderEnv Global
1978−globalSpiderEnv = unsafePerformIO unsafeNewSpiderEnv
2511+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512+ {-# INLINABLE hold #-}
2513+ hold = holdSpiderEventM
2514+ {-# INLINABLE holdDyn #-}
2515+ holdDyn = holdDynSpiderEventM
2516+ {-# INLINABLE holdIncremental #-}
2517+ holdIncremental = holdIncrementalSpiderEventM
2518+ {-# INLINABLE buildDynamic #-}
2519+ buildDynamic = buildDynamicSpiderEventM
2520+ {-# INLINABLE headE #-}
2521+ headE = R.slowHeadE
2522+-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2525+
2526+instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527+ {-# INLINABLE sample #-}
2528+ sample = coerce . readBehaviorTracked . unSpiderBehavior
19792529
1980−-- | Stores all global data relevant to a particular Spider timeline; only one
1981−-- value should exist for each type @x@
1982−data SpiderEnv x = SpiderEnv
1983− { _spiderEnv_toUnsubscribe :: !(IORef [SomeEventSubscription x])
1984− , _spiderEnv_lock :: !(MVar ())
1985− , _spiderEnv_cleanups :: !(IORef [IO ()])
1986−#ifdef DEBUG
1987− , _spiderEnv_depth :: !(IORef Int)
2530+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531+ {-# INLINABLE sample #-}
2532+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533+
2534+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535+ {-# INLINABLE hold #-}
2536+ hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537+ {-# INLINABLE holdDyn #-}
2538+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539+ {-# INLINABLE holdIncremental #-}
2540+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541+ {-# INLINABLE buildDynamic #-}
2542+ buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543+ {-# INLINABLE headE #-}
2544+ headE = R.slowHeadE
2545+-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
2549+
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551+ {-# INLINE return #-}
2552+ return = pure
2553+ {-# INLINE (>>=) #-}
2554+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555+ {-# INLINE (>>) #-}
2556+ (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2558+ {-# INLINE fail #-}
2559+ fail _ = error "Dynamic does not support 'fail'"
19882560#endif
1989− }
1990−type role SpiderEnv nominal
19912561
1992−instance GEq SpiderEnv where
1993− a `geq` b = if _spiderEnv_lock a == _spiderEnv_lock b
1994− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderEnv can't have two different 'x' arguments
1995− else Nothing
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
2591+
2592+holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594+
2595+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597+
2598+buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599+buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600+
2601+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602+ {-# INLINABLE hold #-}
2603+ hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604+ {-# INLINABLE holdDyn #-}
2605+ holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606+ {-# INLINABLE holdIncremental #-}
2607+ holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608+ {-# INLINABLE buildDynamic #-}
2609+ buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610+ {-# INLINABLE headE #-}
2611+ headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
2615+
2616+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618+
2619+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620+ {-# INLINABLE hold #-}
2621+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622+ {-# INLINABLE holdDyn #-}
2623+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624+ {-# INLINABLE holdIncremental #-}
2625+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626+ {-# INLINABLE buildDynamic #-}
2627+ buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628+ {-# INLINABLE headE #-}
2629+ headE = R.slowHeadE
2630+-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2633+
2634+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635+ {-# INLINABLE sample #-}
2636+ sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637+
2638+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639+ {-# INLINABLE sample #-}
2640+ sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
19962641
1997−unsafeNewSpiderEnv :: forall x. IO (SpiderEnv x)
1998−unsafeNewSpiderEnv = do
1999− toUnsubscribe <- newIORef []
2642+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643+ {-# INLINABLE hold #-}
2644+ hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645+ {-# INLINABLE holdDyn #-}
2646+ holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647+ {-# INLINABLE holdIncremental #-}
2648+ holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649+ {-# INLINABLE buildDynamic #-}
2650+ buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651+ {-# INLINABLE headE #-}
2652+ headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655+
2656+--------------------------------------------------------------------------------
2657+-- Deprecated items
2658+--------------------------------------------------------------------------------
2659+
2660+-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661+{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662+type SpiderEnv = SpiderTimeline
2663+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664+ {-# INLINABLE subscribeEvent #-}
2665+ subscribeEvent e = SpiderHostFrame $ do
2666+ --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667+ val <- liftIO $ newIORef Nothing
2668+ subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669+ { subscriberPropagate = \a -> do
2670+ liftIO $ writeIORef val $ Just a
2671+ scheduleClear val
2672+ , subscriberInvalidateHeight = \_ -> return ()
2673+ , subscriberRecalculateHeight = \_ -> return ()
2674+ }
2675+ return $ SpiderEventHandle
2676+ { spiderEventHandleSubscription = subscription
2677+ , spiderEventHandleValue = val
2678+ }
2679+
2680+instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681+ type EventTrigger (SpiderTimeline x) = RootTrigger x
2682+ type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683+ type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684+
2685+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686+ {-# NOINLINE readEvent #-}
2687+ readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688+ result <- readIORef $ spiderEventHandleValue h
2689+ touch h
2690+ return result
2691+
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693+ newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694+ newFanEventWithTrigger f = SpiderHost $ do
2695+ es <- newFanEventWithTriggerIO f
2696+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697+
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701+ es <- newFanEventWithTriggerIO f
2702+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703+
2704+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705+ {-# INLINABLE subscribeEvent #-}
2706+ subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
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
20002715 lock <- newMVar ()
2001− cleanups <- newIORef []
2716+ env <- newEventEnv
20022717#ifdef DEBUG
20032718 depthRef <- newIORef 0
20042719#endif
2005− return $ SpiderEnv
2006− { _spiderEnv_toUnsubscribe = toUnsubscribe
2007− , _spiderEnv_lock = lock
2008− , _spiderEnv_cleanups = cleanups
2720+ return $ STE $ SpiderTimelineEnv
2721+ { _spiderTimeline_lock = lock
2722+ , _spiderTimeline_eventEnv = env
20092723#ifdef DEBUG
2010− , _spiderEnv_depth = depthRef
2724+ , _spiderTimeline_depth = depthRef
20112725#endif
20122726 }
20132727
2014−-- | Create a new SpiderEnv
2015−newSpiderEnv :: IO (Some SpiderEnv)
2016−newSpiderEnv = Some.This <$> unsafeNewSpiderEnv
2728+-- | Create a new SpiderTimelineEnv
2729+newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
20172731
2018−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2732+data LocalSpiderTimeline (x :: Type) s
20192733
2020−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2734+instance Reifies s (SpiderTimelineEnv x) =>
2735+ HasSpiderTimeline (LocalSpiderTimeline x s) where
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
20212737
2022−instance R.Reflex (SpiderEnv x) where
2023− newtype Behavior (SpiderEnv x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2024− newtype Event (SpiderEnv x) a = SpiderEvent { unSpiderEvent :: Event x a }
2025− newtype Dynamic (SpiderEnv x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x Identity a } deriving (Functor, Applicative, Monad)
2026− newtype Incremental (SpiderEnv x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic x p a }
2027− type PullM (SpiderEnv x) = SpiderPullM x
2028− type PushM (SpiderEnv x) = SpiderPushM x
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
20292764 {-# INLINABLE never #-}
20302765 never = SpiderEvent eventNever
20312766 {-# INLINABLE constant #-}
2032− constant = SpiderBehavior . BehaviorConst
2033− {-# INLINABLE push #-}
2767+ constant = SpiderBehavior . behaviorConst
2768+ {-# INLINE push #-}
20342769 push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770+ {-# INLINE pushCheap #-}
2771+ pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
20352772 {-# INLINABLE pull #-}
20362773 pull = SpiderBehavior . pull . coerce
2037− {-# INLINABLE merge #-}
2038− merge = SpiderEvent . merge . DynamicConst . (unsafeCoerce :: DMap k (R.Event (SpiderEnv x)) -> DMap k (Event x))
2039− {-# INLINABLE fan #-}
2040− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
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
20412783 {-# INLINABLE switch #-}
2042− switch = SpiderEvent . switch . (unsafeCoerce :: Behavior x (R.Event (SpiderEnv x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2784+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
20432785 {-# INLINABLE coincidence #-}
2044− coincidence = SpiderEvent . coincidence . (unsafeCoerce :: Event x (R.Event (SpiderEnv x) a) -> Event x (Event x a)) . unSpiderEvent
2786+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
20452787 {-# INLINABLE current #-}
2046− current = SpiderBehavior . current . unSpiderDynamic
2788+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
20472789 {-# INLINABLE updated #-}
2048− updated = SpiderEvent . fmap runIdentity . updated . unSpiderDynamic
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
20492791 {-# INLINABLE unsafeBuildDynamic #-}
2050− unsafeBuildDynamic readV0 v' = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (coerce readV0) $ addIdentity $ unSpiderEvent v'
2792+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
20512793 {-# INLINABLE unsafeBuildIncremental #-}
2052− unsafeBuildIncremental readV0 dv = SpiderIncremental $ DynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2053− {-# INLINABLE mergeIncremental #-}
2054− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x R.PatchDMap (DMap k (R.Event (SpiderEnv x))) -> Dynamic x R.PatchDMap (DMap k (Event x))) . unSpiderIncremental
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
20552799 {-# INLINABLE currentIncremental #-}
2056− currentIncremental = SpiderBehavior . current . unSpiderIncremental
2800+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
20572801 {-# INLINABLE updatedIncremental #-}
2058− updatedIncremental = SpiderEvent . updated . unSpiderIncremental
2802+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
20592803 {-# INLINABLE incrementalToDynamic #-}
2060− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ DynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ current i) $ flip push (updated i) $ \p -> do
2061− c <- readBehaviorUntracked $ current i
2062− return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2063−
2064−instance R.MonadSample (SpiderEnv x) (EventM x) where
2065− {-# INLINABLE sample #-}
2066− sample (SpiderBehavior b) = readBehaviorUntracked b
2067−
2068−instance R.MonadHold (SpiderEnv x) (EventM x) where
2069− {-# INLINABLE hold #-}
2070− hold = holdSpiderEventM
2071− {-# INLINABLE holdDyn #-}
2072− holdDyn = holdDynSpiderEventM
2073− {-# INLINABLE holdIncremental #-}
2074− holdIncremental = holdIncrementalSpiderEventM
2075−
2076−holdSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Behavior (SpiderEnv x) a)
2077−holdSpiderEventM v0 e = fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2078−
2079−holdDynSpiderEventM :: a -> R.Event (SpiderEnv x) a -> EventM x (R.Dynamic (SpiderEnv x) a)
2080−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2081−
2082−holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderEnv x) (p a) -> EventM x (R.Incremental (SpiderEnv x) p a)
2083−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . DynamicHold) $ hold v0 $ unSpiderEvent e
2084−
2085−instance R.MonadHold (SpiderEnv x) (SpiderHost x) where
2086− {-# INLINABLE hold #-}
2087− hold v0 e = R.runHostFrame $ R.hold v0 e
2088− {-# INLINABLE holdDyn #-}
2089− holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2090− {-# INLINABLE holdIncremental #-}
2091− holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2092−
2093−instance R.MonadSample (SpiderEnv x) (SpiderHost x) where
2094− {-# INLINABLE sample #-}
2095− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2096−
2097−instance R.MonadSample (SpiderEnv x) (SpiderPullM x) where
2098− {-# INLINABLE sample #-}
2099− sample = coerce . readBehaviorTracked . unSpiderBehavior
2100−
2101−instance R.MonadSample (SpiderEnv x) (SpiderPushM x) where
2102− {-# INLINABLE sample #-}
2103− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2104−
2105−instance R.MonadHold (SpiderEnv x) (SpiderPushM x) where
2106− {-# INLINABLE hold #-}
2107− hold v0 e = R.current <$> R.holdDyn v0 e
2108− {-# INLINABLE holdDyn #-}
2109− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity e
2110− {-# INLINABLE holdIncremental #-}
2111− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . DynamicHold <$> hold v0 e
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))
21122815
21132816data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2114−newtype SpiderEventHandle x a = SpiderEventHandle { unSpiderEventHandle :: EventSubscription x a }
21152817
2116−emptySubscriber :: Subscriber x a
2117−emptySubscriber = Subscriber
2118− { subscriberPropagate = \_ -> return ()
2119− , subscriberInvalidateHeight = \_ -> return ()
2120− , subscriberRecalculateHeight = \_ -> return ()
2818+data SpiderEventHandle x a = SpiderEventHandle
2819+ { spiderEventHandleSubscription :: EventSubscription x
2820+ , spiderEventHandleValue :: IORef (Maybe a)
21212821 }
21222822
2123−instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHostFrame x) where
2124− {-# INLINABLE subscribeEvent #-}
2125− subscribeEvent e = SpiderHostFrame $ do
2126− subscription <- subscribe (unSpiderEvent e) emptySubscriber --TODO: Unsubscribe eventually (manually and/or with weak ref)
2127− return $ SpiderEventHandle subscription
2128−
2129−instance R.ReflexHost (SpiderEnv x) where
2130− type EventTrigger (SpiderEnv x) = RootTrigger x
2131− type EventHandle (SpiderEnv x) = SpiderEventHandle x
2132− type HostFrame (SpiderEnv x) = SpiderHostFrame x
2133−
2134−instance R.MonadReadEvent (SpiderEnv x) (ReadPhase x) where
2135− {-# INLINABLE readEvent #-}
2136− readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2137− let EventSubscription sln subscribed = unSpiderEventHandle h
2138− result <- readEventSubscribed subscribed
2139− touch sln
2140− return result
2141−
21422823instance MonadRef (EventM x) where
21432824 type Ref (EventM x) = Ref IO
21442825 {-# INLINABLE newRef #-}
@@ -2153,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
21532834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
21542835
21552836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2156−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)
21572838
21582839instance Monad (SpiderHost x) where
21592840 {-# INLINABLE (>>=) #-}
@@ -2162,15 +2843,27 @@ instance Monad (SpiderHost x) where
21622843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
21632844 {-# INLINABLE return #-}
21642845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
21652847 {-# INLINABLE fail #-}
2166− fail s = SpiderHost $ fail s
2848+ fail = MonadFail.fail
2849+#endif
2850+
2851+instance MonadFail (SpiderHost x) where
2852+ {-# INLINABLE fail #-}
2853+ fail s = SpiderHost $ MonadFail.fail s
21672854
21682855-- | Run an action affecting the global Spider timeline; this will be guarded by
21692856-- a mutex for that timeline
21702857runSpiderHost :: SpiderHost Global a -> IO a
2171−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
21722864
2173−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)
21742867
21752868instance Monad (SpiderHostFrame x) where
21762869 {-# INLINABLE (>>=) #-}
@@ -2179,30 +2872,21 @@ instance Monad (SpiderHostFrame x) where
21792872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
21802873 {-# INLINABLE return #-}
21812874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
21822876 {-# INLINABLE fail #-}
21832877 fail s = SpiderHostFrame $ fail s
2878+#endif
21842879
2185−instance R.MonadSample (SpiderEnv x) (SpiderHostFrame x) where
2186− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2187−
2188−addIdentity :: Event x a -> Event x (Identity a)
2189−--addIdentity = fmap Identity
2190−addIdentity = unsafeCoerce
2191−
2192−instance R.MonadHold (SpiderEnv x) (SpiderHostFrame x) where
2193− {-# INLINABLE hold #-}
2194− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . BehaviorHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2195− {-# INLINABLE holdDyn #-}
2196− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . DynamicHoldIdentity) $ hold v0 $ addIdentity $ unSpiderEvent e
2197− {-# INLINABLE holdIncremental #-}
2198− 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 ()
21992883
2200−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)
22012885newEventWithTriggerIO f = do
22022886 es <- newFanEventWithTriggerIO $ \Refl -> f
22032887 return $ select es Refl
22042888
2205−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)
22062890newFanEventWithTriggerIO f = do
22072891 occRef <- newIORef DMap.empty
22082892 subscribedRef <- newIORef DMap.empty
@@ -2213,46 +2897,8 @@ newFanEventWithTriggerIO f = do
22132897 }
22142898 return $ EventSelector $ \k -> eventRoot k r
22152899
2216−instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHost x) where
2217− newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2218− newFanEventWithTrigger f = SpiderHost $ lift $ do
2219− es <- newFanEventWithTriggerIO f
2220− return $ R.EventSelector $ SpiderEvent . select es
2221−
2222−instance R.MonadReflexCreateTrigger (SpiderEnv x) (SpiderHostFrame x) where
2223− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2224− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2225− es <- newFanEventWithTriggerIO f
2226− return $ R.EventSelector $ SpiderEvent . select es
2227−
2228−instance R.MonadSubscribeEvent (SpiderEnv x) (SpiderHost x) where
2229− {-# INLINABLE subscribeEvent #-}
2230− subscribeEvent = subscribeEventSpiderHost
2231−
2232−subscribeEventSpiderHost :: R.Event (SpiderEnv x) a -> SpiderHost x (R.EventHandle (SpiderEnv x) a)
2233−subscribeEventSpiderHost e = do
2234− subscription <- runFrame $ subscribe (unSpiderEvent e) emptySubscriber --TODO: Unsubscribe eventually (manually and/or with weak ref)
2235− return $ SpiderEventHandle subscription
2236−
22372900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
22382901
2239−instance R.MonadSample (SpiderEnv x) (ReadPhase x) where
2240− {-# INLINABLE sample #-}
2241− sample = ReadPhase . R.sample
2242−
2243−instance R.MonadHold (SpiderEnv x) (ReadPhase x) where
2244− {-# INLINABLE hold #-}
2245− hold v0 e = ReadPhase $ R.hold v0 e
2246− {-# INLINABLE holdDyn #-}
2247− holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2248− {-# INLINABLE holdIncremental #-}
2249− holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2250−
2251−instance R.MonadReflexHost (SpiderEnv x) (SpiderHost x) where
2252− type ReadPhase (SpiderHost x) = ReadPhase x
2253− fireEventsAndRead es (ReadPhase a) = run es a
2254− runHostFrame = runFrame . runSpiderHostFrame
2255−
22562902instance MonadRef (SpiderHost x) where
22572903 type Ref (SpiderHost x) = Ref IO
22582904 newRef = SpiderHost . newRef
@@ -2270,3 +2916,15 @@ instance MonadRef (SpiderHostFrame x) where
22702916
22712917instance MonadAtomicRef (SpiderHostFrame x) where
22722918 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 ()