@@ -9,70 +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 where
30+module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
2431
25−import Control.Applicative
32+#if MIN_VERSION_base(4,10,0)
33+import Control.Applicative (liftA2)
34+#endif
2635import Control.Concurrent
2736import Control.Exception
28−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
37+import Control.Monad hiding (forM, forM_, mapM, mapM_)
2938import Control.Monad.Exception
30−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
39+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
3140import Control.Monad.Primitive
32−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
3344import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
3447import Data.Align
3548import Data.Coerce
36−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
3750import 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
3854import Data.Foldable hiding (concat, elem, sequence_)
39−import Data.Function
40−import Data.Functor.Compose
4155import Data.Functor.Constant
56+import Data.Functor.Misc
4257import Data.Functor.Product
4358import Data.GADT.Compare
4459import Data.IntMap.Strict (IntMap)
4560import qualified Data.IntMap.Strict as IntMap
4661import Data.IORef
47−import Data.List hiding (foldl')
48−import Data.Maybe
49−import Data.Monoid ((<>))
50−import Data.Some (Some)
51−import qualified Data.Some as Some
62+import Data.Kind (Type)
63+import Data.Maybe hiding (mapMaybe)
64+import Data.Monoid (mempty, (<>))
65+import Data.Proxy
5266import Data.These
5367import Data.Traversable
54−import Data.Word
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
5571import GHC.IORef (IORef (..))
5672import GHC.Stack
73+import Reflex.FastWeak
5774import System.IO.Unsafe
5875import System.Mem.Weak
5976import Unsafe.Coerce
6077
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+
6187#ifdef DEBUG_CYCLES
6288import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
6391import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
6492import qualified Data.List.NonEmpty as NonEmpty
65−import Data.Monoid (mempty)
6693import Data.Tree (Forest, Tree (..), drawForest)
67−#endif
94+import Data.List (isPrefixOf)
6895
69−import Data.WeakBag (WeakBag, WeakBagTicket)
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)
70104import qualified Data.WeakBag as WeakBag
105+import qualified Reflex.Class
71106import qualified Reflex.Class as R
72−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
122+
123+#ifdef DEBUG_TRACE_EVENTS
124+withStackOneLine :: (BS8.ByteString -> a) -> a
125+withStackOneLine expr = unsafePerformIO $ do
126+ stack <- currentCallStack
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
73129
74−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
75−import Prelude hiding (any, concat, mapM, mapM_, sequence)
130+#endif
76131
77132debugPropagate :: Bool
78133
@@ -81,31 +136,42 @@ debugInvalidateHeight :: Bool
81136debugInvalidate :: Bool
82137
83138#ifdef DEBUG
84−
85139#define DEBUG_NODEIDS
86140
141+#ifdef DEBUG_TRACE_PROPAGATION
87142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
88146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
89150debugInvalidateHeight = False
151+#endif
90152
153+#ifdef DEBUG_TRACE_INVALIDATION
91154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
92158
93159class HasNodeId a where
94160 getNodeId :: a -> Int
95161
96−instance HasNodeId (Hold x p a) where
97− getNodeId = holdNodeId
162+instance HasNodeId (CacheSubscribed x a) where
163+ getNodeId = _cacheSubscribed_nodeId
164+
165+instance HasNodeId (FanInt x a) where
166+ getNodeId = _fanInt_nodeId
98167
99−instance HasNodeId (PushSubscribed x a b) where
100− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
101170
102171instance HasNodeId (SwitchSubscribed x a) where
103172 getNodeId = switchSubscribedNodeId
104173
105−instance HasNodeId (MergeSubscribed x a) where
106− getNodeId = mergeSubscribedNodeId
107−
108−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
109175 getNodeId = fanSubscribedNodeId
110176
111177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -119,41 +185,16 @@ instance HasNodeId (Pull x a) where
119185
120186{-# INLINE showNodeId #-}
121187showNodeId :: HasNodeId a => a -> String
122−showNodeId = ("#"<>) . show . getNodeId
123−
124−showSubscriberType :: Subscriber x a -> String
125−showSubscriberType = \case
126− SubscriberPush _ _ -> "SubscriberPush"
127− SubscriberMerge _ _ -> "SubscriberMerge"
128− SubscriberFan _ -> "SubscriberFan"
129− SubscriberMergeChange _ -> "SubscriberMergeChange"
130− SubscriberHold _ -> "SubscriberHold"
131− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
132− SubscriberSwitch _ -> "SubscriberSwitch"
133− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
134− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
135− SubscriberHandle -> "SubscriberHandle"
136−
137−showEventType :: Event x a -> String
138−showEventType = \case
139− EventRoot _ _ -> "EventRoot"
140− EventNever -> "EventNever"
141− EventPush _ -> "EventPush"
142− EventMerge _ -> "EventMerge"
143− EventFan _ _ -> "EventFan"
144− EventSwitch _ -> "EventSwitch"
145− EventCoincidence _ -> "EventCoincidence"
146− EventHold _ -> "EventHold"
147− EventDyn _ -> "EventDyn"
148− EventHoldIdentity _ -> "EventHoldIdentity"
149− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
150193
151194#else
152195
153196debugPropagate = False
154−
155197debugInvalidateHeight = False
156−
157198debugInvalidate = False
158199
159200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -161,6 +202,10 @@ debugInvalidate = False
161202showNodeId :: a -> String
162203showNodeId _ = ""
163204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
164209#endif
165210
166211#ifdef DEBUG_NODEIDS
@@ -170,59 +215,237 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
170215
171216newNodeId :: IO Int
172217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
173−
174−{-# NOINLINE unsafeNodeId #-}
175−unsafeNodeId :: a -> Int
176−unsafeNodeId a = unsafePerformIO $ do
177− touch a
178− newNodeId
179218#endif
180219
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+
181234--------------------------------------------------------------------------------
182235-- Event
183236--------------------------------------------------------------------------------
184237
185−newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x a, Maybe a) }
238+newtype Event x a = Event { unEvent :: Subscriber x a -> EventM x (EventSubscription x, Maybe a) }
239+
240+{-# INLINE subscribeAndRead #-}
241+subscribeAndRead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
242+subscribeAndRead = unEvent
243+
244+{-# RULES
245+"cacheEvent/cacheEvent" forall e. cacheEvent (cacheEvent e) = cacheEvent e
246+"cacheEvent/pushCheap" forall f e. pushCheap f (cacheEvent e) = cacheEvent (pushCheap f e)
247+"hold/cacheEvent" forall f e. hold f (cacheEvent e) = hold f e
248+ #-}
249+
250+-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251+-- caching; if the computation function is very cheap, this is (much) more
252+-- efficient than 'push'
253+{-# INLINE [1] pushCheap #-}
254+pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255+pushCheap !f e = Event $ \sub -> do
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
257+ { subscriberPropagate = \a -> do
258+ mb <- f a
259+ mapM_ (subscriberPropagate sub) mb
260+ }
261+ occ' <- join <$> mapM f occ
262+ return (subscription, occ')
263+
264+-- | A subscriber that never triggers other 'Event's
265+{-# INLINE terminalSubscriber #-}
266+terminalSubscriber :: (a -> EventM x ()) -> Subscriber x a
267+terminalSubscriber p = Subscriber
268+ { subscriberPropagate = p
269+ , subscriberInvalidateHeight = \_ -> return ()
270+ , subscriberRecalculateHeight = \_ -> return ()
271+ }
272+
273+-- | Subscribe to an Event only for the duration of one occurrence
274+{-# INLINE subscribeAndReadHead #-}
275+subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276+subscribeAndReadHead e sub = do
277+ subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
279+ { subscriberPropagate = \a -> do
280+ liftIO $ unsubscribe =<< readIORef subscriptionRef
281+ subscriberPropagate sub a
282+ }
283+ liftIO $ case occ of
284+ Nothing -> writeIORef subscriptionRef $! subscription
285+ Just _ -> unsubscribe subscription
286+ return (subscription, occ)
287+
288+--TODO: Make this lazy in its input event
289+headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
290+headE originalE = do
291+ parent <- liftIO $ newIORef $ Just originalE
292+ defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293+ let clearParent = liftIO $ writeIORef parent Nothing
294+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
295+ when (isJust occ) clearParent
296+ return $ Event $ \sub ->
297+ liftIO (readIORef parent) >>= \case
298+ Nothing -> subscribeAndReadNever
299+ Just e -> subscribeAndReadHead e sub
300+
301+data CacheSubscribed x a
302+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303+ , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304+ , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
308+ }
309+
310+nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
311+nowSpiderEventM =
312+ SpiderEvent <$> now
313+
314+now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
315+ ) => m (Event x ())
316+now = do
317+ nowOrNot <- liftIO $ newIORef $ Just ()
318+ scheduleClear nowOrNot
319+ return . Event $ \_ -> do
320+ occ <- liftIO . readIORef $ nowOrNot
321+ return ( EventSubscription (return ()) eventSubscribedNow
322+ , occ
323+ )
324+
325+-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326+-- repeatedly
327+--
328+--TODO: Try a caching strategy where we subscribe directly to the parent when
329+--there's only one subscriber, and then build our own FastWeakBag only when a second
330+--subscriber joins
331+{-# NOINLINE [0] cacheEvent #-}
332+cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
333+cacheEvent e =
334+#ifdef DEBUG_TRACE_EVENTS
335+ withStackOneLine $ \callSite -> Event $
336+#else
337+ Event $
338+#endif
339+ unsafePerformIO $ do
340+ mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341+ <- newIORef emptyFastWeak
342+ pure $ \sub -> {-# SCC "cacheEvent" #-} do
343+#ifdef DEBUG_TRACE_EVENTS
344+ unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345+#endif
346+ subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347+ Just subscribedTicket -> return subscribedTicket
348+ Nothing -> do
349+#ifdef DEBUG_NODEIDS
350+ nodeId <- liftIO newNodeId
351+#endif
352+ subscribers <- liftIO FastWeakBag.empty
353+ occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
354+#ifdef DEBUG_NODEIDS
355+ (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
356+#else
357+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
358+#endif
359+ { subscriberPropagate = \a -> do
360+ liftIO $ writeIORef occRef (Just a)
361+ scheduleClear occRef
362+ propagateFast a subscribers
363+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365+ }
366+ when (isJust occ) $ do
367+ liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368+ scheduleClear occRef
369+ let !subscribed = CacheSubscribed
370+ { _cacheSubscribed_subscribers = subscribers
371+ , _cacheSubscribed_parent = parentSub
372+ , _cacheSubscribed_occurrence = occRef
373+#ifdef DEBUG_NODEIDS
374+ , _cacheSubscribed_nodeId = nodeId
375+#endif
376+ }
377+ subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378+ liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379+ return subscribedTicket
380+ liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381+
382+cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383+ -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384+cacheSubscription sub mSubscribedRef subscribedTicket = do
385+ subscribed <- getFastWeakTicketValue subscribedTicket
386+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388+
389+ let parentSub = _cacheSubscribed_parent subscribed
390+ es = EventSubscription
391+ { _eventSubscription_unsubscribe = do
392+ FastWeakBag.remove ticket
393+
394+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395+ when isEmpty $ do
396+ writeIORef mSubscribedRef emptyFastWeak
397+ unsubscribe parentSub
398+ touch ticket
399+ touch subscribedTicket
400+ , _eventSubscription_subscribed = EventSubscribed
401+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402+ , eventSubscribedRetained = toAny subscribedTicket
403+#ifdef DEBUG_CYCLES
404+ , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405+ , eventSubscribedHasOwnHeightRef = False
406+ , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407+#endif
408+ }
409+ }
410+ return (es, occ)
411+
186412
187−subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x a)
413+subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
188414subscribe e s = fst <$> subscribeAndRead e s
189415
190416{-# INLINE wrap #-}
191−wrap :: MonadIO m => (t -> EventSubscribed x a) -> (Subscriber x a -> m (WeakBagTicket (Subscriber x a), t, Maybe a)) -> Subscriber x a -> m (EventSubscription x a, Maybe a)
417+wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTicket, t, Maybe a)) -> Subscriber x a -> m (EventSubscription x, Maybe a)
192418wrap tag getSpecificSubscribed sub = do
193419 (sln, subd, occ) <- getSpecificSubscribed sub
194420 let es = tag subd
195− return (EventSubscription (Just sln) es, occ)
421+ return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
196422
197−eventRoot :: GCompare k => k a -> Root x k -> Event x a
423+eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
198424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
199425
200−eventNever :: Event x a
201−eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
202−
203−eventPush :: Push x b a -> Event x a
204−eventPush !p = Event $ wrap eventSubscribedPush $ getPushSubscribed p
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
205428
206−eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
207−eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
429+eventNever :: Event x a
430+eventNever = Event $ const subscribeAndReadNever
208431
209−eventFan :: GCompare k => k a -> Fan x k -> Event x a
432+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
210433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
211434
212−eventSwitch :: Switch x a -> Event x a
435+eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
213436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
214437
215−eventCoincidence :: Coincidence x a -> Event x a
438+eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
216439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
217440
218−eventHold :: a ~ p b => Hold x p b -> Event x a
441+eventHold :: Hold x p -> Event x p
219442eventHold !h = Event $ subscribeHoldEvent h
220443
221−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
222445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
223446
224447{-# INLINE subscribeCoincidenceInner #-}
225−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)
226449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
227450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
228451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -241,171 +464,75 @@ data Subscriber x a = Subscriber
241464 , subscriberRecalculateHeight :: !(Height -> IO ())
242465 }
243466
244−--TODO: Move this comment to WeakBag
245−-- These function are constructor functions that are marked NOINLINE so they are
246−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
247−-- so any weak references that are attached to the constructors will have their
248−-- finalizer run. Using the opaque constructor, does not see the
249−-- constructor application, so it behaves like an IORef and cannot be fused away.
250−--
251−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
252−-- the weak pointer to it in some cases.
253−
254−newSubscriberPush :: (a -> ComputeM x (Maybe b)) -> PushSubscribed x a b -> IO (Subscriber x a)
255−newSubscriberPush compute subscribed = return $ Subscriber
256− { subscriberPropagate = \a -> {-# SCC "traversePush" #-} do
257− tracePropagate $ "SubscriberPush" <> showNodeId subscribed
258− occ <- runComputeM $ compute a
259− case occ of
260− Nothing -> return () -- No need to write a Nothing back into the Ref
261− Just o -> do
262− liftIO $ writeIORef (pushSubscribedOccurrence subscribed) occ
263− scheduleClear $ pushSubscribedOccurrence subscribed
264− propagate o $ pushSubscribedSubscribers subscribed
265− , subscriberInvalidateHeight = \old -> do
266− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
267− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ invalidateSubscriberHeight old
268− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
269− , subscriberRecalculateHeight = \new -> do
270− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed
271− WeakBag.traverse (pushSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
272− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberPush" <> showNodeId subscribed <> " done"
273− }
274−
275−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)
276468newSubscriberHold h = return $ Subscriber
277469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
278470 , subscriberInvalidateHeight = \_ -> return ()
279471 , subscriberRecalculateHeight = \_ -> return ()
280472 }
281473
282−newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
283−newSubscriberMerge k subscribed = return $ Subscriber
284− { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
285− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
286− oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
287− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
288− tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
289− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
290− when (DMap.null oldM) $ do -- Only schedule the firing once
291− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
292− --TODO: assertions about height
293− currentHeight <- getCurrentHeight
294− when (height <= currentHeight) $ do
295− if height /= invalidHeight
296− then do
297− myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
298− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
299− else liftIO $ do
300−#ifdef DEBUG_CYCLES
301− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
302− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
303− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
304−#else
305− let cycleInfo = ""
306−#endif
307− error $ "Causality loop found" <> cycleInfo
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"
478+ tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
335479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
336480 scheduleClear $ fanSubscribedOccurrence subscribed
337− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
338482 propagate v $ _fanSubscribedChildren_list subsubs
339483 return $ Constant ()
340484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
341485 return ()
342486 , subscriberInvalidateHeight = \old -> do
343− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
344487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
345− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
346− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
347489 , subscriberRecalculateHeight = \new -> do
348− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
349490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
350− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
351− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
352492 }
353493
354−newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
355−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
356496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
357− tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
358497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
359498 scheduleClear $ switchSubscribedOccurrence subscribed
360499 propagate a $ switchSubscribedSubscribers subscribed
361500 , subscriberInvalidateHeight = \_ -> do
362− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
363501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
364502 when (oldHeight /= invalidHeight) $ do
365503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
366− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
367− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
368− , subscriberRecalculateHeight = \new -> do
369− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
370− updateSwitchHeight new subscribed
371− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
372− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
373507
374−newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
375−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
376510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
377− tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
378511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
379− tracePropagate $ " outerHeight = " <> show outerHeight
512+ tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
380513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
381− tracePropagate $ " isJust occ = " <> show (isJust occ)
382− tracePropagate $ " innerHeight = " <> show innerHeight
514+ tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515+ tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
383517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
384518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
385519 case occ of
386− Nothing -> do
520+ Nothing ->
387521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
388522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
389− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
390− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
391525 Just o -> do -- Since it's already firing, no need to adjust height
392526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
393527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
394528 propagate o $ coincidenceSubscribedSubscribers subscribed
395− , subscriberInvalidateHeight = \_ -> do
396− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
397− invalidateCoincidenceHeight subscribed
398− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
399− , subscriberRecalculateHeight = \_ -> do
400− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
401− recalculateCoincidenceHeight subscribed
402− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
403531 }
404532
405−newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
406−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
407535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
408− tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
409536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
410537 case occ of
411538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -413,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
413540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
414541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
415542 propagate a $ coincidenceSubscribedSubscribers subscribed
416− , subscriberInvalidateHeight = \_ -> do
417− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
418− invalidateCoincidenceHeight subscribed
419− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
420− , subscriberRecalculateHeight = \_ -> do
421− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
422− recalculateCoincidenceHeight subscribed
423− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
424545 }
425546
426547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -430,30 +551,45 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
430551recalculateSubscriberHeight = flip subscriberRecalculateHeight
431552
432553-- | Propagate everything at the current height
433−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
434−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) $
435563 -- 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
436564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
437− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
438566
439567--------------------------------------------------------------------------------
440568-- EventSubscribed
441569--------------------------------------------------------------------------------
442570
443−data EventSubscribed x a = forall b. EventSubscribed
571+toAny :: a -> Any
572+toAny = unsafeCoerce
573+
574+-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575+-- existential type? Sadly, GHC does not currently know how to unbox types
576+-- with existentially quantified fields. So instead we just coerce values
577+-- to type Any on the way in. Since we never coerce them back, this is
578+-- perfectly safe.
579+data EventSubscribed x = EventSubscribed
444580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
445− , eventSubscribedRetained :: {-# NOUNPACK #-} !b
581+ , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
446582#ifdef DEBUG_CYCLES
447− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
448584 , eventSubscribedHasOwnHeightRef :: !Bool
449585 , eventSubscribedWhoCreated :: !(IO [String])
450586#endif
451587 }
452588
453−eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x a
589+eventSubscribedRoot :: RootSubscribed x a -> EventSubscribed x
454590eventSubscribedRoot !r = EventSubscribed
455591 { eventSubscribedHeightRef = zeroRef
456− , eventSubscribedRetained = r
592+ , eventSubscribedRetained = toAny r
457593#ifdef DEBUG_CYCLES
458594 , eventSubscribedGetParents = return []
459595 , eventSubscribedHasOwnHeightRef = False
@@ -461,125 +597,99 @@ eventSubscribedRoot !r = EventSubscribed
461597#endif
462598 }
463599
464−eventSubscribedNever :: EventSubscribed x a
600+eventSubscribedNever :: EventSubscribed x
465601eventSubscribedNever = EventSubscribed
466602 { eventSubscribedHeightRef = zeroRef
467− , eventSubscribedRetained = ()
603+ , eventSubscribedRetained = toAny ()
468604#ifdef DEBUG_CYCLES
469605 , eventSubscribedGetParents = return []
470606 , eventSubscribedHasOwnHeightRef = False
471607 , eventSubscribedWhoCreated = return ["never"]
472608#endif
473609 }
474−
475−eventSubscribedPush :: PushSubscribed x b a -> EventSubscribed x a
476−eventSubscribedPush !subscribed = EventSubscribed
477− { eventSubscribedHeightRef = pushSubscribedHeight subscribed
478− , eventSubscribedRetained = subscribed
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
479614#ifdef DEBUG_CYCLES
480− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ pushSubscribedParent subscribed]
615+ , eventSubscribedGetParents = return []
481616 , eventSubscribedHasOwnHeightRef = False
482− , eventSubscribedWhoCreated = whoCreatedIORef $ pushSubscribedCachedSubscribed subscribed
483−#endif
484− }
485−
486−eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x a
487−eventSubscribedMerge !subscribed = EventSubscribed
488− { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
489− , eventSubscribedRetained = subscribed
490−#ifdef DEBUG_CYCLES
491− , eventSubscribedGetParents = do
492− ps <- readIORef $ mergeSubscribedParents subscribed
493− return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
494− , eventSubscribedHasOwnHeightRef = True
495− , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
617+ , eventSubscribedWhoCreated = return ["now"]
496618#endif
497619 }
498620
499−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x a
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
500622eventSubscribedFan !subscribed = EventSubscribed
501623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
502− , eventSubscribedRetained = subscribed
624+ , eventSubscribedRetained = toAny subscribed
503625#ifdef DEBUG_CYCLES
504− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
505627 , eventSubscribedHasOwnHeightRef = False
506628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
507629#endif
508630 }
509631
510−eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x a
632+eventSubscribedSwitch :: SwitchSubscribed x a -> EventSubscribed x
511633eventSubscribedSwitch !subscribed = EventSubscribed
512634 { eventSubscribedHeightRef = switchSubscribedHeight subscribed
513− , eventSubscribedRetained = subscribed
635+ , eventSubscribedRetained = toAny subscribed
514636#ifdef DEBUG_CYCLES
515637 , eventSubscribedGetParents = do
516638 s <- readIORef $ switchSubscribedCurrentParent subscribed
517− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
518640 , eventSubscribedHasOwnHeightRef = True
519641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
520642#endif
521643 }
522644
523−eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x a
645+eventSubscribedCoincidence :: CoincidenceSubscribed x a -> EventSubscribed x
524646eventSubscribedCoincidence !subscribed = EventSubscribed
525647 { eventSubscribedHeightRef = coincidenceSubscribedHeight subscribed
526− , eventSubscribedRetained = subscribed
648+ , eventSubscribedRetained = toAny subscribed
527649#ifdef DEBUG_CYCLES
528650 , eventSubscribedGetParents = do
529651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
530− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
531− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
532654 return $ outerParent : innerParents
533655 , eventSubscribedHasOwnHeightRef = True
534656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
535657#endif
536658 }
537659
538−getEventSubscribedHeight :: EventSubscribed x a -> IO Height
660+getEventSubscribedHeight :: EventSubscribed x -> IO Height
539661getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
540662
541663#ifdef DEBUG_CYCLES
542−whoCreatedEventSubscribed :: EventSubscribed x a -> IO [String]
664+whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
543665whoCreatedEventSubscribed = eventSubscribedWhoCreated
544666
545−walkInvalidHeightParents :: EventSubscribed x a -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
546668walkInvalidHeightParents s0 = do
547− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
548670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
549671 when (h == invalidHeight) $ do
550672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
551− modify (Some.This s :)
673+ modify (s :)
552674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
553− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
554676 return subscribers
555677#endif
556678
557679{-# INLINE subscribeHoldEvent #-}
558−subscribeHoldEvent :: CanSubscribe x m => Hold x p a -> Subscriber x (p a) -> m (EventSubscription x (p a), Maybe (p a))
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
559681subscribeHoldEvent = subscribeAndRead . holdEvent
560682
561−--------------------------------------------------------------------------------
562−-- EventSubscription
563−--------------------------------------------------------------------------------
564−
565−data EventSubscription x a = EventSubscription
566− { _eventSubscription_ticket :: !(Maybe (WeakBagTicket (Subscriber x a)))
567− , _eventSubscription_subscribed :: !(EventSubscribed x a)
568− }
569−
570−unsubscribe :: EventSubscription x a -> IO ()
571−unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
572−
573683--------------------------------------------------------------------------------
574684-- Behavior
575685--------------------------------------------------------------------------------
576686
577687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
578688
579−behaviorHold :: Hold x p a -> Behavior x a
689+behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
580690behaviorHold !h = Behavior $ readHoldTracked h
581691
582−behaviorHoldIdentity :: Hold x Identity a -> Behavior x a
692+behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
583693behaviorHoldIdentity = behaviorHold
584694
585695behaviorConst :: a -> Behavior x a
@@ -590,7 +700,7 @@ behaviorPull !p = Behavior $ do
590700 val <- liftIO $ readIORef $ pullValue p
591701 case val of
592702 Just subscribed -> do
593− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
594704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
595705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
596706 return $ pullSubscribedValue subscribed
@@ -599,7 +709,7 @@ behaviorPull !p = Behavior $ do
599709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
600710 parentsRef <- liftIO $ newIORef []
601711 holdInits <- askBehaviorHoldInits
602− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
603713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
604714 parents <- liftIO $ readIORef parentsRef
605715 let subscribed = PullSubscribed
@@ -609,22 +719,22 @@ behaviorPull !p = Behavior $ do
609719 , pullSubscribedParents = parents
610720 }
611721 liftIO $ writeIORef (pullValue p) $ Just subscribed
612− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
613723 return a
614724
615−behaviorDyn :: R.Patch p => Dyn x p a -> Behavior x a
725+behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
616726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
617727
618728{-# INLINE readHoldTracked #-}
619−readHoldTracked :: Hold x p a -> BehaviorM x a
729+readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
620730readHoldTracked h = do
621731 result <- liftIO $ readIORef $ holdValue h
622732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
623− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
733+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734+ liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
624735 return result
625736
626−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
627−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
737+{-# INLINABLE readBehaviorUntracked #-}
628738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
629739readBehaviorUntracked b = do
630740 holdInits <- getDeferralQueue
@@ -634,69 +744,108 @@ readBehaviorUntracked b = do
634744-- Dynamic
635745--------------------------------------------------------------------------------
636746
637−data Dynamic x p a = Dynamic
638− { dynamicCurrent :: !(Behavior x a)
639− , dynamicUpdated :: !(Event x (p a))
747+type DynamicS x p = Dynamic x (PatchTarget p) p
748+
749+data Dynamic x target p = Dynamic
750+ { dynamicCurrent :: !(Behavior x target)
751+ , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
640752 }
641753
642−dynamicHold :: Hold x p a -> Dynamic x p a
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
643760dynamicHold !h = Dynamic
644761 { dynamicCurrent = behaviorHold h
645762 , dynamicUpdated = eventHold h
646763 }
647764
648−dynamicHoldIdentity :: Hold x Identity a -> Dynamic x Identity a
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
649766dynamicHoldIdentity = dynamicHold
650767
651−dynamicConst :: a -> Dynamic x p a
768+dynamicConst :: PatchTarget p -> DynamicS x p
652769dynamicConst !a = Dynamic
653770 { dynamicCurrent = behaviorConst a
654771 , dynamicUpdated = eventNever
655772 }
656773
657−dynamicDyn :: R.Patch p => Dyn x p a -> Dynamic x p a
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
658775dynamicDyn !d = Dynamic
659776 { dynamicCurrent = behaviorDyn d
660777 , dynamicUpdated = eventDyn d
661778 }
662779
663−dynamicDynIdentity :: Dyn x Identity a -> Dynamic x Identity a
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
664781dynamicDynIdentity = dynamicDyn
665782
666783--------------------------------------------------------------------------------
667784-- Combinators
668785--------------------------------------------------------------------------------
669786
670−--TODO: Figure out why certain things are not 'representational', then make them
671−--representational so we can use coerce
672−
673787--type role Hold representational
674−data Hold x p a
675− = Hold { holdValue :: !(IORef a)
788+data Hold x p
789+ = Hold { holdValue :: !(IORef (PatchTarget p))
676790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
677− , holdEvent :: Event x (p a) -- This must be lazy, or holds cannot be defined before their input Events
678− , holdParent :: !(IORef (Maybe (EventSubscription x (p a)))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
791+ , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
792+ , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
679793#ifdef DEBUG_NODEIDS
680794 , holdNodeId :: Int
681795#endif
682796 }
683797
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+
684829data EventEnv x
685− = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
686− , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
830+ = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
687831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832+ , eventEnvDynInits :: !(IORef [SomeDynInit x])
688833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
689834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
690− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
691− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
692838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
693839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
694− , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
840+ , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
695841 }
696842
697843{-# INLINE runEventM #-}
698−runEventM :: EventM x a -> EventEnv x -> IO a
699−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))
700849
701850class MonadIO m => Defer a m where
702851 getDeferralQueue :: m (IORef [a])
@@ -707,81 +856,87 @@ defer a = do
707856 q <- getDeferralQueue
708857 liftIO $ modifyIORef' q (a:)
709858
710−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
711864 {-# INLINE getDeferralQueue #-}
712− getDeferralQueue = EventM $ asks eventEnvAssignments
865+ getDeferralQueue = asksEventEnv eventEnvHoldInits
713866
714−instance Defer (SomeHoldInit x) (EventM x) where
867+instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
715868 {-# INLINE getDeferralQueue #-}
716− getDeferralQueue = EventM $ asks eventEnvHoldInits
869+ getDeferralQueue = asksEventEnv eventEnvDynInits
717870
718871instance Defer (SomeHoldInit x) (BehaviorM x) where
719872 {-# INLINE getDeferralQueue #-}
720873 getDeferralQueue = BehaviorM $ asks snd
721874
722−instance Defer (SomeMergeUpdate x) (EventM x) where
875+instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
723876 {-# INLINE getDeferralQueue #-}
724− getDeferralQueue = EventM $ asks eventEnvMergeUpdates
877+ getDeferralQueue = asksEventEnv eventEnvMergeUpdates
725878
726−instance Defer (SomeMergeInit x) (EventM x) where
879+instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
727880 {-# INLINE getDeferralQueue #-}
728− getDeferralQueue = EventM $ asks eventEnvMergeInits
881+ getDeferralQueue = asksEventEnv eventEnvMergeInits
729882
730−class HasCurrentHeight x m | m -> x where
883+class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
731884 getCurrentHeight :: m Height
732− scheduleMerge :: Height -> MergeSubscribed x a -> m ()
885+ scheduleMerge :: Height -> EventM x () -> m ()
733886
734−instance HasCurrentHeight x (EventM x) where
887+instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
735888 {-# INLINE getCurrentHeight #-}
736− getCurrentHeight = EventM $ do
737− heightRef <- asks eventEnvCurrentHeight
889+ getCurrentHeight = do
890+ heightRef <- asksEventEnv eventEnvCurrentHeight
738891 liftIO $ readIORef heightRef
739892 {-# INLINE scheduleMerge #-}
740− scheduleMerge height subscribed = EventM $ do
741− delayedRef <- asks eventEnvDelayedMerges
742− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
743−
744−class HasSpiderTimeline x m | m -> x where
745− -- | Retrieve the current SpiderTimeline
746− askSpiderTimeline :: m (SpiderTimeline x)
893+ scheduleMerge height subscribed = do
894+ delayedRef <- asksEventEnv eventEnvDelayedMerges
895+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
747896
748−instance HasSpiderTimeline x (EventM x) where
749− {-# INLINE askSpiderTimeline #-}
750− askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
897+class HasSpiderTimeline x where
898+ -- | Retrieve the current SpiderTimelineEnv
899+ spiderTimeline :: SpiderTimelineEnv x
751900
752−instance HasSpiderTimeline x (SpiderHost x) where
753− {-# INLINE askSpiderTimeline #-}
754− askSpiderTimeline = SpiderHost ask
901+instance HasSpiderTimeline Global where
902+ spiderTimeline = globalSpiderTimelineEnv
755903
756−putCurrentHeight :: Height -> EventM x ()
757−putCurrentHeight h = EventM $ do
758− heightRef <- asks eventEnvCurrentHeight
904+putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905+putCurrentHeight h = do
906+ heightRef <- asksEventEnv eventEnvCurrentHeight
759907 liftIO $ writeIORef heightRef $! h
760908
761−instance Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
762910 {-# INLINE getDeferralQueue #-}
763− getDeferralQueue = EventM $ asks eventEnvClears
911+ getDeferralQueue = asksEventEnv eventEnvClears
764912
765913{-# INLINE scheduleClear #-}
766−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
767−scheduleClear r = defer $ SomeClear r
914+scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915+scheduleClear r = defer $ Some $ Clear r
916+
917+instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918+ {-# INLINE getDeferralQueue #-}
919+ getDeferralQueue = asksEventEnv eventEnvIntClears
768920
769−instance Defer SomeRootClear (EventM x) where
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
770926 {-# INLINE getDeferralQueue #-}
771− getDeferralQueue = EventM $ asks eventEnvRootClears
927+ getDeferralQueue = asksEventEnv eventEnvRootClears
772928
773929{-# INLINE scheduleRootClear #-}
774−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
775−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
776932
777−instance Defer (SomeResetCoincidence x) (EventM x) where
933+instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
778934 {-# INLINE getDeferralQueue #-}
779− getDeferralQueue = EventM $ asks eventEnvResetCoincidences
935+ getDeferralQueue = asksEventEnv eventEnvResetCoincidences
780936
781937-- Note: hold cannot examine its event until after the phase is over
782−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> EventM x (Hold x p a) #-}
783−{-# SPECIALIZE hold :: R.Patch p => a -> Event x (p a) -> ComputeM x (Hold x p a) #-}
784−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)
785940hold v0 e = do
786941 valRef <- liftIO $ newIORef v0
787942 invsRef <- liftIO $ newIORef []
@@ -802,7 +957,7 @@ hold v0 e = do
802957 return h
803958
804959{-# INLINE getHoldEventSubscription #-}
805−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, HasSpiderTimeline 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)
806961getHoldEventSubscription h = do
807962 ep <- liftIO $ readIORef $ holdParent h
808963 case ep of
@@ -816,7 +971,7 @@ getHoldEventSubscription h = do
816971 Nothing -> return ()
817972 Just o -> do
818973 old <- liftIO $ readIORef $ holdValue h
819− case R.apply o old of
974+ case apply o old of
820975 Nothing -> return ()
821976 Just new -> do
822977 -- Need to evaluate these so that we don't retain the Hold itself
@@ -828,9 +983,9 @@ getHoldEventSubscription h = do
828983
829984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
830985
831−--type role BehaviorM representational
832986-- BehaviorM can sample behaviors
833−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))
834989
835990instance Monad (BehaviorM x) where
836991 {-# INLINE (>>=) #-}
@@ -839,14 +994,16 @@ instance Monad (BehaviorM x) where
839994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
840995 {-# INLINE return #-}
841996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
842998 {-# INLINE fail #-}
843999 fail s = BehaviorM $ fail s
1000+#endif
8441001
8451002data BehaviorSubscribed x a
846− = forall p. BehaviorSubscribedHold (Hold x p a)
1003+ = forall p. BehaviorSubscribedHold (Hold x p)
8471004 | BehaviorSubscribedPull (PullSubscribed x a)
8481005
849−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
8501007
8511008--type role PullSubscribed representational
8521009data PullSubscribed x a
@@ -881,55 +1038,33 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
8811038#endif
8821039 }
8831040
884−data Root x (k :: * -> *)
1041+data Root x k
8851042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
8861043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
8871044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
8881045 }
8891046
890−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)
8911048
892−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)
8931050
894−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+ }
8951056
896−data SomeEventSubscription x = forall a. SomeEventSubscription (EventSubscription x a)
1057+newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
8971058
8981059-- EventM can do everything BehaviorM can, plus create holds
899−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
900−
901−data PushSubscribed x a b
902− = PushSubscribed { pushSubscribedCachedSubscribed :: !(IORef (Maybe (PushSubscribed x a b)))
903− , 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)
904− , pushSubscribedHeight :: !(IORef Height)
905− , pushSubscribedSubscribers :: !(WeakBag (Subscriber x b))
906− , pushSubscribedSelf :: !(Subscriber x a) -- Hold this in memory to ensure our WeakReferences don't die --TODO: Probably unneeded now
907− , pushSubscribedWeakSelf :: !(IORef (Weak (PushSubscribed x a b)))
908− , pushSubscribedParent :: !(EventSubscription x a)
909−#ifdef DEBUG_NODEIDS
910− , pushSubscribedNodeId :: Int
911−#endif
912− }
913−
914−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
915−
916−instance Defer (SomeHoldInit x) (ComputeM x) where
917− getDeferralQueue = ComputeM ask
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9181061
919−{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
920−runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
921−runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
1062+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9221063
923−data Push x a b
924− = 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?)
925− , pushParent :: !(Event x a)
926− , pushSubscribed :: !(IORef (Maybe (PushSubscribed x a b))) --TODO: Can we replace this with an unsafePerformIO thunk?
927− }
928−
929−data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x a) !(Subscriber x a)
930−
931−mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x a
932−mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1064+data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065+ { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066+ , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067+ }
9331068
9341069data HeightBag = HeightBag
9351070 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -947,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
9471082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
9481083
9491084heightBagAdd :: Height -> HeightBag -> HeightBag
950−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
9511087
9521088heightBagRemove :: Height -> HeightBag -> HeightBag
9531089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -956,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
9561092 0 -> IntMap.delete h c
9571093 _ -> IntMap.insert h (pred old) c
9581094
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+
9591102heightBagMax :: HeightBag -> Height
9601103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
9611104 Just ((h, _), _) -> Height h
@@ -973,46 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
9731116heightBagVerify = id
9741117#endif
9751118
976−data MergeSubscribed x k
977− = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
978− , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
979− , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
980− , mergeSubscribedHeight :: !(IORef Height)
981− , mergeSubscribedHeightBag :: !(IORef HeightBag)
982− , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
983− , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap (DMap k (Event x))), EventSubscribed x (R.PatchDMap (DMap k (Event x)))))
984− , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
985− , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
986−#ifdef DEBUG_NODEIDS
987− , mergeSubscribedNodeId :: Int
988−#endif
989− }
990−
991−--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
992−data Merge x k
993− = Merge { mergeParents :: !(Dynamic x R.PatchDMap (DMap k (Event x)))
994− , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
995− }
996−
997−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
998− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
999− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1000− , _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)))
10011123 }
10021124
1003−data FanSubscribed (x :: *) k
1004− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1005− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1006− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1007− , 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)
10081130#ifdef DEBUG_NODEIDS
10091131 , fanSubscribedNodeId :: Int
10101132#endif
10111133 }
10121134
1013−data Fan x k
1014− = Fan { fanParent :: !(Event x (DMap k Identity))
1015− , 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)))
10161138 }
10171139
10181140data SwitchSubscribed x a
@@ -1024,7 +1146,7 @@ data SwitchSubscribed x a
10241146 , switchSubscribedOwnWeakInvalidator :: !(IORef (Weak (Invalidator x)))
10251147 , switchSubscribedBehaviorParents :: !(IORef [SomeBehaviorSubscribed x])
10261148 , switchSubscribedParent :: !(Behavior x (Event x a))
1027− , switchSubscribedCurrentParent :: !(IORef (EventSubscription x a))
1149+ , switchSubscribedCurrentParent :: !(IORef (EventSubscription x))
10281150 , switchSubscribedWeakSelf :: !(IORef (Weak (SwitchSubscribed x a)))
10291151#ifdef DEBUG_NODEIDS
10301152 , switchSubscribedNodeId :: Int
@@ -1036,15 +1158,17 @@ data Switch x a
10361158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
10371159 }
10381160
1161+#ifdef USE_TEMPLATE_HASKELL
10391162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163+#endif
10401164data CoincidenceSubscribed x a
10411165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
10421166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
10431167 , coincidenceSubscribedSubscribers :: !(WeakBag (Subscriber x a))
10441168 , coincidenceSubscribedHeight :: !(IORef Height)
10451169 , coincidenceSubscribedOuter :: {-# NOUNPACK #-} (Subscriber x (Event x a))
1046− , coincidenceSubscribedOuterParent :: !(EventSubscription x (Event x a))
1047− , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x a)))
1170+ , coincidenceSubscribedOuterParent :: !(EventSubscription x)
1171+ , coincidenceSubscribedInnerParent :: !(IORef (Maybe (EventSubscribed x)))
10481172 , coincidenceSubscribedWeakSelf :: !(IORef (Weak (CoincidenceSubscribed x a)))
10491173#ifdef DEBUG_NODEIDS
10501174 , coincidenceSubscribedNodeId :: Int
@@ -1064,29 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
10641188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
10651189newInvalidatorPull p = return $! InvalidatorPull p
10661190
1067−instance R.FunctorMaybe (Event x) where
1068− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
10691193
1070−instance Align (Event x) where
1194+instance HasSpiderTimeline x => Align (Event x) where
10711195 nil = eventNever
1072− 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]
10731201
1074−newtype Dyn x p a = Dyn { unDyn :: IORef (Either (BehaviorM x a, Event x (p a)) (Hold x p a)) }
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
10751208
1076−newMapDyn :: (a -> b) -> Dynamic x Identity a -> Dynamic x Identity b
1077−newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1209+data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210+ | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211+ | HoldDyn !(Hold x p)
10781212
1079−instance Functor (Dynamic x Identity) where
1080− fmap = newMapDyn
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
10811214
1082−instance Applicative (Dynamic x Identity) where
1083− pure = dynamicConst
1084− (<*>) = zipDynWith ($)
1085− _ *> b = b
1086− a <* _ = a
1215+newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1216+newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
10871217
10881218--TODO: Avoid the duplication between this and R.zipDynWith
1089−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)
10901220zipDynWith f da db =
10911221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
10921222 ec = flip push eab $ \o -> do
@@ -1099,82 +1229,70 @@ zipDynWith f da db =
10991229 return (a, b)
11001230 These (Identity a) (Identity b) -> return (a, b)
11011231 return $ Just $ Identity $ f a b
1102− in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1103−
1104−instance Monad (Dynamic x Identity) where
1105− {-# INLINE return #-}
1106− return = pure
1107− {-# INLINE (>>=) #-}
1108− x >>= f = dynamicDynIdentity $ newJoinDyn $ newMapDyn f x
1109− {-# INLINE (>>) #-}
1110− _ >> y = y
1111− {-# INLINE fail #-}
1112− fail _ = error "Dynamic does not support 'fail'"
1232+ in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11131233
1114−unsafeDyn :: BehaviorM x a -> Event x (p a) -> Dyn x p a
1115−unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1116− 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
11171240
1118−newJoinDyn :: Dynamic x Identity (Dynamic x Identity a) -> Dyn x Identity a
1119−newJoinDyn d =
1120− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1121− eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1122− eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1123− eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1124− v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1125− in unsafeDyn readV0 v'
1241+unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242+unsafeBuildDynamic readV0 v' =
1243+ Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
11261244
11271245-- ResultM can read behaviors and events
11281246type ResultM = EventM
11291247
1130−{-# NOINLINE unsafeNewIORef #-}
1131−unsafeNewIORef :: a -> b -> IORef b
1132−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1133−
1134−instance Functor (Event x) where
1248+instance HasSpiderTimeline x => Functor (Event x) where
11351249 fmap f = push $ return . Just . f
11361250
11371251instance Functor (Behavior x) where
11381252 fmap f = pull . fmap f . readBehaviorTracked
11391253
1140−{-# NOINLINE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1141−push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1142−push f e = eventPush $ Push
1143− { pushCompute = f
1144− , pushParent = e
1145− , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1146− }
1147−-- 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)
11481257
1149−{-# NOINLINE pull #-}
1258+{-# INLINABLE pull #-}
11501259pull :: BehaviorM x a -> Behavior x a
1151−pull a = behaviorPull $ Pull
1152− { pullCompute = a
1153− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11541262#ifdef DEBUG_NODEIDS
1155− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
11561264#endif
1157− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
11581272
1159−{-# NOINLINE switch #-}
1160−switch :: Behavior x (Event x a) -> Event x a
1161−switch a = eventSwitch $ Switch
1162− { switchParent = a
1163− , switchSubscribed = unsafeNewIORef a Nothing
1164− }
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+ }
11651281
1166−coincidence :: Event x (Event x a) -> Event x a
1167−coincidence a = eventCoincidence $ Coincidence
1168− { coincidenceParent = a
1169− , coincidenceSubscribed = unsafeNewIORef a Nothing
1170− }
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+ }
11711289
11721290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1173−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
11741292run roots after = do
1175− tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1176− spiderTimeline <- SpiderHost ask
1177− result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock spiderTimeline) $ \_ -> flip runReaderT spiderTimeline $ 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
11781296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
11791297 occBefore <- liftIO $ do
11801298 occBefore <- readIORef occRef
@@ -1186,42 +1304,39 @@ run roots after = do
11861304 else return Nothing
11871305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
11881306 propagate a subscribersRef
1189− delayedRef <- EventM $ asks eventEnvDelayedMerges
1307+ delayedRef <- asksEventEnv eventEnvDelayedMerges
11901308 let go = do
11911309 delayed <- liftIO $ readIORef delayedRef
11921310 case IntMap.minViewWithKey delayed of
11931311 Nothing -> return ()
11941312 Just ((currentHeight, cur), future) -> do
1195− tracePropagate $ "Running height " ++ show currentHeight
1313+ tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
11961314 putCurrentHeight $ Height currentHeight
11971315 liftIO $ writeIORef delayedRef $! future
1198− forM_ cur $ \d -> case d of
1199− DelayedMerge subscribed -> do
1200− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1201− case height `compare` Height currentHeight of
1202− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1203− GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1204− EQ -> do
1205− m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1206− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1207− --TODO: Assert that m is not empty
1208− liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1209− scheduleClear $ mergeSubscribedOccurrence subscribed
1210− propagate m $ mergeSubscribedSubscribers subscribed
1316+ sequence_ cur
12111317 go
12121318 go
12131319 putCurrentHeight maxBound
12141320 after
1215− tracePropagate "Done running an event frame"
1321+ tracePropagate (Proxy :: Proxy x) "Done running an event frame"
12161322 return result
12171323
1218−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
12191332
1220−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1333+newtype Clear a = Clear (IORef (Maybe a))
12211334
1222−data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
1335+newtype IntClear a = IntClear (IORef (IntMap a))
1336+
1337+newtype RootClear k = RootClear (IORef (DMap k Identity))
12231338
1224−data DelayedMerge x = forall k. DelayedMerge (MergeSubscribed x k)
1339+data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
12251340
12261341debugFinalize :: Bool
12271342debugFinalize = False
@@ -1231,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12311346 x' <- evaluate x
12321347 mkWeakPtr x' $
12331348 if debugFinalize
1234− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12351350 else Nothing
12361351
12371352type WeakList a = [Weak a]
12381353
1239−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12401359#ifdef DEBUG
1241−withIncreasedDepth :: CanTrace x m => m a -> m a
1242−withIncreasedDepth a = do
1243− spiderTimeline <- askSpiderTimeline
1244− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) 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
12451385 result <- a
1246− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12471387 return result
1248−#else
1249−withIncreasedDepth :: m a -> m a
1250−withIncreasedDepth = id
1251−#endif
1252−
1253−type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
12541388
12551389{-# INLINE tracePropagate #-}
1256−tracePropagate :: (CanTrace x m) => String -> m ()
1257−tracePropagate = traceWhen debugPropagate
1390+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391+tracePropagate p = when debugPropagate . trace p
12581392
12591393{-# INLINE traceInvalidate #-}
12601394traceInvalidate :: String -> IO ()
1261−traceInvalidate = when debugInvalidate . liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396+
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
12621400
1263−{-# INLINE traceWhen #-}
1264−traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1265−traceWhen b message = traceMWhen b $ return message
1401+{-# INLINE trace #-}
1402+trace :: (CanTrace x m) => proxy x -> String -> m ()
1403+trace p message = traceM p $ return message
12661404
1267−{-# INLINE traceMWhen #-}
1268−traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1269−traceMWhen b getMessage = when b $ do
1405+{-# INLINE traceM #-}
1406+traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407+traceM _ getMessage = do
12701408 message <- getMessage
1271−#ifdef DEBUG
1272− spiderTimeline <- askSpiderTimeline
1273− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
12741412#else
1275− 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+
12761448#endif
1277− liftIO $ putStrLn $ replicate d ' ' <> message
12781449
12791450whoCreatedIORef :: IORef a -> IO [String]
12801451whoCreatedIORef (IORef a) = whoCreated $! a
12811452
1282−#ifdef DEBUG_CYCLES
12831453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
12841454groupByHead = \case
12851455 [] -> []
@@ -1290,77 +1460,108 @@ groupByHead = \case
12901460 | otherwise -> (x, xs :| []) : l
12911461
12921462listsToForest :: Eq a => [[a]] -> Forest a
1293−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+
12941495#endif
12951496
1497+
12961498{-# INLINE propagateSubscriberHold #-}
1297−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 ()
12981500propagateSubscriberHold h a = do
1299− {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13001502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13011503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13021505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1303− case {-# SCC "apply" #-} R.apply a v of
1506+ case {-# SCC "apply" #-} apply a v of
13041507 Nothing -> return ()
13051508 Just v' -> do
1306− {-# 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)
13071511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13081512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13091513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
13101514
1311−data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x a) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1515+data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13121516
13131517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1314−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13151519
13161520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13171521askInvalidator = do
1318− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13191523 case m of
13201524 Nothing -> return Nothing
13211525 Just (!wi, _) -> return $ Just wi
13221526
13231527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13241528askParentsRef = do
1325− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13261530 case m of
13271531 Nothing -> return Nothing
13281532 Just (_, !p) -> return $ Just p
13291533
13301534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13311535askBehaviorHoldInits = do
1332− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13331537 return his
13341538
13351539{-# INLINE getDynHold #-}
1336−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)
13371541getDynHold d = do
13381542 mh <- liftIO $ readIORef $ unDyn d
13391543 case mh of
1340− Right h -> return h
1341− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13421546 holdInits <- getDeferralQueue
13431547 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
13441554 h <- hold v0 v'
1345− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13461556 return h
13471557
1558+
13481559-- Always refers to 0
13491560{-# NOINLINE zeroRef #-}
13501561zeroRef :: IORef Height
13511562zeroRef = unsafePerformIO $ newIORef zeroHeight
13521563
1353−type CanSubscribe x m =
1354− ( HasSpiderTimeline x m
1355− , HasCurrentHeight x m
1356− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1357− , Defer SomeClear m -- Wiping out event firings
1358− , Defer (SomeAssignment x) m -- Updating state
1359− , Defer (SomeResetCoincidence x) m
1360− , m ~ EventM x
1361− )
1362−
1363−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a), RootSubscribed x a, Maybe a)
1564+getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
13641565getRootSubscribed k r sub = do
13651566 mSubscribed <- readIORef $ rootSubscribed r
13661567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1374,10 +1575,15 @@ getRootSubscribed k r sub = do
13741575 let !cached = rootSubscribed r
13751576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
13761577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1377− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
13781581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13791582 writeIORef uninitRef $! uninit
1380− let subscribed = RootSubscribed
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
1586+ let !subscribed = RootSubscribed
13811587 { rootSubscribedKey = k
13821588 , rootSubscribedCachedSubscribed = cached
13831589 , rootSubscribedOccurrence = getOcc
@@ -1385,143 +1591,120 @@ getRootSubscribed k r sub = do
13851591 , rootSubscribedUninit = uninit
13861592 , rootSubscribedWeakSelf = weakSelf
13871593#ifdef DEBUG_NODEIDS
1388− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
13891595#endif
13901596 }
1391− 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)
13921608 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
13931609 occ <- getOcc
13941610 return (sln, subscribed, occ)
13951611
1612+#ifdef USE_TEMPLATE_HASKELL
13961613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614+#endif
13971615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1398−cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1616+cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
13991617 rootSubscribedUninit self
14001618 modifyIORef' cached $ DMap.delete k
14011619
14021620{-# INLINE subscribeRootSubscribed #-}
1403−subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1621+subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
14041622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
14051623
1406−-- When getPushSubscribed returns, the PushSubscribed returned will have a fully filled-in
1407−{-# SPECIALIZE getPushSubscribed :: Push x a b -> Subscriber x b -> EventM x (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe b) #-}
1408−getPushSubscribed :: CanSubscribe x m => Push x a b -> Subscriber x b -> m (WeakBagTicket (Subscriber x b), PushSubscribed x a b, Maybe b)
1409−getPushSubscribed p sub = do
1410− mSubscribed <- liftIO $ readIORef $ pushSubscribed p
1411− case mSubscribed of
1412− Just subscribed -> {-# SCC "hitPush" #-} liftIO $ do
1413− sln <- subscribePushSubscribed subscribed sub
1414− occ <- readIORef $ pushSubscribedOccurrence subscribed
1415− return (sln, subscribed, occ)
1416− Nothing -> {-# SCC "missPush" #-} do -- Not yet subscribed
1417− subscribedRef <- liftIO $ newIORef $ error "getPushSubscribed: subscribed not yet intialized"
1418− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1419− s <- liftIO $ newSubscriberPush (pushCompute p) subscribedUnsafe
1420− (subscription@(EventSubscription _ subd), parentOcc) <- subscribeAndRead (pushParent p) s
1421− occ <- runComputeM $ join <$> mapM (pushCompute p) parentOcc
1422− occRef <- liftIO $ newIORef occ
1423− when (isJust occ) $ scheduleClear occRef
1424− weakSelf <- liftIO $ newIORef $ error "getPushSubscribed: weakSelf not initialized"
1425− let !cached = pushSubscribed p
1426− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupPushSubscribed
1427− let subscribed = PushSubscribed
1428− { pushSubscribedCachedSubscribed = cached
1429− , pushSubscribedOccurrence = occRef
1430− , pushSubscribedHeight = eventSubscribedHeightRef subd -- Since pushes have the same height as their parents, share the ref
1431− , pushSubscribedSubscribers = subs
1432− , pushSubscribedSelf = s
1433− , pushSubscribedWeakSelf = weakSelf
1434− , 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))
14351630#ifdef DEBUG_NODEIDS
1436− , pushSubscribedNodeId = unsafeNodeId p
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
14371632#endif
1438− }
1439− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
1440− liftIO $ writeIORef subscribedRef $! subscribed
1441− liftIO $ writeIORef (pushSubscribed p) $ Just subscribed
1442− return (sln, subscribed, occ)
1443−
1444−cleanupPushSubscribed :: PushSubscribed x a b -> IO ()
1445−cleanupPushSubscribed self = do
1446− unsubscribe $ pushSubscribedParent self
1447− writeIORef (pushSubscribedCachedSubscribed self) $ Nothing
1448−
1449−{-# INLINE subscribePushSubscribed #-}
1450−subscribePushSubscribed :: PushSubscribed x a b -> Subscriber x b -> IO (WeakBagTicket (Subscriber x b))
1451−subscribePushSubscribed subscribed sub = WeakBag.insert sub (pushSubscribedSubscribers subscribed) (pushSubscribedWeakSelf subscribed) cleanupPushSubscribed
1633+ }
14521634
1453−{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1454−getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket (Subscriber x (DMap k Identity)), MergeSubscribed x k, Maybe (DMap k Identity))
1455−getMergeSubscribed m sub = do
1456− mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1457− case mSubscribed of
1458− Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1459− sln <- subscribeMergeSubscribed subscribed sub
1460− occ <- readIORef $ mergeSubscribedOccurrence subscribed
1461− return (sln, subscribed, occ)
1462− Nothing -> {-# SCC "missMerge" #-} do
1463− subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1464− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1465− initialParents <- readBehaviorUntracked $ dynamicCurrent $ mergeParents m
1466− subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1467− s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1468− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1469− height <- liftIO $ getEventSubscribedHeight parentSubd
1470− return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1471− let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1472− heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1473− myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1474− myHeight = if invalidHeight `elem` heights
1475− then invalidHeight
1476− else succHeight $ heightBagMax myHeightBag
1477− currentHeight <- getCurrentHeight
1478− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1479− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1480− else (Nothing, dm)
1481− unless (DMap.null accum) $ do
1482− scheduleMerge myHeight subscribedUnsafe
1483− occRef <- liftIO $ newIORef occ
1484− when (isJust occ) $ scheduleClear occRef
1485− accumRef <- liftIO $ newIORef accum
1486− heightRef <- liftIO $ newIORef myHeight
1487− heightMapRef <- liftIO $ newIORef myHeightBag
1488− weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1489− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1490− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1491− parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1492− let !subscribed = MergeSubscribed
1493− { mergeSubscribedCachedSubscribed = mergeSubscribed m
1494− , mergeSubscribedOccurrence = occRef
1495− , mergeSubscribedAccum = accumRef
1496− , mergeSubscribedHeight = heightRef
1497− , mergeSubscribedHeightBag = heightMapRef
1498− , mergeSubscribedSubscribers = subs
1499− , mergeSubscribedChange = changeSubdRef
1500− , mergeSubscribedParents = parentsRef
1501− , mergeSubscribedWeakSelf = weakSelf
1635+newFanInt :: IO (FanInt x a)
1636+newFanInt = do
1637+ subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638+ subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639+ occRef <- newIORef $ error "fanInt: no occurrence"
15021640#ifdef DEBUG_NODEIDS
1503− , mergeSubscribedNodeId = unsafeNodeId m
1641+ nodeId <- newNodeId
15041642#endif
1505− }
1506− defer $ SomeMergeInit subscribed $ dynamicUpdated $ mergeParents m
1507− liftIO $ writeIORef subscribedRef $! subscribed
1508− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1509− liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1510− return (sln, subscribed, occ)
1643+ return $ FanInt
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
1650+ }
15111651
1512−cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1513−cleanupMergeSubscribed subscribed = do
1514− parents <- readIORef $ mergeSubscribedParents subscribed
1515− forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1516− -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1517− writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657+ when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660+ { subscriberPropagate = \m -> do
1661+ liftIO $ writeIORef (_fanInt_occRef self) m
1662+ scheduleIntClear $ _fanInt_occRef self
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664+ FastWeakBag.traverse_ b $ \s ->
1665+ subscriberPropagate s v
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
1669+ subscriberInvalidateHeight s old
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
1673+ subscriberRecalculateHeight s new
1674+ }
1675+ liftIO $ do
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1679+ liftIO $ do
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681+ Nothing -> do
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684+ return b
1685+ Just b -> return b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691+
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698+#ifdef DEBUG_CYCLES
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702+#endif
1703+ }
15181704
1519−{-# INLINE subscribeMergeSubscribed #-}
1520−subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO (WeakBagTicket (Subscriber x (DMap k Identity)))
1521−subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
15221705
1523−{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), FanSubscribed x k, Maybe a) #-}
1524−getFanSubscribed :: (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), FanSubscribed x k, Maybe a)
1706+{-# INLINABLE getFanSubscribed #-}
1707+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
15251708getFanSubscribed k f sub = do
15261709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
15271710 case mSubscribed of
@@ -1539,13 +1722,16 @@ getFanSubscribed k f sub = do
15391722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
15401723 occRef <- liftIO $ newIORef parentOcc
15411724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15421728 let subscribed = FanSubscribed
15431729 { fanSubscribedCachedSubscribed = fanSubscribed f
15441730 , fanSubscribedOccurrence = occRef
15451731 , fanSubscribedParent = subscription
15461732 , fanSubscribedSubscribers = subscribersRef
15471733#ifdef DEBUG_NODEIDS
1548− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15491735#endif
15501736 }
15511737 let !self = (k, subscribed)
@@ -1555,7 +1741,7 @@ getFanSubscribed k f sub = do
15551741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15561742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15571743
1558−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15591745cleanupFanSubscribed (k, subscribed) = do
15601746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15611747 let reducedSubscribers = DMap.delete k subscribers
@@ -1567,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15671753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15681754
15691755{-# INLINE subscribeFanSubscribed #-}
1570−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
15711757subscribeFanSubscribed k subscribed sub = do
15721758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15731759 case DMap.lookup k subscribers of
@@ -1579,8 +1765,8 @@ subscribeFanSubscribed k subscribed sub = do
15791765 return sln
15801766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
15811767
1582−{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), SwitchSubscribed x a, Maybe a) #-}
1583−getSwitchSubscribed :: (Defer (SomeHoldInit x) m, Defer (SomeAssignment x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, Defer (SomeResetCoincidence x) m, HasCurrentHeight x m, HasSpiderTimeline x m, m ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), SwitchSubscribed x a, Maybe a)
1768+{-# INLINABLE getSwitchSubscribed #-}
1769+getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
15841770getSwitchSubscribed s sub = do
15851771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
15861772 case mSubscribed of
@@ -1605,6 +1791,9 @@ getSwitchSubscribed s sub = do
16051791 when (isJust parentOcc) $ scheduleClear occRef
16061792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
16071793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
16081797 let !subscribed = SwitchSubscribed
16091798 { switchSubscribedCachedSubscribed = switchSubscribed s
16101799 , switchSubscribedOccurrence = occRef
@@ -1617,7 +1806,7 @@ getSwitchSubscribed s sub = do
16171806 , switchSubscribedCurrentParent = subscriptionRef
16181807 , switchSubscribedWeakSelf = weakSelf
16191808#ifdef DEBUG_NODEIDS
1620− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
16211810#endif
16221811 }
16231812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1632,11 +1821,11 @@ cleanupSwitchSubscribed subscribed = do
16321821 writeIORef (switchSubscribedCachedSubscribed subscribed) Nothing
16331822
16341823{-# INLINE subscribeSwitchSubscribed #-}
1635−subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1824+subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16361825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
16371826
1638−{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a, Maybe a) #-}
1639−getCoincidenceSubscribed :: forall x a m. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m, Defer SomeClear m, HasCurrentHeight x m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket (Subscriber x a), CoincidenceSubscribed x a, Maybe a)
1827+{-# INLINABLE getCoincidenceSubscribed #-}
1828+getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
16401829getCoincidenceSubscribed c sub = do
16411830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
16421831 case mSubscribed of
@@ -1662,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16621851 scheduleClear innerSubdRef
16631852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16641853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16651857 let subscribed = CoincidenceSubscribed
16661858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16671859 , coincidenceSubscribedOccurrence = occRef
@@ -1672,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16721864 , coincidenceSubscribedInnerParent = innerSubdRef
16731865 , coincidenceSubscribedWeakSelf = weakSelf
16741866#ifdef DEBUG_NODEIDS
1675− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16761868#endif
16771869 }
16781870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1686,145 +1878,535 @@ cleanupCoincidenceSubscribed subscribed = do
16861878 writeIORef (coincidenceSubscribedCachedSubscribed subscribed) Nothing
16871879
16881880{-# INLINE subscribeCoincidenceSubscribed #-}
1689−subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO (WeakBagTicket (Subscriber x a))
1881+subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16901882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16911883
1692−{-# INLINE merge #-}
1693−merge :: GCompare k => Dynamic x R.PatchDMap (DMap k (Event x)) -> Event x (DMap k Identity)
1694−merge m = eventMerge $ Merge
1695− { mergeParents = m
1696− , mergeSubscribed = unsafeNewIORef m Nothing
1884+{-# INLINE mergeG #-}
1885+mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886+ => (forall a. q a -> Event x (v a))
1887+ -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888+mergeG nt d = cacheEvent (mergeCheap nt d)
1889+
1890+{-# INLINE mergeWithMove #-}
1891+mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892+ => (forall a. q a -> Event x (v a))
1893+ -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894+mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1895+
1896+{-# INLINE [1] mergeCheap #-}
1897+mergeCheap
1898+ :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899+ => (forall a. q a -> Event x (v a))
1900+ -> DynamicS x (PatchDMap k q)
1901+ -> Event x (DMap k v)
1902+mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1903+ where
1904+ updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905+ updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1906+ let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1907+ (mOldSubd, newPs) <- case me of
1908+ Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1909+ Just e -> do
1910+ let s = subscriber $ return k
1911+ subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1912+ newParentHeight <- liftIO $ getEventSubscribedHeight subd
1913+ let newParent = MergeSubscribedParent subscription
1914+ liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916+ forM_ mOldSubd $ \oldSubd -> do
1917+ oldHeight <- liftIO $ getEventSubscribedHeight $
1918+ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919+
1920+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921+ return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922+ foldM f ([], oldParents) $ DMap.toList p
1923+
1924+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1925+ getInitialSubscribers initialParents subscriber = do
1926+ subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1927+ let s = subscriber $ return k
1928+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1929+ height <- liftIO $ getEventSubscribedHeight parentSubd
1930+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931+ return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932+ , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933+ , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1934+ )
1935+
1936+ destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1937+ destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1938+
1939+{-# INLINE [1] mergeCheapWithMove #-}
1940+mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941+ => (forall a. q a -> Event x (v a))
1942+ -> DynamicS x (PatchDMapWithMove k q)
1943+ -> Event x (DMap k v)
1944+mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1945+ where
1946+ updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947+ updateMe subscriber heightBagRef oldParents p = do
1948+ -- Prepare new parents for insertion
1949+ let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1950+ subscribeParent k e = do
1951+ keyRef <- liftIO $ newIORef k
1952+ let s = subscriber $ liftIO $ readIORef keyRef
1953+ subscription@(EventSubscription _ subd) <- subscribe e s
1954+ liftIO $ do
1955+ newParentHeight <- getEventSubscribedHeight subd
1956+ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957+ return $ MergeSubscribedParentWithMove subscription keyRef
1958+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1959+ -- Collect old parents for deletion and update the keys of moved parents
1960+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961+ moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962+ Nothing -> do
1963+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964+ _mergeSubscribedParentWithMove_subscription parent
1965+
1966+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967+ return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968+ Just toKey -> do
1969+ liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970+ return Nothing
1971+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972+ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973+
1974+ return (toDelete, applyAlways p' oldParents)
1975+ getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976+ getInitialSubscribers initialParents subscriber = do
1977+ subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1978+ keyRef <- liftIO $ newIORef k
1979+ let s = subscriber $ liftIO $ readIORef keyRef
1980+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1981+ height <- liftIO $ getEventSubscribedHeight parentSubd
1982+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983+ return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984+ , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985+ , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1986+ )
1987+
1988+ destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1989+ destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1990+
1991+type MergeUpdateFunc k v x p s
1992+ = (forall a. EventM x (k a) -> Subscriber x (v a))
1993+ -> IORef HeightBag
1994+ -> DMap k s
1995+ -> p
1996+ -> EventM x ([EventSubscription x], DMap k s)
1997+
1998+type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999+
2000+type MergeInitFunc k v q x s
2001+ = DMap k q
2002+ -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003+ -> EventM x (DMap k v, [Height], DMap k s)
2004+
2005+type MergeDestroyFunc k s
2006+ = DMap k s
2007+ -> IO ()
2008+
2009+data Merge x k v s = Merge
2010+ { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011+ , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012+ , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
2015+ }
2016+
2017+invalidateMergeHeight :: Merge x k v s -> IO ()
2018+invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2019+
2020+invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021+invalidateMergeHeight' heightRef sub = do
2022+ oldHeight <- readIORef heightRef
2023+ -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
2024+ when (oldHeight /= invalidHeight) $ do
2025+ writeIORef heightRef $! invalidHeight
2026+ subscriberInvalidateHeight sub oldHeight
2027+
2028+revalidateMergeHeight :: Merge x k v s -> IO ()
2029+revalidateMergeHeight m = do
2030+ currentHeight <- readIORef $ _merge_heightRef m
2031+
2032+ -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033+ when (currentHeight == invalidHeight) $ do
2034+ heights <- readIORef $ _merge_heightBagRef m
2035+ parents <- readIORef $ _merge_parentsRef m
2036+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
2037+ case heightBagSize heights `compare` DMap.size parents of
2038+ LT -> return ()
2039+ EQ -> do
2040+ let height = succHeight $ heightBagMax heights
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2042+ writeIORef (_merge_heightRef m) $! height
2043+ subscriberRecalculateHeight (_merge_sub m) height
2044+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2045+
2046+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047+scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048+ vals <- liftIO $ readIORef $ _merge_accumRef m
2049+ -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us,
2050+ -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052+ --TODO: Assert that m is not empty
2053+ subscriberPropagate (_merge_sub m) vals
2054+
2055+checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056+checkCycle subscribed = liftIO $ do
2057+ height <- readIORef (eventSubscribedHeightRef subscribed)
2058+
2059+ -- currentHeight <- getCurrentHeight
2060+ -- when (height <= currentHeight) $ if height /= invalidHeight
2061+ -- then do
2062+ -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063+ -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2064+ -- else liftIO $
2065+ when (height == invalidHeight) $
2066+#ifdef DEBUG_CYCLES
2067+ do
2068+ nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069+ stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070+ throwIO (EventLoopException stacks)
2071+#else
2072+ throwIO EventLoopException
2073+#endif
2074+
2075+
2076+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077+mergeSubscriber subscribed m getKey = Subscriber
2078+ { subscriberPropagate = \a -> do
2079+ oldM <- liftIO $ readIORef $ _merge_accumRef m
2080+ k <- getKey
2081+ let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
2082+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083+ liftIO $ writeIORef (_merge_accumRef m) $! newM
2084+ when (DMap.null oldM) $ do -- Only schedule the firing once
2085+ height <- liftIO $ readIORef $ _merge_heightRef m
2086+ checkCycle subscribed
2087+
2088+ scheduleMergeSelf m height
2089+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090+ modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
2091+ invalidateMergeHeight m
2092+ , subscriberRecalculateHeight = \new -> do
2093+ modifyIORef' (_merge_heightBagRef m) $ heightBagAdd new
2094+ revalidateMergeHeight m
16972095 }
16982096
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+
16992281newtype 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) }
17002283
1701−fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
1702−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
17032287 let f = Fan
17042288 { fanParent = e
1705− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
17062290 }
1707− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
17082292
1709−runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1710−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
17112295 holdInits <- liftIO $ readIORef holdInitRef
2296+ dynInits <- liftIO $ readIORef dynInitRef
17122297 mergeInits <- liftIO $ readIORef mergeInitRef
1713− unless (null holdInits && null mergeInits) $ do
2298+ unless (null holdInits && null dynInits && null mergeInits) $ do
17142299 liftIO $ writeIORef holdInitRef []
2300+ liftIO $ writeIORef dynInitRef []
17152301 liftIO $ writeIORef mergeInitRef []
17162302 mapM_ initHold holdInits
1717− mapM_ initMerge mergeInits
1718− runHoldInits holdInitRef mergeInitRef
2303+ mapM_ initDyn dynInits
2304+ mapM_ unSomeMergeInit mergeInits
2305+ runHoldInits holdInitRef dynInitRef mergeInitRef
17192306
1720−initHold :: SomeHoldInit x -> EventM x ()
2307+initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
17212308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
17222309
1723−initMerge :: SomeMergeInit x -> EventM x ()
1724−initMerge (SomeMergeInit subscribed changed) = do
1725− changeSub <- liftIO $ newSubscriberMergeChange subscribed
1726− (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1727− forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1728− liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2310+initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311+initDyn (SomeDynInit d) = void $ getDynHold d
17292312
1730−-- | Run an event action outside of a frame
1731−runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1732−runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
1733− -- 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
1734− pendingCleanups <- atomicModifyIORef (_spiderTimeline_cleanups spiderTimeline) $ \x -> ([], x)
1735− {-# SCC "cleanups" #-} sequence_ pendingCleanups
2313+newEventEnv :: IO (EventEnv x)
2314+newEventEnv = do
17362315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
17372316 holdInitRef <- newIORef []
2317+ dynInitRef <- newIORef []
17382318 mergeUpdateRef <- newIORef []
17392319 mergeInitRef <- newIORef []
17402320 heightRef <- newIORef zeroHeight
17412321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
17422323 toClearRootRef <- newIORef []
17432324 coincidenceInfosRef <- newIORef []
1744− delayedRef <- liftIO $ newIORef IntMap.empty
1745− let env = EventEnv spiderTimeline 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)
17462346 let go = do
17472347 result <- a
1748− 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
17492349 return result
1750− result <- runEventM go env
1751− toClear <- readIORef toClearRef
1752− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1753− toClearRoot <- readIORef toClearRootRef
1754− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1755− 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
17562358 toReconnectRef <- newIORef []
1757− coincidenceInfos <- readIORef coincidenceInfosRef
2359+ coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
17582360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
17592361 writeIORef vRef v
1760− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
17612363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1762− mergeUpdates <- readIORef mergeUpdateRef
1763− writeIORef mergeUpdateRef []
1764− let updateMerge :: SomeMergeUpdate x -> IO [SomeEventSubscription x]
1765− updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap (DMap k (Event x))) m) = do
1766− oldParents <- readIORef $ mergeSubscribedParents m
1767− let f (subscriptionsToKill, ps) (k :=> Compose me) = do
1768− (mOldSubd, newPs) <- case me of
1769− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1770− Just e -> do
1771− s <- liftIO $ newSubscriberMerge k m
1772− subscription@(EventSubscription _ subd) <- subscribe e s
1773− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1774− let newParent = MergeSubscribedParent subscription s
1775− liftIO $ addMergeHeight newParentHeight m
1776− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1777− forM_ mOldSubd $ \oldSubd -> do
1778− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1779− liftIO $ removeMergeHeight oldHeight m
1780− return (maybeToList (SomeEventSubscription . mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1781− (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
1782− writeIORef (mergeSubscribedParents m) $! newParents
1783− return subscriptionsToKill
1784− when debugPropagate $ putStrLn "Updating merges"
1785− mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1786− 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"
17872369 toReconnect <- readIORef toReconnectRef
2370+ clearEventEnv env
17882371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
17892372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
17902373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1791− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
17922375 finalize wi
17932376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
17942377 wi' <- mkWeakPtrWithDebug i "wi'"
17952378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
17962379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1797− writeIORef holdInitRef [] --TODO: Should we reuse this?
1798− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1799− 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
18002383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
18012384 sub <- newSubscriberSwitch subscribed
1802− subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderTimeline --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
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
18032386 {-
18042387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1805− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
18062389 EventRoot _ -> "EventRoot"
18072390 EventNever -> "EventNever"
18082391 _ -> "something else"
18092392 -}
18102393 writeIORef (switchSubscribedCurrentParent subscribed) $! subscription
1811− return $ SomeEventSubscription oldSubscription
1812− forM_ mergeSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
1813− forM_ switchSubscriptionsToKill $ \(SomeEventSubscription oldSubscription) -> liftIO $ unsubscribe oldSubscription
2394+ return oldSubscription
2395+ liftIO $ mapM_ unsubscribe mergeSubscriptionsToKill
2396+ liftIO $ mapM_ unsubscribe switchSubscriptionsToKill
18142397 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
18152398 EventSubscription _ subd' <- readIORef $ switchSubscribedCurrentParent subscribed
18162399 parentHeight <- getEventSubscribedHeight subd'
18172400 myHeight <- readIORef $ switchSubscribedHeight subscribed
18182401 when (parentHeight /= myHeight) $ do
18192402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1820− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1821− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1822− 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
18232405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
18242406 unsubscribe subscription
18252407 mapM_ invalidateCoincidenceHeight mcs
18262408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1827− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2409+ mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
18282410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
18292411 height <- calculateSwitchHeight subscribed
18302412 updateSwitchHeight height subscribed
@@ -1854,50 +2436,12 @@ succHeight h@(Height a) =
18542436 then invalidHeight
18552437 else Height $ succ a
18562438
1857−removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1858−removeMergeHeight oldParentHeight subscribed = do
1859− when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1860− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1861− let newHeights = heightBagRemove oldParentHeight oldHeights
1862− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1863−
1864−invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1865−invalidateMergeHeight subscribed = do
1866− oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1867− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1868− when (oldHeight /= invalidHeight) $ do
1869− writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1870− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1871−
1872−addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1873−addMergeHeight newParentHeight subscribed = do
1874− when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1875− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1876− let newHeights = heightBagAdd newParentHeight oldHeights
1877− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1878−
1879−revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1880−revalidateMergeHeight subscribed = do
1881− currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1882− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1883− heights <- readIORef $ mergeSubscribedHeightBag subscribed
1884− parents <- readIORef $ mergeSubscribedParents subscribed
1885− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1886− case heightBagSize heights `compare` DMap.size parents of
1887− LT -> return ()
1888− EQ -> do
1889− let height = succHeight $ heightBagMax heights
1890− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1891− writeIORef (mergeSubscribedHeight subscribed) $! height
1892− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1893− GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1894−
18952439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
18962440invalidateCoincidenceHeight subscribed = do
18972441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
18982442 when (oldHeight /= invalidHeight) $ do
18992443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1900− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
19012445
19022446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
19032447updateSwitchHeight new subscribed = do
@@ -1905,7 +2449,7 @@ updateSwitchHeight new subscribed = do
19052449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19062450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
19072451 writeIORef (switchSubscribedHeight subscribed) $! new
1908− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
19092453
19102454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
19112455recalculateCoincidenceHeight subscribed = do
@@ -1914,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
19142458 height <- calculateCoincidenceHeight subscribed
19152459 when (height /= invalidHeight) $ do
19162460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1917− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
19182462
19192463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
19202464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -1953,161 +2497,170 @@ invalidate toReconnectRef wis = do
19532497-- Reflex integration
19542498--------------------------------------------------------------------------------
19552499
1956−-- | The default, global Spider environment
1957−type Spider = SpiderTimeline Global
1958−
19592500-- | Designates the default, global Spider timeline
1960−data Global
1961−
1962−{-# NOINLINE globalSpiderTimeline #-}
1963−globalSpiderTimeline :: SpiderTimeline Global
1964−globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
1965−
1966−-- | Stores all global data relevant to a particular Spider timeline; only one
1967−-- value should exist for each type @x@
1968−data SpiderTimeline x = SpiderTimeline
1969− { _spiderTimeline_toUnsubscribe :: !(IORef [SomeEventSubscription x])
1970− , _spiderTimeline_lock :: !(MVar ())
1971− , _spiderTimeline_cleanups :: !(IORef [IO ()])
1972−#ifdef DEBUG
1973− , _spiderTimeline_depth :: !(IORef Int)
1974−#endif
1975− }
2501+data SpiderTimeline x
19762502type role SpiderTimeline nominal
19772503
1978−instance GEq SpiderTimeline where
1979− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1980− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
1981− else Nothing
1982−
1983−unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
1984−unsafeNewSpiderTimeline = do
1985− toUnsubscribe <- newIORef []
1986− lock <- newMVar ()
1987− cleanups <- newIORef []
1988−#ifdef DEBUG
1989− depthRef <- newIORef 0
1990−#endif
1991− return $ SpiderTimeline
1992− { _spiderTimeline_toUnsubscribe = toUnsubscribe
1993− , _spiderTimeline_lock = lock
1994− , _spiderTimeline_cleanups = cleanups
1995−#ifdef DEBUG
1996− , _spiderTimeline_depth = depthRef
1997−#endif
1998− }
1999−
2000−-- | Create a new SpiderTimeline
2001−newSpiderTimeline :: IO (Some SpiderTimeline)
2002−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2003−
2004−-- | Pass a new timeline to the given function.
2005−withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
2006−withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
2007−
2008−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2009−
2010−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2011−
2012−instance R.Reflex (SpiderTimeline x) where
2013− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2014− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2015− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x Identity a } deriving (Functor, Applicative, Monad)
2016− newtype Incremental (SpiderTimeline x) p a = SpiderIncremental { unSpiderIncremental :: Dynamic x p a }
2017− type PullM (SpiderTimeline x) = SpiderPullM x
2018− type PushM (SpiderTimeline x) = SpiderPushM x
2019− {-# INLINABLE never #-}
2020− never = SpiderEvent eventNever
2021− {-# INLINABLE constant #-}
2022− constant = SpiderBehavior . behaviorConst
2023− {-# INLINABLE push #-}
2024− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2025− {-# INLINABLE pull #-}
2026− pull = SpiderBehavior . pull . coerce
2027− {-# INLINABLE merge #-}
2028− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2029− {-# INLINABLE fan #-}
2030− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2031− {-# INLINABLE switch #-}
2032− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2033− {-# INLINABLE coincidence #-}
2034− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2035− {-# INLINABLE current #-}
2036− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2037− {-# INLINABLE updated #-}
2038− updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2039− {-# INLINABLE unsafeBuildDynamic #-}
2040− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2041− {-# INLINABLE unsafeBuildIncremental #-}
2042− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2043− {-# INLINABLE mergeIncremental #-}
2044− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x R.PatchDMap (DMap k (R.Event (SpiderTimeline x))) -> Dynamic x R.PatchDMap (DMap k (Event x))) . unSpiderIncremental
2045− {-# INLINABLE currentIncremental #-}
2046− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2047− {-# INLINABLE updatedIncremental #-}
2048− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2049− {-# INLINABLE incrementalToDynamic #-}
2050− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2051− c <- readBehaviorUntracked $ dynamicCurrent i
2052− return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2504+-- | The default, global Spider environment
2505+type Spider = SpiderTimeline Global
20532506
2054−instance R.MonadSample (SpiderTimeline x) (EventM x) where
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
20552508 {-# INLINABLE sample #-}
20562509 sample (SpiderBehavior b) = readBehaviorUntracked b
20572510
2058−instance R.MonadHold (SpiderTimeline x) (EventM x) where
2511+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
20592512 {-# INLINABLE hold #-}
20602513 hold = holdSpiderEventM
20612514 {-# INLINABLE holdDyn #-}
20622515 holdDyn = holdDynSpiderEventM
20632516 {-# INLINABLE holdIncremental #-}
20642517 holdIncremental = holdIncrementalSpiderEventM
2518+ {-# INLINABLE buildDynamic #-}
2519+ buildDynamic = buildDynamicSpiderEventM
2520+ {-# INLINABLE headE #-}
2521+ headE = R.slowHeadE
2522+-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2525+
2526+instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527+ {-# INLINABLE sample #-}
2528+ sample = coerce . readBehaviorTracked . unSpiderBehavior
2529+
2530+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531+ {-# INLINABLE sample #-}
2532+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533+
2534+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535+ {-# INLINABLE hold #-}
2536+ hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537+ {-# INLINABLE holdDyn #-}
2538+ holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539+ {-# INLINABLE holdIncremental #-}
2540+ holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541+ {-# INLINABLE buildDynamic #-}
2542+ buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543+ {-# INLINABLE headE #-}
2544+ headE = R.slowHeadE
2545+-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2548+
2549+
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551+ {-# INLINE return #-}
2552+ return = pure
2553+ {-# INLINE (>>=) #-}
2554+ x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555+ {-# INLINE (>>) #-}
2556+ (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2558+ {-# INLINE fail #-}
2559+ fail _ = error "Dynamic does not support 'fail'"
2560+#endif
20652561
2066−holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2067−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
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
20682588
2069−holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2070−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
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
20712591
2072−holdIncrementalSpiderEventM :: R.Patch p => a -> R.Event (SpiderTimeline x) (p a) -> EventM x (R.Incremental (SpiderTimeline x) p a)
2073−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2592+holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
20742594
2075−instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
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
20762602 {-# INLINABLE hold #-}
2077− hold v0 e = R.runHostFrame $ R.hold v0 e
2603+ hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
20782604 {-# INLINABLE holdDyn #-}
2079− holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2605+ holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
20802606 {-# INLINABLE holdIncremental #-}
2081− holdIncremental v0 e = R.runHostFrame $ R.holdIncremental v0 e
2607+ holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608+ {-# INLINABLE buildDynamic #-}
2609+ buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610+ {-# INLINABLE headE #-}
2611+ headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614+
2615+
2616+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617+ sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
20822618
2083−instance R.MonadSample (SpiderTimeline x) (SpiderHost x) where
2619+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620+ {-# INLINABLE hold #-}
2621+ hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622+ {-# INLINABLE holdDyn #-}
2623+ holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624+ {-# INLINABLE holdIncremental #-}
2625+ holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626+ {-# INLINABLE buildDynamic #-}
2627+ buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628+ {-# INLINABLE headE #-}
2629+ headE = R.slowHeadE
2630+-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2633+
2634+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
20842635 {-# INLINABLE sample #-}
20852636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
20862637
2087−instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2088− {-# INLINABLE sample #-}
2089− sample = coerce . readBehaviorTracked . unSpiderBehavior
2090−
2091−instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2638+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
20922639 {-# INLINABLE sample #-}
2093− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2640+ sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
20942641
2095−instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2642+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
20962643 {-# INLINABLE hold #-}
2097− hold v0 e = R.current <$> R.holdDyn v0 e
2644+ hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
20982645 {-# INLINABLE holdDyn #-}
2099− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce e
2646+ holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
21002647 {-# INLINABLE holdIncremental #-}
2101− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> hold v0 e
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
21022655
2103−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2104−
2105−data SpiderEventHandle x a = SpiderEventHandle
2106− { spiderEventHandleSubscription :: EventSubscription x a
2107− , spiderEventHandleValue :: IORef (Maybe a)
2108− }
2656+--------------------------------------------------------------------------------
2657+-- Deprecated items
2658+--------------------------------------------------------------------------------
21092659
2110−instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2660+-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661+{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662+type SpiderEnv = SpiderTimeline
2663+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
21112664 {-# INLINABLE subscribeEvent #-}
21122665 subscribeEvent e = SpiderHostFrame $ do
21132666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2124,18 +2677,149 @@ instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
21242677 , spiderEventHandleValue = val
21252678 }
21262679
2127−instance R.ReflexHost (SpiderTimeline x) where
2680+instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
21282681 type EventTrigger (SpiderTimeline x) = RootTrigger x
21292682 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
21302683 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
21312684
2132−instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2685+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
21332686 {-# NOINLINE readEvent #-}
2134− readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2687+ readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
21352688 result <- readIORef $ spiderEventHandleValue h
21362689 touch h
21372690 return result
21382691
2692+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693+ newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694+ newFanEventWithTrigger f = SpiderHost $ do
2695+ es <- newFanEventWithTriggerIO f
2696+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697+
2698+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699+ newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700+ newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701+ es <- newFanEventWithTriggerIO f
2702+ return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703+
2704+instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705+ {-# INLINABLE subscribeEvent #-}
2706+ subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2707+
2708+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709+ type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710+ fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711+ runHostFrame = runFrame . runSpiderHostFrame
2712+
2713+unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
2714+unsafeNewSpiderTimelineEnv = do
2715+ lock <- newMVar ()
2716+ env <- newEventEnv
2717+#ifdef DEBUG
2718+ depthRef <- newIORef 0
2719+#endif
2720+ return $ STE $ SpiderTimelineEnv
2721+ { _spiderTimeline_lock = lock
2722+ , _spiderTimeline_eventEnv = env
2723+#ifdef DEBUG
2724+ , _spiderTimeline_depth = depthRef
2725+#endif
2726+ }
2727+
2728+-- | Create a new SpiderTimelineEnv
2729+newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730+newSpiderTimeline = withSpiderTimeline (pure . Some)
2731+
2732+data LocalSpiderTimeline (x :: Type) s
2733+
2734+instance Reifies s (SpiderTimelineEnv x) =>
2735+ HasSpiderTimeline (LocalSpiderTimeline x s) where
2736+ spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2737+
2738+localSpiderTimeline
2739+ :: proxy s
2740+ -> SpiderTimelineEnv x
2741+ -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742+localSpiderTimeline _ = coerce
2743+
2744+-- | Pass a new timeline to the given function.
2745+withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2746+withSpiderTimeline k = do
2747+ env <- unsafeNewSpiderTimelineEnv
2748+ reify env $ \s -> k $ localSpiderTimeline s env
2749+
2750+newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751+
2752+type ComputeM = EventM
2753+
2754+newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2755+
2756+instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757+ {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758+ newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759+ newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2760+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: DynamicS x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2762+ type PullM (SpiderTimeline x) = SpiderPullM x
2763+ type PushM (SpiderTimeline x) = SpiderPushM x
2764+ {-# INLINABLE never #-}
2765+ never = SpiderEvent eventNever
2766+ {-# INLINABLE constant #-}
2767+ constant = SpiderBehavior . behaviorConst
2768+ {-# INLINE push #-}
2769+ push f = SpiderEvent . push (coerce f) . unSpiderEvent
2770+ {-# INLINE pushCheap #-}
2771+ pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772+ {-# INLINABLE pull #-}
2773+ pull = SpiderBehavior . pull . coerce
2774+ {-# INLINABLE fanG #-}
2775+ fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776+ {-# INLINABLE mergeG #-}
2777+ mergeG
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779+ => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780+ -> DMap k q
2781+ -> R.Event (SpiderTimeline x) (DMap k v)
2782+ mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783+ {-# INLINABLE switch #-}
2784+ switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785+ {-# INLINABLE coincidence #-}
2786+ coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2787+ {-# INLINABLE current #-}
2788+ current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789+ {-# INLINABLE updated #-}
2790+ updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2791+ {-# INLINABLE unsafeBuildDynamic #-}
2792+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793+ {-# INLINABLE unsafeBuildIncremental #-}
2794+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795+ {-# INLINABLE mergeIncrementalG #-}
2796+ mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797+ {-# INLINABLE mergeIncrementalWithMoveG #-}
2798+ mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2799+ {-# INLINABLE currentIncremental #-}
2800+ currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801+ {-# INLINABLE updatedIncremental #-}
2802+ updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2803+ {-# INLINABLE incrementalToDynamic #-}
2804+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2805+ c <- readBehaviorUntracked $ dynamicCurrent i
2806+ return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807+ eventCoercion Coercion = Coercion
2808+ behaviorCoercion Coercion = Coercion
2809+ dynamicCoercion Coercion = Coercion
2810+ incrementalCoercion Coercion Coercion = Coercion
2811+ {-# INLINABLE mergeIntIncremental #-}
2812+ mergeIntIncremental = SpiderEvent . mergeInt . coerce
2813+ {-# INLINABLE fanInt #-}
2814+ fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2815+
2816+data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2817+
2818+data SpiderEventHandle x a = SpiderEventHandle
2819+ { spiderEventHandleSubscription :: EventSubscription x
2820+ , spiderEventHandleValue :: IORef (Maybe a)
2821+ }
2822+
21392823instance MonadRef (EventM x) where
21402824 type Ref (EventM x) = Ref IO
21412825 {-# INLINABLE newRef #-}
@@ -2150,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
21502834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
21512835
21522836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2153−newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimeline 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)
21542838
21552839instance Monad (SpiderHost x) where
21562840 {-# INLINABLE (>>=) #-}
@@ -2159,20 +2843,27 @@ instance Monad (SpiderHost x) where
21592843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
21602844 {-# INLINABLE return #-}
21612845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
21622847 {-# INLINABLE fail #-}
2163− 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
21642854
21652855-- | Run an action affecting the global Spider timeline; this will be guarded by
21662856-- a mutex for that timeline
21672857runSpiderHost :: SpiderHost Global a -> IO a
2168−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2858+runSpiderHost (SpiderHost a) = a
21692859
21702860-- | Run an action affecting a given Spider timeline; this will be guarded by a
21712861-- mutex for that timeline
2172−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2173−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2862+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
21742864
2175−newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2865+newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866+ deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
21762867
21772868instance Monad (SpiderHostFrame x) where
21782869 {-# INLINABLE (>>=) #-}
@@ -2181,26 +2872,21 @@ instance Monad (SpiderHostFrame x) where
21812872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
21822873 {-# INLINABLE return #-}
21832874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
21842876 {-# INLINABLE fail #-}
21852877 fail s = SpiderHostFrame $ fail s
2878+#endif
21862879
2187−instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2188− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2189−
2190−instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2191− {-# INLINABLE hold #-}
2192− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2193− {-# INLINABLE holdDyn #-}
2194− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2195− {-# INLINABLE holdIncremental #-}
2196− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
2880+instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881+ notReadyUntil _ = pure ()
2882+ notReady = pure ()
21972883
2198−newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2884+newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
21992885newEventWithTriggerIO f = do
22002886 es <- newFanEventWithTriggerIO $ \Refl -> f
22012887 return $ select es Refl
22022888
2203−newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2889+newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
22042890newFanEventWithTriggerIO f = do
22052891 occRef <- newIORef DMap.empty
22062892 subscribedRef <- newIORef DMap.empty
@@ -2211,41 +2897,8 @@ newFanEventWithTriggerIO f = do
22112897 }
22122898 return $ EventSelector $ \k -> eventRoot k r
22132899
2214−instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2215− newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2216− newFanEventWithTrigger f = SpiderHost $ lift $ do
2217− es <- newFanEventWithTriggerIO f
2218− return $ R.EventSelector $ SpiderEvent . select es
2219−
2220−instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2221− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2222− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2223− es <- newFanEventWithTriggerIO f
2224− return $ R.EventSelector $ SpiderEvent . select es
2225−
2226−instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2227− {-# INLINABLE subscribeEvent #-}
2228− subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2229−
22302900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
22312901
2232−instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2233− {-# INLINABLE sample #-}
2234− sample = ReadPhase . R.sample
2235−
2236−instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2237− {-# INLINABLE hold #-}
2238− hold v0 e = ReadPhase $ R.hold v0 e
2239− {-# INLINABLE holdDyn #-}
2240− holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2241− {-# INLINABLE holdIncremental #-}
2242− holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2243−
2244−instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2245− type ReadPhase (SpiderHost x) = ReadPhase x
2246− fireEventsAndRead es (ReadPhase a) = run es a
2247− runHostFrame = runFrame . runSpiderHostFrame
2248−
22492902instance MonadRef (SpiderHost x) where
22502903 type Ref (SpiderHost x) = Ref IO
22512904 newRef = SpiderHost . newRef
@@ -2268,9 +2921,10 @@ instance PrimMonad (SpiderHostFrame x) where
22682921 type PrimState (SpiderHostFrame x) = PrimState IO
22692922 primitive = SpiderHostFrame . EventM . primitive
22702923
2271−--------------------------------------------------------------------------------
2272−-- Deprecated items
2273−--------------------------------------------------------------------------------
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
22742927
2275−{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2276−type SpiderEnv = SpiderTimeline
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()