@@ -9,71 +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
4055import Data.Functor.Constant
56+import Data.Functor.Misc
4157import Data.Functor.Product
4258import Data.GADT.Compare
4359import Data.IntMap.Strict (IntMap)
4460import qualified Data.IntMap.Strict as IntMap
4561import Data.IORef
46−import Data.List hiding (foldl')
47−import Data.Maybe
48−import Data.Monoid ((<>))
49−import Data.Some (Some)
50−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
5166import Data.These
5267import Data.Traversable
53−import Data.Type.Coercion
54−import Data.Word
55−import GHC.Exts
68+import Data.Type.Equality ((:~:)(Refl))
69+import Data.Witherable (Filterable, mapMaybe)
70+import GHC.Exts hiding (toList)
5671import GHC.IORef (IORef (..))
5772import GHC.Stack
73+import Reflex.FastWeak
5874import System.IO.Unsafe
5975import System.Mem.Weak
6076import Unsafe.Coerce
6177
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+
6287#ifdef DEBUG_CYCLES
6388import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89+#endif
90+
6491import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
6592import qualified Data.List.NonEmpty as NonEmpty
66−import Data.Monoid (mempty)
6793import Data.Tree (Forest, Tree (..), drawForest)
68−#endif
94+import Data.List (isPrefixOf)
95+
96+import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97+import qualified Data.FastWeakBag as FastWeakBag
6998
70−import Data.WeakBag (WeakBag, WeakBagTicket)
99+import Data.Reflection
100+import Data.Some (Some(Some))
101+import Data.Type.Coercion
102+import Data.Profunctor.Unsafe ((#.), (.#))
103+import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
71104import qualified Data.WeakBag as WeakBag
105+import qualified Reflex.Class
72106import qualified Reflex.Class as R
73−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
74118
75−-- Note: must come last to silence warnings due to AMP on GHC < 7.10
76−import Prelude hiding (any, concat, mapM, mapM_, sequence)
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
122+
123+#ifdef DEBUG_TRACE_EVENTS
124+withStackOneLine :: (BS8.ByteString -> a) -> a
125+withStackOneLine expr = unsafePerformIO $ do
126+ stack <- currentCallStack
127+ return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128+ where dropInternal = filterStack "Reflex.Spider.Internal"
129+
130+#endif
77131
78132debugPropagate :: Bool
79133
@@ -82,31 +136,42 @@ debugInvalidateHeight :: Bool
82136debugInvalidate :: Bool
83137
84138#ifdef DEBUG
85−
86139#define DEBUG_NODEIDS
87140
141+#ifdef DEBUG_TRACE_PROPAGATION
88142debugPropagate = True
143+#else
144+debugPropagate = False
145+#endif
89146
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
149+#else
90150debugInvalidateHeight = False
151+#endif
91152
153+#ifdef DEBUG_TRACE_INVALIDATION
92154debugInvalidate = True
155+#else
156+debugInvalidate = False
157+#endif
93158
94159class HasNodeId a where
95160 getNodeId :: a -> Int
96161
97−instance HasNodeId (Hold x p a) where
98− 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
99167
100−instance HasNodeId (PushSubscribed x a b) where
101− getNodeId = pushSubscribedNodeId
168+instance HasNodeId (Hold x p) where
169+ getNodeId = holdNodeId
102170
103171instance HasNodeId (SwitchSubscribed x a) where
104172 getNodeId = switchSubscribedNodeId
105173
106−instance HasNodeId (MergeSubscribed x a) where
107− getNodeId = mergeSubscribedNodeId
108−
109−instance HasNodeId (FanSubscribed x a) where
174+instance HasNodeId (FanSubscribed x v a) where
110175 getNodeId = fanSubscribedNodeId
111176
112177instance HasNodeId (CoincidenceSubscribed x a) where
@@ -120,41 +185,16 @@ instance HasNodeId (Pull x a) where
120185
121186{-# INLINE showNodeId #-}
122187showNodeId :: HasNodeId a => a -> String
123−showNodeId = ("#"<>) . show . getNodeId
124−
125−showSubscriberType :: Subscriber x a -> String
126−showSubscriberType = \case
127− SubscriberPush _ _ -> "SubscriberPush"
128− SubscriberMerge _ _ -> "SubscriberMerge"
129− SubscriberFan _ -> "SubscriberFan"
130− SubscriberMergeChange _ -> "SubscriberMergeChange"
131− SubscriberHold _ -> "SubscriberHold"
132− SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
133− SubscriberSwitch _ -> "SubscriberSwitch"
134− SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
135− SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
136− SubscriberHandle -> "SubscriberHandle"
137−
138−showEventType :: Event x a -> String
139−showEventType = \case
140− EventRoot _ _ -> "EventRoot"
141− EventNever -> "EventNever"
142− EventPush _ -> "EventPush"
143− EventMerge _ -> "EventMerge"
144− EventFan _ _ -> "EventFan"
145− EventSwitch _ -> "EventSwitch"
146− EventCoincidence _ -> "EventCoincidence"
147− EventHold _ -> "EventHold"
148− EventDyn _ -> "EventDyn"
149− EventHoldIdentity _ -> "EventHoldIdentity"
150− EventDynIdentity _ -> "EventDynIdentity"
188+showNodeId = showNodeId' . getNodeId
189+
190+showNodeId' :: Int -> String
191+showNodeId' = ("#"<>) . show
192+
151193
152194#else
153195
154196debugPropagate = False
155−
156197debugInvalidateHeight = False
157−
158198debugInvalidate = False
159199
160200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -162,6 +202,10 @@ debugInvalidate = False
162202showNodeId :: a -> String
163203showNodeId _ = ""
164204
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
207+showNodeId' _ = ""
208+
165209#endif
166210
167211#ifdef DEBUG_NODEIDS
@@ -171,93 +215,200 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
171215
172216newNodeId :: IO Int
173217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
174−
175−{-# NOINLINE unsafeNodeId #-}
176−unsafeNodeId :: a -> Int
177−unsafeNodeId a = unsafePerformIO $ do
178− touch a
179− newNodeId
180218#endif
181219
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+
182234--------------------------------------------------------------------------------
183235-- Event
184236--------------------------------------------------------------------------------
185237
186−newtype Event x a = Event { subscribeAndRead :: Subscriber x a -> EventM x (EventSubscription x, 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+ #-}
187249
188250-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
189251-- caching; if the computation function is very cheap, this is (much) more
190252-- efficient than 'push'
191−{-# INLINABLE pushCheap #-}
192−pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
193−pushCheap f e = Event $ \sub -> do
194− (subscription, occ) <- subscribeAndRead e $ sub
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
195257 { subscriberPropagate = \a -> do
196− mb <- runComputeM $ f a
258+ mb <- f a
197259 mapM_ (subscriberPropagate sub) mb
198260 }
199− occ' <- join <$> mapM (runComputeM . f) occ
261+ occ' <- join <$> mapM f occ
200262 return (subscription, occ')
201263
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+
202301data CacheSubscribed x a
203− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
204− , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
302+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
205303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
206− , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
207304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305+#ifdef DEBUG_NODEIDS
306+ , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307+#endif
208308 }
209309
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+
210325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
211326-- repeatedly
212327--
213328--TODO: Try a caching strategy where we subscribe directly to the parent when
214−--there's only one subscriber, and then build our own WeakBag only when a second
329+--there's only one subscriber, and then build our own FastWeakBag only when a second
215330--subscriber joins
216−{-# INLINABLE cacheEvent #-}
217−cacheEvent :: Event x a -> Event x a
218−cacheEvent e = Event $ \sub -> do
219− let !mSubscribedRef = unsafeNewIORef e Nothing
220− mSubscribed <- liftIO $ readIORef mSubscribedRef
221− case mSubscribed of
222− Just subscribed -> liftIO $ do
223− ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
224− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
225− let es = EventSubscribed
226− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
227− , eventSubscribedRetained = toAny subscribed
228− }
229− return (EventSubscription (Just ticket) es, occ)
230− Nothing -> do
231− weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
232− (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
233− occRef <- liftIO $ newIORef undefined
234− (parentSub, occ) <- subscribeAndRead e $ Subscriber
235− { subscriberPropagate = \a -> do
236− liftIO $ writeIORef occRef $ Just a
237− scheduleClear occRef
238− propagate a subscribers
239− , subscriberInvalidateHeight = \old -> do
240− WeakBag.traverse subscribers $ invalidateSubscriberHeight old
241− , subscriberRecalculateHeight = \new -> do
242− WeakBag.traverse subscribers $ recalculateSubscriberHeight new
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+ }
243409 }
244− liftIO $ writeIORef occRef occ
245− when (isJust occ) $ scheduleClear occRef
246− let !subscribed = CacheSubscribed
247− { _cacheSubscribed_subscribers = subscribers
248− , _cacheSubscribed_weakSelf = weakSelf
249− , _cacheSubscribed_parent = parentSub
250− , _cacheSubscribed_cached = mSubscribedRef
251− , _cacheSubscribed_occurrence = occRef
252− }
253− liftIO $ writeIORef mSubscribedRef $ Just subscribed
254− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
255− return (EventSubscription (Just ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
410+ return (es, occ)
256411
257−cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
258−cleanupCacheSubscribed self = do
259− unsubscribe $ _cacheSubscribed_parent self
260− writeIORef (_cacheSubscribed_cached self) Nothing
261412
262413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
263414subscribe e s = fst <$> subscribeAndRead e s
@@ -267,34 +418,34 @@ wrap :: MonadIO m => (t -> EventSubscribed x) -> (Subscriber x a -> m (WeakBagTi
267418wrap tag getSpecificSubscribed sub = do
268419 (sln, subd, occ) <- getSpecificSubscribed sub
269420 let es = tag subd
270− return (EventSubscription (Just sln) es, occ)
421+ return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
271422
272−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
273424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
274425
275−eventNever :: Event x a
276−eventNever = Event $ \_ -> return (EventSubscription Nothing eventSubscribedNever, Nothing)
426+subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427+subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
277428
278−eventMerge :: (GCompare k, a ~ DMap k Identity) => Merge x k -> Event x a
279−eventMerge !m = Event $ wrap eventSubscribedMerge $ getMergeSubscribed m
429+eventNever :: Event x a
430+eventNever = Event $ const subscribeAndReadNever
280431
281−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)
282433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
283434
284−eventSwitch :: Switch x a -> Event x a
435+eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
285436eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
286437
287−eventCoincidence :: Coincidence x a -> Event x a
438+eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
288439eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
289440
290441eventHold :: Hold x p -> Event x p
291442eventHold !h = Event $ subscribeHoldEvent h
292443
293−eventDyn :: R.Patch p => Dyn x p -> Event x p
444+eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
294445eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
295446
296447{-# INLINE subscribeCoincidenceInner #-}
297−subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
448+subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
298449subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
299450 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
300451 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -313,150 +464,75 @@ data Subscriber x a = Subscriber
313464 , subscriberRecalculateHeight :: !(Height -> IO ())
314465 }
315466
316−--TODO: Move this comment to WeakBag
317−-- These function are constructor functions that are marked NOINLINE so they are
318−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
319−-- so any weak references that are attached to the constructors will have their
320−-- finalizer run. Using the opaque constructor, does not see the
321−-- constructor application, so it behaves like an IORef and cannot be fused away.
322−--
323−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
324−-- the weak pointer to it in some cases.
325−
326−newSubscriberHold :: R.Patch p => Hold x p -> IO (Subscriber x p)
467+newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
327468newSubscriberHold h = return $ Subscriber
328469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
329470 , subscriberInvalidateHeight = \_ -> return ()
330471 , subscriberRecalculateHeight = \_ -> return ()
331472 }
332473
333−newSubscriberMerge :: GCompare k => k a -> MergeSubscribed x k -> IO (Subscriber x a)
334−newSubscriberMerge k subscribed = return $ Subscriber
335− { subscriberPropagate = \a -> {-# SCC "traverseMerge" #-} do
336− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
337− oldM <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
338− let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge" <> showNodeId subscribed) k (Identity a) oldM
339− tracePropagate $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
340− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! newM
341− when (DMap.null oldM) $ do -- Only schedule the firing once
342− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
343− --TODO: assertions about height
344− currentHeight <- getCurrentHeight
345− when (height <= currentHeight) $ do
346− if height /= invalidHeight
347− then do
348− myStack <- liftIO $ whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
349− error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
350− else liftIO $ do
351−#ifdef DEBUG_CYCLES
352− nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
353− stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
354− let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
355−#else
356− let cycleInfo = ""
357−#endif
358− error $ "Causality loop found" <> cycleInfo
359− scheduleMerge height subscribed
360− , subscriberInvalidateHeight = \old -> do
361− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
362− removeMergeHeight old subscribed
363− invalidateMergeHeight subscribed
364− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
365− , subscriberRecalculateHeight = \new -> do
366− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed
367− addMergeHeight new subscribed
368− revalidateMergeHeight subscribed
369− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberMerge" <> showNodeId subscribed <> " done"
370− }
371−
372−newSubscriberMergeChange :: GCompare k => MergeSubscribed x k -> IO (Subscriber x (R.PatchDMap k (Event x)))
373−newSubscriberMergeChange subscribed = return $ Subscriber
374− { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
375− tracePropagate $ "SubscriberMerge" <> showNodeId subscribed
376− defer $ SomeMergeUpdate a subscribed
377− , subscriberInvalidateHeight = \_ -> return ()
378− , subscriberRecalculateHeight = \_ -> return ()
379− }
380−
381−newSubscriberFan :: GCompare k => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
382−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
383476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
384477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
385− 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"
386479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
387480 scheduleClear $ fanSubscribedOccurrence subscribed
388− let f _ (Pair (Identity v) subsubs) = do
481+ let f _ (Pair v subsubs) = do
389482 propagate v $ _fanSubscribedChildren_list subsubs
390483 return $ Constant ()
391484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
392485 return ()
393486 , subscriberInvalidateHeight = \old -> do
394− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
395487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
396− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
397− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
488+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
398489 , subscriberRecalculateHeight = \new -> do
399− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
400490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
401− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
402− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
491+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
403492 }
404493
405−newSubscriberSwitch :: SwitchSubscribed x a -> IO (Subscriber x a)
406−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
407496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
408− tracePropagate $ "SubscriberSwitch" <> showNodeId subscribed
409497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
410498 scheduleClear $ switchSubscribedOccurrence subscribed
411499 propagate a $ switchSubscribedSubscribers subscribed
412500 , subscriberInvalidateHeight = \_ -> do
413− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
414501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
415502 when (oldHeight /= invalidHeight) $ do
416503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
417− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
418− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
419− , subscriberRecalculateHeight = \new -> do
420− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
421− updateSwitchHeight new subscribed
422− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
423− }
504+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505+ , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506+ }
424507
425−newSubscriberCoincidenceOuter :: CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
426−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
427510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
428− tracePropagate $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
429511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
430− tracePropagate $ " outerHeight = " <> show outerHeight
512+ tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
431513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
432− tracePropagate $ " isJust occ = " <> show (isJust occ)
433− tracePropagate $ " innerHeight = " <> show innerHeight
514+ tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515+ tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516+
434517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
435518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
436519 case occ of
437− Nothing -> do
520+ Nothing ->
438521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
439522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
440− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
441− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
523+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
442525 Just o -> do -- Since it's already firing, no need to adjust height
443526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
444527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
445528 propagate o $ coincidenceSubscribedSubscribers subscribed
446− , subscriberInvalidateHeight = \_ -> do
447− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
448− invalidateCoincidenceHeight subscribed
449− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
450− , subscriberRecalculateHeight = \_ -> do
451− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
452− recalculateCoincidenceHeight subscribed
453− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
529+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
454531 }
455532
456−newSubscriberCoincidenceInner :: CoincidenceSubscribed x a -> IO (Subscriber x a)
457−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
458535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
459− tracePropagate $ "SubscriberCoincidenceInner" <> showNodeId subscribed
460536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
461537 case occ of
462538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -464,14 +540,8 @@ newSubscriberCoincidenceInner subscribed = return $ Subscriber
464540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
465541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
466542 propagate a $ coincidenceSubscribedSubscribers subscribed
467− , subscriberInvalidateHeight = \_ -> do
468− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
469− invalidateCoincidenceHeight subscribed
470− when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
471− , subscriberRecalculateHeight = \_ -> do
472− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
473− recalculateCoincidenceHeight subscribed
474− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
543+ , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
475545 }
476546
477547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -481,11 +551,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
481551recalculateSubscriberHeight = flip subscriberRecalculateHeight
482552
483553-- | Propagate everything at the current height
484−propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
485−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) $
486563 -- 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
487564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
488− WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
565+ FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
489566
490567--------------------------------------------------------------------------------
491568-- EventSubscribed
@@ -494,11 +571,16 @@ propagate a subscribers = withIncreasedDepth $ do
494571toAny :: a -> Any
495572toAny = unsafeCoerce
496573
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.
497579data EventSubscribed x = EventSubscribed
498580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
499581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
500582#ifdef DEBUG_CYCLES
501− , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
583+ , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
502584 , eventSubscribedHasOwnHeightRef :: !Bool
503585 , eventSubscribedWhoCreated :: !(IO [String])
504586#endif
@@ -525,26 +607,23 @@ eventSubscribedNever = EventSubscribed
525607 , eventSubscribedWhoCreated = return ["never"]
526608#endif
527609 }
528−
529−eventSubscribedMerge :: MergeSubscribed x k -> EventSubscribed x
530−eventSubscribedMerge !subscribed = EventSubscribed
531− { eventSubscribedHeightRef = mergeSubscribedHeight subscribed
532− , eventSubscribedRetained = toAny subscribed
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
533614#ifdef DEBUG_CYCLES
534− , eventSubscribedGetParents = do
535− ps <- readIORef $ mergeSubscribedParents subscribed
536− return $ R.ffor (DMap.toList ps) $ \(_ :=> v) -> Some.This $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription v
537− , eventSubscribedHasOwnHeightRef = True
538− , eventSubscribedWhoCreated = whoCreatedIORef $ mergeSubscribedCachedSubscribed subscribed
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
539618#endif
540619 }
541620
542−eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
621+eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
543622eventSubscribedFan !subscribed = EventSubscribed
544623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
545624 , eventSubscribedRetained = toAny subscribed
546625#ifdef DEBUG_CYCLES
547− , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
626+ , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
548627 , eventSubscribedHasOwnHeightRef = False
549628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
550629#endif
@@ -557,7 +636,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
557636#ifdef DEBUG_CYCLES
558637 , eventSubscribedGetParents = do
559638 s <- readIORef $ switchSubscribedCurrentParent subscribed
560− return [Some.This $ _eventSubscription_subscribed s]
639+ return [_eventSubscription_subscribed s]
561640 , eventSubscribedHasOwnHeightRef = True
562641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
563642#endif
@@ -570,8 +649,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
570649#ifdef DEBUG_CYCLES
571650 , eventSubscribedGetParents = do
572651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
573− let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
574− innerParents = maybeToList $ fmap Some.This innerSubscription
652+ let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653+ innerParents = maybeToList $ innerSubscription
575654 return $ outerParent : innerParents
576655 , eventSubscribedHasOwnHeightRef = True
577656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -585,41 +664,29 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
585664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
586665whoCreatedEventSubscribed = eventSubscribedWhoCreated
587666
588−walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
667+walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
589668walkInvalidHeightParents s0 = do
590− subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
669+ subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
591670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
592671 when (h == invalidHeight) $ do
593672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
594− modify (Some.This s :)
673+ modify (s :)
595674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
596− forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
675+ forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
597676 return subscribers
598677#endif
599678
600679{-# INLINE subscribeHoldEvent #-}
601−subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
680+subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
602681subscribeHoldEvent = subscribeAndRead . holdEvent
603682
604−--------------------------------------------------------------------------------
605−-- EventSubscription
606−--------------------------------------------------------------------------------
607−
608−data EventSubscription x = EventSubscription
609− { _eventSubscription_ticket :: !(Maybe WeakBagTicket)
610− , _eventSubscription_subscribed :: {-# UNPACK #-} !(EventSubscribed x)
611− }
612−
613−unsubscribe :: EventSubscription x -> IO ()
614−unsubscribe (EventSubscription msln _) = forM_ msln $ \sln -> WeakBag.remove sln
615−
616683--------------------------------------------------------------------------------
617684-- Behavior
618685--------------------------------------------------------------------------------
619686
620687newtype Behavior x a = Behavior { readBehaviorTracked :: BehaviorM x a }
621688
622−behaviorHold :: Hold x p -> Behavior x (R.PatchTarget p)
689+behaviorHold :: Hold x p -> Behavior x (PatchTarget p)
623690behaviorHold !h = Behavior $ readHoldTracked h
624691
625692behaviorHoldIdentity :: Hold x (Identity a) -> Behavior x a
@@ -633,7 +700,7 @@ behaviorPull !p = Behavior $ do
633700 val <- liftIO $ readIORef $ pullValue p
634701 case val of
635702 Just subscribed -> do
636− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
703+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
637704 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
638705 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
639706 return $ pullSubscribedValue subscribed
@@ -642,7 +709,7 @@ behaviorPull !p = Behavior $ do
642709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
643710 parentsRef <- liftIO $ newIORef []
644711 holdInits <- askBehaviorHoldInits
645− a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
712+ a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
646713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
647714 parents <- liftIO $ readIORef parentsRef
648715 let subscribed = PullSubscribed
@@ -652,22 +719,22 @@ behaviorPull !p = Behavior $ do
652719 , pullSubscribedParents = parents
653720 }
654721 liftIO $ writeIORef (pullValue p) $ Just subscribed
655− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
722+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
656723 return a
657724
658−behaviorDyn :: R.Patch p => Dyn x p -> Behavior x (R.PatchTarget p)
725+behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
659726behaviorDyn !d = Behavior $ readHoldTracked =<< getDynHold d
660727
661728{-# INLINE readHoldTracked #-}
662−readHoldTracked :: Hold x p -> BehaviorM x (R.PatchTarget p)
729+readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
663730readHoldTracked h = do
664731 result <- liftIO $ readIORef $ holdValue h
665732 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
666− 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
667735 return result
668736
669−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> BehaviorM x a #-}
670−{-# SPECIALIZE readBehaviorUntracked :: Behavior x a -> EventM x a #-}
737+{-# INLINABLE readBehaviorUntracked #-}
671738readBehaviorUntracked :: Defer (SomeHoldInit x) m => Behavior x a -> m a
672739readBehaviorUntracked b = do
673740 holdInits <- getDeferralQueue
@@ -677,45 +744,49 @@ readBehaviorUntracked b = do
677744-- Dynamic
678745--------------------------------------------------------------------------------
679746
680−data Dynamic x p = Dynamic
681− { dynamicCurrent :: !(Behavior x (R.PatchTarget p))
682− , dynamicUpdated :: !(Event x p)
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`?
683752 }
684753
685−dynamicHold :: Hold x p -> Dynamic x p
754+deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755+
756+
757+
758+
759+dynamicHold :: Hold x p -> DynamicS x p
686760dynamicHold !h = Dynamic
687761 { dynamicCurrent = behaviorHold h
688762 , dynamicUpdated = eventHold h
689763 }
690764
691−dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
765+dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
692766dynamicHoldIdentity = dynamicHold
693767
694−dynamicConst :: R.PatchTarget p -> Dynamic x p
768+dynamicConst :: PatchTarget p -> DynamicS x p
695769dynamicConst !a = Dynamic
696770 { dynamicCurrent = behaviorConst a
697771 , dynamicUpdated = eventNever
698772 }
699773
700−dynamicDyn :: R.Patch p => Dyn x p -> Dynamic x p
774+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
701775dynamicDyn !d = Dynamic
702776 { dynamicCurrent = behaviorDyn d
703777 , dynamicUpdated = eventDyn d
704778 }
705779
706−dynamicDynIdentity :: Dyn x (Identity a) -> Dynamic x (Identity a)
780+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
707781dynamicDynIdentity = dynamicDyn
708782
709783--------------------------------------------------------------------------------
710784-- Combinators
711785--------------------------------------------------------------------------------
712786
713−--TODO: Figure out why certain things are not 'representational', then make them
714−--representational so we can use coerce
715−
716787--type role Hold representational
717788data Hold x p
718− = Hold { holdValue :: !(IORef (R.PatchTarget p))
789+ = Hold { holdValue :: !(IORef (PatchTarget p))
719790 , holdInvalidators :: !(IORef [Weak (Invalidator x)])
720791 , holdEvent :: Event x p -- This must be lazy, or holds cannot be defined before their input Events
721792 , holdParent :: !(IORef (Maybe (EventSubscription x))) -- Keeps its parent alive (will be undefined until the hold is initialized) --TODO: Probably shouldn't be an IORef
@@ -724,22 +795,57 @@ data Hold x p
724795#endif
725796 }
726797
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+
727829data EventEnv x
728− = EventEnv { eventEnvSpiderTimeline :: !(SpiderTimeline x)
729− , eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
830+ = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
730831 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832+ , eventEnvDynInits :: !(IORef [SomeDynInit x])
731833 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
732834 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
733− , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
734− , eventEnvRootClears :: !(IORef [SomeRootClear])
835+ , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836+ , eventEnvIntClears :: !(IORef [Some IntClear])
837+ , eventEnvRootClears :: !(IORef [Some RootClear])
735838 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
736839 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
737− , eventEnvDelayedMerges :: !(IORef (IntMap [DelayedMerge x]))
840+ , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
738841 }
739842
740843{-# INLINE runEventM #-}
741−runEventM :: EventM x a -> EventEnv x -> IO a
742−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))
743849
744850class MonadIO m => Defer a m where
745851 getDeferralQueue :: m (IORef [a])
@@ -750,81 +856,87 @@ defer a = do
750856 q <- getDeferralQueue
751857 liftIO $ modifyIORef' q (a:)
752858
753−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
754864 {-# INLINE getDeferralQueue #-}
755− getDeferralQueue = EventM $ asks eventEnvAssignments
865+ getDeferralQueue = asksEventEnv eventEnvHoldInits
756866
757−instance Defer (SomeHoldInit x) (EventM x) where
867+instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
758868 {-# INLINE getDeferralQueue #-}
759− getDeferralQueue = EventM $ asks eventEnvHoldInits
869+ getDeferralQueue = asksEventEnv eventEnvDynInits
760870
761871instance Defer (SomeHoldInit x) (BehaviorM x) where
762872 {-# INLINE getDeferralQueue #-}
763873 getDeferralQueue = BehaviorM $ asks snd
764874
765−instance Defer (SomeMergeUpdate x) (EventM x) where
875+instance HasSpiderTimeline x => Defer (SomeMergeUpdate x) (EventM x) where
766876 {-# INLINE getDeferralQueue #-}
767− getDeferralQueue = EventM $ asks eventEnvMergeUpdates
877+ getDeferralQueue = asksEventEnv eventEnvMergeUpdates
768878
769−instance Defer (SomeMergeInit x) (EventM x) where
879+instance HasSpiderTimeline x => Defer (SomeMergeInit x) (EventM x) where
770880 {-# INLINE getDeferralQueue #-}
771− getDeferralQueue = EventM $ asks eventEnvMergeInits
881+ getDeferralQueue = asksEventEnv eventEnvMergeInits
772882
773−class HasCurrentHeight x m | m -> x where
883+class HasSpiderTimeline x => HasCurrentHeight x m | m -> x where
774884 getCurrentHeight :: m Height
775− scheduleMerge :: Height -> MergeSubscribed x a -> m ()
885+ scheduleMerge :: Height -> EventM x () -> m ()
776886
777−instance HasCurrentHeight x (EventM x) where
887+instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
778888 {-# INLINE getCurrentHeight #-}
779− getCurrentHeight = EventM $ do
780− heightRef <- asks eventEnvCurrentHeight
889+ getCurrentHeight = do
890+ heightRef <- asksEventEnv eventEnvCurrentHeight
781891 liftIO $ readIORef heightRef
782892 {-# INLINE scheduleMerge #-}
783− scheduleMerge height subscribed = EventM $ do
784− delayedRef <- asks eventEnvDelayedMerges
785− liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [DelayedMerge subscribed]
893+ scheduleMerge height subscribed = do
894+ delayedRef <- asksEventEnv eventEnvDelayedMerges
895+ liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
786896
787−class HasSpiderTimeline x m | m -> x where
788− -- | Retrieve the current SpiderTimeline
789− askSpiderTimeline :: m (SpiderTimeline x)
897+class HasSpiderTimeline x where
898+ -- | Retrieve the current SpiderTimelineEnv
899+ spiderTimeline :: SpiderTimelineEnv x
790900
791−instance HasSpiderTimeline x (EventM x) where
792− {-# INLINE askSpiderTimeline #-}
793− askSpiderTimeline = EventM $ asks eventEnvSpiderTimeline
901+instance HasSpiderTimeline Global where
902+ spiderTimeline = globalSpiderTimelineEnv
794903
795−instance HasSpiderTimeline x (SpiderHost x) where
796− {-# INLINE askSpiderTimeline #-}
797− askSpiderTimeline = SpiderHost ask
798−
799−putCurrentHeight :: Height -> EventM x ()
800−putCurrentHeight h = EventM $ do
801− heightRef <- asks eventEnvCurrentHeight
904+putCurrentHeight :: HasSpiderTimeline x => Height -> EventM x ()
905+putCurrentHeight h = do
906+ heightRef <- asksEventEnv eventEnvCurrentHeight
802907 liftIO $ writeIORef heightRef $! h
803908
804−instance Defer SomeClear (EventM x) where
909+instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
805910 {-# INLINE getDeferralQueue #-}
806− getDeferralQueue = EventM $ asks eventEnvClears
911+ getDeferralQueue = asksEventEnv eventEnvClears
807912
808913{-# INLINE scheduleClear #-}
809−scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
810−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
920+
921+{-# INLINE scheduleIntClear #-}
922+scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923+scheduleIntClear r = defer $ Some $ IntClear r
811924
812−instance Defer SomeRootClear (EventM x) where
925+instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
813926 {-# INLINE getDeferralQueue #-}
814− getDeferralQueue = EventM $ asks eventEnvRootClears
927+ getDeferralQueue = asksEventEnv eventEnvRootClears
815928
816929{-# INLINE scheduleRootClear #-}
817−scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
818−scheduleRootClear r = defer $ SomeRootClear r
930+scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931+scheduleRootClear r = defer $ Some $ RootClear r
819932
820−instance Defer (SomeResetCoincidence x) (EventM x) where
933+instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
821934 {-# INLINE getDeferralQueue #-}
822− getDeferralQueue = EventM $ asks eventEnvResetCoincidences
935+ getDeferralQueue = asksEventEnv eventEnvResetCoincidences
823936
824937-- Note: hold cannot examine its event until after the phase is over
825−{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> EventM x (Hold x p) #-}
826−{-# SPECIALIZE hold :: R.Patch p => R.PatchTarget p -> Event x p -> ComputeM x (Hold x p) #-}
827−hold :: (R.Patch p, Defer (SomeHoldInit x) m) => R.PatchTarget p -> Event x p -> m (Hold x p)
938+{-# INLINE [1] hold #-}
939+hold :: (Patch p, Defer (SomeHoldInit x) m) => PatchTarget p -> Event x p -> m (Hold x p)
828940hold v0 e = do
829941 valRef <- liftIO $ newIORef v0
830942 invsRef <- liftIO $ newIORef []
@@ -845,7 +957,7 @@ hold v0 e = do
845957 return h
846958
847959{-# INLINE getHoldEventSubscription #-}
848−getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, R.Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x m, m ~ EventM x) => Hold x p -> m (EventSubscription x)
960+getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
849961getHoldEventSubscription h = do
850962 ep <- liftIO $ readIORef $ holdParent h
851963 case ep of
@@ -859,7 +971,7 @@ getHoldEventSubscription h = do
859971 Nothing -> return ()
860972 Just o -> do
861973 old <- liftIO $ readIORef $ holdValue h
862− case R.apply o old of
974+ case apply o old of
863975 Nothing -> return ()
864976 Just new -> do
865977 -- Need to evaluate these so that we don't retain the Hold itself
@@ -871,9 +983,9 @@ getHoldEventSubscription h = do
871983
872984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
873985
874−--type role BehaviorM representational
875986-- BehaviorM can sample behaviors
876−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))
877989
878990instance Monad (BehaviorM x) where
879991 {-# INLINE (>>=) #-}
@@ -882,14 +994,16 @@ instance Monad (BehaviorM x) where
882994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
883995 {-# INLINE return #-}
884996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
885998 {-# INLINE fail #-}
886999 fail s = BehaviorM $ fail s
1000+#endif
8871001
8881002data BehaviorSubscribed x a
8891003 = forall p. BehaviorSubscribedHold (Hold x p)
8901004 | BehaviorSubscribedPull (PullSubscribed x a)
8911005
892−data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1006+newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
8931007
8941008--type role PullSubscribed representational
8951009data PullSubscribed x a
@@ -924,34 +1038,33 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
9241038#endif
9251039 }
9261040
927−data Root x (k :: * -> *)
1041+data Root x k
9281042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
9291043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
9301044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
9311045 }
9321046
933−data SomeHoldInit x = forall p. R.Patch p => SomeHoldInit !(Hold x p)
934−
935−data SomeMergeUpdate x = forall k. GCompare k => SomeMergeUpdate (R.PatchDMap k (Event x)) (MergeSubscribed x k)
1047+data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
9361048
937−data SomeMergeInit x = forall k. GCompare k => SomeMergeInit !(MergeSubscribed x k) !(Event x (R.PatchDMap k (Event x)))
938−
939−-- EventM can do everything BehaviorM can, plus create holds
940−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
1049+data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
9411050
942−newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
1051+data SomeMergeUpdate x = SomeMergeUpdate
1052+ { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053+ , _someMergeUpdate_invalidateHeight :: !(IO ())
1054+ , _someMergeUpdate_recalculateHeight :: !(IO ())
1055+ }
9431056
944−instance Defer (SomeHoldInit x) (ComputeM x) where
945− getDeferralQueue = ComputeM ask
1057+newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
9461058
947−{-# SPECIALIZE runComputeM :: ComputeM x a -> EventM x a #-}
948−runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
949−runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
1059+-- EventM can do everything BehaviorM can, plus create holds
1060+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
9501061
951−data MergeSubscribedParent (x :: *) k a = MergeSubscribedParent !(EventSubscription x) !(Subscriber x a)
1062+newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
9521063
953−mergeSubscribedParentSubscription :: MergeSubscribedParent x k a -> EventSubscription x
954−mergeSubscribedParentSubscription (MergeSubscribedParent es _) = es
1064+data MergeSubscribedParentWithMove x k a = MergeSubscribedParentWithMove
1065+ { _mergeSubscribedParentWithMove_subscription :: !(EventSubscription x)
1066+ , _mergeSubscribedParentWithMove_key :: !(IORef (k a))
1067+ }
9551068
9561069data HeightBag = HeightBag
9571070 { _heightBag_size :: {-# UNPACK #-} !Int
@@ -969,7 +1082,8 @@ heightBagFromList :: [Height] -> HeightBag
9691082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
9701083
9711084heightBagAdd :: Height -> HeightBag -> HeightBag
972−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
9731087
9741088heightBagRemove :: Height -> HeightBag -> HeightBag
9751089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -978,6 +1092,13 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
9781092 0 -> IntMap.delete h c
9791093 _ -> IntMap.insert h (pred old) c
9801094
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+
9811102heightBagMax :: HeightBag -> Height
9821103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
9831104 Just ((h, _), _) -> Height h
@@ -995,46 +1116,25 @@ heightBagVerify b@(HeightBag s c) = if
9951116heightBagVerify = id
9961117#endif
9971118
998−data MergeSubscribed x k
999− = MergeSubscribed { mergeSubscribedCachedSubscribed :: !(IORef (Maybe (MergeSubscribed x k))) -- From the original merge
1000− , mergeSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1001− , mergeSubscribedAccum :: !(IORef (DMap k Identity)) -- This will accumulate occurrences until our height is reached, at which point it will be transferred to mergeSubscribedOccurrence
1002− , mergeSubscribedHeight :: !(IORef Height)
1003− , mergeSubscribedHeightBag :: !(IORef HeightBag)
1004− , mergeSubscribedSubscribers :: !(WeakBag (Subscriber x (DMap k Identity)))
1005− , mergeSubscribedChange :: !(IORef (Subscriber x (R.PatchDMap k (Event x)), EventSubscribed x))
1006− , mergeSubscribedParents :: !(IORef (DMap k (MergeSubscribedParent x k)))
1007− , mergeSubscribedWeakSelf :: !(IORef (Weak (MergeSubscribed x k)))
1008−#ifdef DEBUG_NODEIDS
1009− , mergeSubscribedNodeId :: Int
1010−#endif
1011− }
1012−
1013−--TODO: DMap sucks; we should really write something better (with a functor for the value as well as the key)
1014−data Merge x k
1015− = Merge { mergeParents :: !(Dynamic x (R.PatchDMap k (Event x)))
1016− , mergeSubscribed :: !(IORef (Maybe (MergeSubscribed x k)))
1017− }
1018−
1019−data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1020− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1021− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1022− , _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)))
10231123 }
10241124
1025−data FanSubscribed (x :: *) k
1026− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1027− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1028− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
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
10291129 , fanSubscribedParent :: !(EventSubscription x)
10301130#ifdef DEBUG_NODEIDS
10311131 , fanSubscribedNodeId :: Int
10321132#endif
10331133 }
10341134
1035−data Fan x k
1036− = Fan { fanParent :: !(Event x (DMap k Identity))
1037− , 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)))
10381138 }
10391139
10401140data SwitchSubscribed x a
@@ -1058,7 +1158,9 @@ data Switch x a
10581158 , switchSubscribed :: !(IORef (Maybe (SwitchSubscribed x a)))
10591159 }
10601160
1161+#ifdef USE_TEMPLATE_HASKELL
10611162{-# ANN CoincidenceSubscribed "HLint: ignore Redundant bracket" #-}
1163+#endif
10621164data CoincidenceSubscribed x a
10631165 = CoincidenceSubscribed { coincidenceSubscribedCachedSubscribed :: !(IORef (Maybe (CoincidenceSubscribed x a)))
10641166 , coincidenceSubscribedOccurrence :: !(IORef (Maybe a))
@@ -1086,20 +1188,35 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
10861188newInvalidatorPull :: Pull x a -> IO (Invalidator x)
10871189newInvalidatorPull p = return $! InvalidatorPull p
10881190
1089−instance R.FunctorMaybe (Event x) where
1090− fmapMaybe f = push $ return . f
1191+instance HasSpiderTimeline x => Filterable (Event x) where
1192+ mapMaybe f = push $ return . f
10911193
1092−instance Align (Event x) where
1194+instance HasSpiderTimeline x => Align (Event x) where
10931195 nil = eventNever
1094− align ea eb = R.fmapMaybe R.dmapToThese $ merge $ dynamicConst $ DMap.fromList [R.LeftTag :=> ea, R.RightTag :=> eb]
1196+#if MIN_VERSION_these(0, 8, 0)
1197+instance HasSpiderTimeline x => Semialign (Event x) where
1198+#endif
1199+ align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200+ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201+
1202+#ifdef MIN_VERSION_semialign
1203+#if MIN_VERSION_semialign(1,1,0)
1204+instance HasSpiderTimeline x => Zip (Event x) where
1205+#endif
1206+ zip x y = mapMaybe justThese $ align x y
1207+#endif
1208+
1209+data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210+ | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211+ | HoldDyn !(Hold x p)
10951212
1096−newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (R.PatchTarget p), Event x p) (Hold x p)) }
1213+newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
10971214
1098−newMapDyn :: (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1099−newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
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)
11001217
11011218--TODO: Avoid the duplication between this and R.zipDynWith
1102−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)
11031220zipDynWith f da db =
11041221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
11051222 ec = flip push eab $ \o -> do
@@ -1112,75 +1229,70 @@ zipDynWith f da db =
11121229 return (a, b)
11131230 These (Identity a) (Identity b) -> return (a, b)
11141231 return $ Just $ Identity $ f a b
1115− in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1232+ in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
11161233
1117−unsafeDyn :: BehaviorM x (R.PatchTarget p) -> Event x p -> Dyn x p
1118−unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1119− 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
11201240
1121−newJoinDyn :: Dynamic x (Identity (Dynamic x (Identity a))) -> Dyn x (Identity a)
1122−newJoinDyn d =
1123− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
1124− eOuter = push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
1125− eInner = switch $ dynamicUpdated <$> dynamicCurrent d
1126− eBoth = coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
1127− v' = unSpiderEvent $ R.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
1128− 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')
11291244
11301245-- ResultM can read behaviors and events
11311246type ResultM = EventM
11321247
1133−{-# NOINLINE unsafeNewIORef #-}
1134−unsafeNewIORef :: a -> b -> IORef b
1135−unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1136−
1137−instance Functor (Event x) where
1248+instance HasSpiderTimeline x => Functor (Event x) where
11381249 fmap f = push $ return . Just . f
11391250
11401251instance Functor (Behavior x) where
11411252 fmap f = pull . fmap f . readBehaviorTracked
11421253
1143−{-# INLINABLE push #-} --TODO: If this is helpful, we can get rid of the unsafeNewIORef and use unsafePerformIO directly
1144−push :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
1254+{-# INLINE push #-}
1255+push :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
11451256push f e = cacheEvent (pushCheap f e)
1146−{-
1147−push f e = eventPush $ Push
1148− { pushCompute = f
1149− , pushParent = e
1150− , pushSubscribed = unsafeNewIORef (f, e) Nothing --TODO: Does the use of the tuple here create unnecessary overhead?
1151− }
1152−-- DISABLED: {- RULES "push/push" forall f g e. push f (push g e) = push (maybe (return Nothing) f <=< g) e #-}
1153−-}
11541257
11551258{-# INLINABLE pull #-}
11561259pull :: BehaviorM x a -> Behavior x a
1157−pull a = behaviorPull $ Pull
1158− { pullCompute = a
1159− , pullValue = unsafeNewIORef a Nothing
1260+pull a = unsafePerformIO $ do
1261+ ref <- newIORef Nothing
11601262#ifdef DEBUG_NODEIDS
1161− , pullNodeId = unsafeNodeId a
1263+ nid <- newNodeId
11621264#endif
1163− }
1265+ pure $ behaviorPull $ Pull
1266+ { pullCompute = a
1267+ , pullValue = ref
1268+#ifdef DEBUG_NODEIDS
1269+ , pullNodeId = nid
1270+#endif
1271+ }
11641272
11651273{-# INLINABLE switch #-}
1166−switch :: Behavior x (Event x a) -> Event x a
1167−switch a = eventSwitch $ Switch
1168− { switchParent = a
1169− , switchSubscribed = unsafeNewIORef a Nothing
1170− }
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+ }
11711281
1172−coincidence :: Event x (Event x a) -> Event x a
1173−coincidence a = eventCoincidence $ Coincidence
1174− { coincidenceParent = a
1175− , coincidenceSubscribed = unsafeNewIORef a Nothing
1176− }
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+ }
11771289
11781290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1179−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
11801292run roots after = do
1181− tracePropagate $ "Running an event frame with " <> show (length roots) <> " events"
1182− spiderTimeline <- SpiderHost ask
1183− 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
11841296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
11851297 occBefore <- liftIO $ do
11861298 occBefore <- readIORef occRef
@@ -1192,42 +1304,39 @@ run roots after = do
11921304 else return Nothing
11931305 forM_ (catMaybes rootsToPropagate) $ \(RootTrigger (subscribersRef, _, _) :=> Identity a) -> do
11941306 propagate a subscribersRef
1195− delayedRef <- EventM $ asks eventEnvDelayedMerges
1307+ delayedRef <- asksEventEnv eventEnvDelayedMerges
11961308 let go = do
11971309 delayed <- liftIO $ readIORef delayedRef
11981310 case IntMap.minViewWithKey delayed of
11991311 Nothing -> return ()
12001312 Just ((currentHeight, cur), future) -> do
1201− tracePropagate $ "Running height " ++ show currentHeight
1313+ tracePropagate (Proxy :: Proxy x) $ "Running height " ++ show currentHeight
12021314 putCurrentHeight $ Height currentHeight
12031315 liftIO $ writeIORef delayedRef $! future
1204− forM_ cur $ \d -> case d of
1205− DelayedMerge subscribed -> do
1206− height <- liftIO $ readIORef $ mergeSubscribedHeight subscribed
1207− case height `compare` Height currentHeight of
1208− LT -> error "Somehow a merge's height has been decreased after it was scheduled"
1209− GT -> scheduleMerge height subscribed -- The height has been increased (by a coincidence event; TODO: is this the only way?)
1210− EQ -> do
1211− m <- liftIO $ readIORef $ mergeSubscribedAccum subscribed
1212− liftIO $ writeIORef (mergeSubscribedAccum subscribed) $! DMap.empty
1213− --TODO: Assert that m is not empty
1214− liftIO $ writeIORef (mergeSubscribedOccurrence subscribed) $ Just m
1215− scheduleClear $ mergeSubscribedOccurrence subscribed
1216− propagate m $ mergeSubscribedSubscribers subscribed
1316+ sequence_ cur
12171317 go
12181318 go
12191319 putCurrentHeight maxBound
12201320 after
1221− tracePropagate "Done running an event frame"
1321+ tracePropagate (Proxy :: Proxy x) "Done running an event frame"
12221322 return result
12231323
1224−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
12251332
1226−data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
1333+newtype Clear a = Clear (IORef (Maybe a))
12271334
1228−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))
12291338
1230−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
12311340
12321341debugFinalize :: Bool
12331342debugFinalize = False
@@ -1237,55 +1346,110 @@ mkWeakPtrWithDebug x debugNote = do
12371346 x' <- evaluate x
12381347 mkWeakPtr x' $
12391348 if debugFinalize
1240− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
12411350 else Nothing
12421351
12431352type WeakList a = [Weak a]
12441353
1245−{-# INLINE withIncreasedDepth #-}
1354+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355+
1356+
1357+
1358+
12461359#ifdef DEBUG
1247−withIncreasedDepth :: CanTrace x m => m a -> m a
1248−withIncreasedDepth a = do
1249− spiderTimeline <- askSpiderTimeline
1250− 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
12511385 result <- a
1252− liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1386+ liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
12531387 return result
1254−#else
1255−withIncreasedDepth :: m a -> m a
1256−withIncreasedDepth = id
1257−#endif
1258−
1259−type CanTrace x m = (HasSpiderTimeline x m, MonadIO m)
12601388
12611389{-# INLINE tracePropagate #-}
1262−tracePropagate :: (CanTrace x m) => String -> m ()
1263−tracePropagate = traceWhen debugPropagate
1390+tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391+tracePropagate p = when debugPropagate . trace p
12641392
12651393{-# INLINE traceInvalidate #-}
12661394traceInvalidate :: String -> IO ()
1267−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
12681400
1269−{-# INLINE traceWhen #-}
1270−traceWhen :: (CanTrace x m) => Bool -> String -> m ()
1271−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
12721404
1273−{-# INLINE traceMWhen #-}
1274−traceMWhen :: (CanTrace x m) => Bool -> m String -> m ()
1275−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
12761408 message <- getMessage
1277−#ifdef DEBUG
1278− spiderTimeline <- askSpiderTimeline
1279− d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1409+ d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
1411+
12801412#else
1281− 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+
12821448#endif
1283− liftIO $ putStrLn $ replicate d ' ' <> message
12841449
12851450whoCreatedIORef :: IORef a -> IO [String]
12861451whoCreatedIORef (IORef a) = whoCreated $! a
12871452
1288−#ifdef DEBUG_CYCLES
12891453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
12901454groupByHead = \case
12911455 [] -> []
@@ -1296,20 +1460,54 @@ groupByHead = \case
12961460 | otherwise -> (x, xs :| []) : l
12971461
12981462listsToForest :: Eq a => [[a]] -> Forest a
1299−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+
13001495#endif
13011496
1497+
13021498{-# INLINE propagateSubscriberHold #-}
1303−propagateSubscriberHold :: R.Patch p => Hold x p -> p -> EventM x ()
1499+propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
13041500propagateSubscriberHold h a = do
1305− {-# SCC "trace" #-} traceMWhen debugPropagate $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
13061502 invalidators <- liftIO $ readIORef $ holdInvalidators h
13071503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504+
13081505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1309− case {-# SCC "apply" #-} R.apply a v of
1506+ case {-# SCC "apply" #-} apply a v of
13101507 Nothing -> return ()
13111508 Just v' -> do
1312− {-# 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)
13131511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
13141512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
13151513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1317,56 +1515,53 @@ propagateSubscriberHold h a = do
13171515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
13181516
13191517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1320−runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1518+runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
13211519
13221520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
13231521askInvalidator = do
1324− (!m, _) <- BehaviorM ask
1522+ (!m, _) <- ask
13251523 case m of
13261524 Nothing -> return Nothing
13271525 Just (!wi, _) -> return $ Just wi
13281526
13291527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
13301528askParentsRef = do
1331− (!m, _) <- BehaviorM ask
1529+ (!m, _) <- ask
13321530 case m of
13331531 Nothing -> return Nothing
13341532 Just (_, !p) -> return $ Just p
13351533
13361534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
13371535askBehaviorHoldInits = do
1338− (_, !his) <- BehaviorM ask
1536+ (_, !his) <- ask
13391537 return his
13401538
13411539{-# INLINE getDynHold #-}
1342−getDynHold :: (Defer (SomeHoldInit x) m, R.Patch p) => Dyn x p -> m (Hold x p)
1540+getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
13431541getDynHold d = do
13441542 mh <- liftIO $ readIORef $ unDyn d
13451543 case mh of
1346− Right h -> return h
1347− Left (readV0, v') -> do
1544+ HoldDyn h -> return h
1545+ UnsafeDyn (readV0, v') -> do
13481546 holdInits <- getDeferralQueue
13491547 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
13501554 h <- hold v0 v'
1351− liftIO $ writeIORef (unDyn d) $ Right h
1555+ liftIO $ writeIORef (unDyn d) $ HoldDyn h
13521556 return h
13531557
1558+
13541559-- Always refers to 0
13551560{-# NOINLINE zeroRef #-}
13561561zeroRef :: IORef Height
13571562zeroRef = unsafePerformIO $ newIORef zeroHeight
13581563
1359−type CanSubscribe x m =
1360− ( HasSpiderTimeline x m
1361− , HasCurrentHeight x m
1362− , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1363− , Defer SomeClear m -- Wiping out event firings
1364− , Defer (SomeAssignment x) m -- Updating state
1365− , Defer (SomeResetCoincidence x) m
1366− , m ~ EventM x
1367− )
1368−
1369−getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, 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)
13701565getRootSubscribed k r sub = do
13711566 mSubscribed <- readIORef $ rootSubscribed r
13721567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1380,10 +1575,15 @@ getRootSubscribed k r sub = do
13801575 let !cached = rootSubscribed r
13811576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
13821577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1383− when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1578+
1579+ tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580+
13841581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
13851582 writeIORef uninitRef $! uninit
1386− let subscribed = RootSubscribed
1583+#ifdef DEBUG_NODEIDS
1584+ nid <- newNodeId
1585+#endif
1586+ let !subscribed = RootSubscribed
13871587 { rootSubscribedKey = k
13881588 , rootSubscribedCachedSubscribed = cached
13891589 , rootSubscribedOccurrence = getOcc
@@ -1391,17 +1591,29 @@ getRootSubscribed k r sub = do
13911591 , rootSubscribedUninit = uninit
13921592 , rootSubscribedWeakSelf = weakSelf
13931593#ifdef DEBUG_NODEIDS
1394− , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1594+ , rootSubscribedNodeId = nid
13951595#endif
13961596 }
1397− 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)
13981608 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
13991609 occ <- getOcc
14001610 return (sln, subscribed, occ)
14011611
1612+#ifdef USE_TEMPLATE_HASKELL
14021613{-# ANN cleanupRootSubscribed "HLint: ignore Redundant bracket" #-}
1614+#endif
14031615cleanupRootSubscribed :: RootSubscribed x a -> IO ()
1404−cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached }) = do
1616+cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribedCachedSubscribed = cached } = do
14051617 rootSubscribedUninit self
14061618 modifyIORef' cached $ DMap.delete k
14071619
@@ -1409,78 +1621,90 @@ cleanupRootSubscribed self@(RootSubscribed { rootSubscribedKey = k, rootSubscrib
14091621subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
14101622subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
14111623
1412−{-# SPECIALIZE getMergeSubscribed :: GCompare k => Merge x k -> Subscriber x (DMap k Identity) -> EventM x (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity)) #-}
1413−getMergeSubscribed :: forall x k m. (CanSubscribe x m, GCompare k) => Merge x k -> Subscriber x (DMap k Identity) -> m (WeakBagTicket, MergeSubscribed x k, Maybe (DMap k Identity))
1414−getMergeSubscribed m sub = do
1415− mSubscribed <- liftIO $ readIORef $ mergeSubscribed m
1416− case mSubscribed of
1417− Just subscribed -> {-# SCC "hitMerge" #-} liftIO $ do
1418− sln <- subscribeMergeSubscribed subscribed sub
1419− occ <- readIORef $ mergeSubscribedOccurrence subscribed
1420− return (sln, subscribed, occ)
1421− Nothing -> {-# SCC "missMerge" #-} do
1422− subscribedRef <- liftIO $ newIORef $ error "getMergeSubscribed: subscribedRef not yet initialized"
1423− subscribedUnsafe <- liftIO $ unsafeInterleaveIO $ readIORef subscribedRef
1424− initialParents <- readBehaviorUntracked $ dynamicCurrent $ mergeParents m
1425− subscribers :: [(Maybe (DSum k Identity), Height, DSum k (MergeSubscribedParent x k))] <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1426− s <- liftIO $ newSubscriberMerge k subscribedUnsafe
1427− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1428− height <- liftIO $ getEventSubscribedHeight parentSubd
1429− return $ (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription s)
1430− let dm = DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1431− heights = fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1432− myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1433− myHeight = if invalidHeight `elem` heights
1434− then invalidHeight
1435− else succHeight $ heightBagMax myHeightBag
1436− currentHeight <- getCurrentHeight
1437− let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1438− then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1439− else (Nothing, dm)
1440− unless (DMap.null accum) $ do
1441− scheduleMerge myHeight subscribedUnsafe
1442− occRef <- liftIO $ newIORef occ
1443− when (isJust occ) $ scheduleClear occRef
1444− accumRef <- liftIO $ newIORef accum
1445− heightRef <- liftIO $ newIORef myHeight
1446− heightMapRef <- liftIO $ newIORef myHeightBag
1447− weakSelf <- liftIO $ newIORef $ error "getMergeSubscribed: weakSelf not yet initialized"
1448− (subs, sln) <- liftIO $ WeakBag.singleton sub weakSelf cleanupMergeSubscribed
1449− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
1450− parentsRef <- liftIO $ newIORef $ DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1451− let !subscribed = MergeSubscribed
1452− { mergeSubscribedCachedSubscribed = mergeSubscribed m
1453− , mergeSubscribedOccurrence = occRef
1454− , mergeSubscribedAccum = accumRef
1455− , mergeSubscribedHeight = heightRef
1456− , mergeSubscribedHeightBag = heightMapRef
1457− , mergeSubscribedSubscribers = subs
1458− , mergeSubscribedChange = changeSubdRef
1459− , mergeSubscribedParents = parentsRef
1460− , mergeSubscribedWeakSelf = weakSelf
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))
14611630#ifdef DEBUG_NODEIDS
1462− , mergeSubscribedNodeId = unsafeNodeId m
1631+ , _fanInt_nodeId :: {-# UNPACK #-} !Int
14631632#endif
1464− }
1465− defer $ SomeMergeInit subscribed $ dynamicUpdated $ mergeParents m
1466− liftIO $ writeIORef subscribedRef $! subscribed
1467− liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "MergeSubscribed"
1468− liftIO $ writeIORef (mergeSubscribed m) $ Just subscribed
1469− return (sln, subscribed, occ)
1470−
1471−cleanupMergeSubscribed :: MergeSubscribed x k -> IO ()
1472−cleanupMergeSubscribed subscribed = do
1473− parents <- readIORef $ mergeSubscribedParents subscribed
1474− forM_ (DMap.toList parents) $ \(_ :=> msp) -> unsubscribe $ mergeSubscribedParentSubscription msp
1475− -- Not necessary, because this whole MergeSubscribed is dead: writeIORef (mergeSubscribedParents subscribed) DMap.empty
1476− writeIORef (mergeSubscribedCachedSubscribed subscribed) $ Nothing -- Get rid of the cached subscribed
1633+ }
1634+
1635+newFanInt :: IO (FanInt x a)
1636+newFanInt = do
1637+ subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638+ subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639+ occRef <- newIORef $ error "fanInt: no occurrence"
1640+#ifdef DEBUG_NODEIDS
1641+ nodeId <- newNodeId
1642+#endif
1643+ return $ FanInt
1644+ { _fanInt_subscribers = subscribers
1645+ , _fanInt_subscriptionRef = subscriptionRef
1646+ , _fanInt_occRef = occRef
1647+#ifdef DEBUG_NODEIDS
1648+ , _fanInt_nodeId = nodeId
1649+#endif
1650+ }
1651+
1652+fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653+fanInt p = unsafePerformIO $ do
1654+ self <- newFanInt
1655+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656+ isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657+ when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1658+ let desc = "fanInt" <> showNodeId self <> ", k = " <> show k
1659+ (subscription, parentOcc) <- subscribeAndRead p $ debugSubscriber' desc $ Subscriber
1660+ { subscriberPropagate = \m -> do
1661+ liftIO $ writeIORef (_fanInt_occRef self) m
1662+ scheduleIntClear $ _fanInt_occRef self
1663+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> --TODO: Do we need to know that no subscribers are being added as we traverse?
1664+ FastWeakBag.traverse_ b $ \s ->
1665+ subscriberPropagate s v
1666+ , subscriberInvalidateHeight = \old ->
1667+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668+ FastWeakBag.traverse_ b $ \s ->
1669+ subscriberInvalidateHeight s old
1670+ , subscriberRecalculateHeight = \new ->
1671+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672+ FastWeakBag.traverse_ b $ \s ->
1673+ subscriberRecalculateHeight s new
1674+ }
1675+ liftIO $ do
1676+ writeIORef (_fanInt_subscriptionRef self) subscription
1677+ writeIORef (_fanInt_occRef self) $ fromMaybe IntMap.empty parentOcc
1678+ scheduleIntClear $ _fanInt_occRef self
1679+ liftIO $ do
1680+ b <- FastMutableIntMap.lookup (_fanInt_subscribers self) k >>= \case
1681+ Nothing -> do
1682+ b <- FastWeakBag.empty
1683+ FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684+ return b
1685+ Just b -> return b
1686+ ticket <- liftIO $ FastWeakBag.insert sub b
1687+ currentOcc <- readIORef (_fanInt_occRef self)
1688+
1689+ subscribed <- fanIntSubscribed ticket self
1690+ return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1691+
1692+fanIntSubscribed :: FastWeakBagTicket k -> FanInt x a -> IO (EventSubscribed x)
1693+fanIntSubscribed ticket self = do
1694+ subscribedParent <- _eventSubscription_subscribed <$> readIORef (_fanInt_subscriptionRef self)
1695+ return $ EventSubscribed
1696+ { eventSubscribedHeightRef = eventSubscribedHeightRef subscribedParent
1697+ , eventSubscribedRetained = toAny (_fanInt_subscriptionRef self, ticket)
1698+#ifdef DEBUG_CYCLES
1699+ , eventSubscribedGetParents = return [subscribedParent]
1700+ , eventSubscribedHasOwnHeightRef = False
1701+ , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1702+#endif
1703+ }
14771704
1478−{-# INLINE subscribeMergeSubscribed #-}
1479−subscribeMergeSubscribed :: MergeSubscribed x k -> Subscriber x (DMap k Identity) -> IO WeakBagTicket
1480−subscribeMergeSubscribed subscribed sub = WeakBag.insert sub (mergeSubscribedSubscribers subscribed) (mergeSubscribedWeakSelf subscribed) cleanupMergeSubscribed
14811705
1482−{-# SPECIALIZE getFanSubscribed :: GCompare k => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a) #-}
1483−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, 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))
14841708getFanSubscribed k f sub = do
14851709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
14861710 case mSubscribed of
@@ -1498,13 +1722,16 @@ getFanSubscribed k f sub = do
14981722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
14991723 occRef <- liftIO $ newIORef parentOcc
15001724 when (isJust parentOcc) $ scheduleClear occRef
1725+#ifdef DEBUG_NODEIDS
1726+ nid <- liftIO newNodeId
1727+#endif
15011728 let subscribed = FanSubscribed
15021729 { fanSubscribedCachedSubscribed = fanSubscribed f
15031730 , fanSubscribedOccurrence = occRef
15041731 , fanSubscribedParent = subscription
15051732 , fanSubscribedSubscribers = subscribersRef
15061733#ifdef DEBUG_NODEIDS
1507− , fanSubscribedNodeId = unsafeNodeId f
1734+ , fanSubscribedNodeId = nid
15081735#endif
15091736 }
15101737 let !self = (k, subscribed)
@@ -1514,7 +1741,7 @@ getFanSubscribed k f sub = do
15141741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
15151742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
15161743
1517−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1744+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
15181745cleanupFanSubscribed (k, subscribed) = do
15191746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15201747 let reducedSubscribers = DMap.delete k subscribers
@@ -1526,7 +1753,7 @@ cleanupFanSubscribed (k, subscribed) = do
15261753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
15271754
15281755{-# INLINE subscribeFanSubscribed #-}
1529−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1756+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
15301757subscribeFanSubscribed k subscribed sub = do
15311758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
15321759 case DMap.lookup k subscribers of
@@ -1538,8 +1765,8 @@ subscribeFanSubscribed k subscribed sub = do
15381765 return sln
15391766 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
15401767
1541−{-# SPECIALIZE getSwitchSubscribed :: Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a) #-}
1542−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, 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)
15431770getSwitchSubscribed s sub = do
15441771 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
15451772 case mSubscribed of
@@ -1564,6 +1791,9 @@ getSwitchSubscribed s sub = do
15641791 when (isJust parentOcc) $ scheduleClear occRef
15651792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
15661793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794+#ifdef DEBUG_NODEIDS
1795+ nid <- liftIO newNodeId
1796+#endif
15671797 let !subscribed = SwitchSubscribed
15681798 { switchSubscribedCachedSubscribed = switchSubscribed s
15691799 , switchSubscribedOccurrence = occRef
@@ -1576,7 +1806,7 @@ getSwitchSubscribed s sub = do
15761806 , switchSubscribedCurrentParent = subscriptionRef
15771807 , switchSubscribedWeakSelf = weakSelf
15781808#ifdef DEBUG_NODEIDS
1579− , switchSubscribedNodeId = unsafeNodeId s
1809+ , switchSubscribedNodeId = nid
15801810#endif
15811811 }
15821812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1594,8 +1824,8 @@ cleanupSwitchSubscribed subscribed = do
15941824subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBagTicket
15951825subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
15961826
1597−{-# SPECIALIZE getCoincidenceSubscribed :: Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a) #-}
1598−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, 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)
15991829getCoincidenceSubscribed c sub = do
16001830 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
16011831 case mSubscribed of
@@ -1621,6 +1851,9 @@ getCoincidenceSubscribed c sub = do
16211851 scheduleClear innerSubdRef
16221852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
16231853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854+#ifdef DEBUG_NODEIDS
1855+ nid <- liftIO newNodeId
1856+#endif
16241857 let subscribed = CoincidenceSubscribed
16251858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
16261859 , coincidenceSubscribedOccurrence = occRef
@@ -1631,7 +1864,7 @@ getCoincidenceSubscribed c sub = do
16311864 , coincidenceSubscribedInnerParent = innerSubdRef
16321865 , coincidenceSubscribedWeakSelf = weakSelf
16331866#ifdef DEBUG_NODEIDS
1634− , coincidenceSubscribedNodeId = unsafeNodeId c
1867+ , coincidenceSubscribedNodeId = nid
16351868#endif
16361869 }
16371870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1648,120 +1881,511 @@ cleanupCoincidenceSubscribed subscribed = do
16481881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16491882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
16501883
1651−{-# INLINE merge #-}
1652−merge :: GCompare k => Dynamic x (R.PatchDMap k (Event x)) -> Event x (DMap k Identity)
1653−merge m = eventMerge $ Merge
1654− { mergeParents = m
1655− , 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
16562095 }
16572096
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+
16582281newtype 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) }
16592283
1660−fan :: GCompare k => Event x (DMap k Identity) -> EventSelector x k
1661−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
16622287 let f = Fan
16632288 { fanParent = e
1664− , fanSubscribed = unsafeNewIORef e Nothing
2289+ , fanSubscribed = ref
16652290 }
1666− in EventSelector $ \k -> eventFan k f
2291+ pure $ EventSelectorG $ \k -> eventFan k f
16672292
1668−runHoldInits :: IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1669−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
16702295 holdInits <- liftIO $ readIORef holdInitRef
2296+ dynInits <- liftIO $ readIORef dynInitRef
16712297 mergeInits <- liftIO $ readIORef mergeInitRef
1672− unless (null holdInits && null mergeInits) $ do
2298+ unless (null holdInits && null dynInits && null mergeInits) $ do
16732299 liftIO $ writeIORef holdInitRef []
2300+ liftIO $ writeIORef dynInitRef []
16742301 liftIO $ writeIORef mergeInitRef []
16752302 mapM_ initHold holdInits
1676− mapM_ initMerge mergeInits
1677− runHoldInits holdInitRef mergeInitRef
2303+ mapM_ initDyn dynInits
2304+ mapM_ unSomeMergeInit mergeInits
2305+ runHoldInits holdInitRef dynInitRef mergeInitRef
16782306
1679−initHold :: SomeHoldInit x -> EventM x ()
2307+initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
16802308initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
16812309
1682−initMerge :: SomeMergeInit x -> EventM x ()
1683−initMerge (SomeMergeInit subscribed changed) = do
1684− changeSub <- liftIO $ newSubscriberMergeChange subscribed
1685− (EventSubscription _ changeSubd, change) <- subscribeAndRead changed changeSub
1686− forM_ change $ \c -> defer $ SomeMergeUpdate c subscribed
1687− liftIO $ writeIORef (mergeSubscribedChange subscribed) (changeSub, changeSubd)
2310+initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311+initDyn (SomeDynInit d) = void $ getDynHold d
16882312
1689−-- | Run an event action outside of a frame
1690−runFrame :: forall x a. EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
1691−runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
1692− -- 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
1693− pendingCleanups <- atomicModifyIORef (_spiderTimeline_cleanups spiderTimeline) $ \x -> ([], x)
1694− {-# SCC "cleanups" #-} sequence_ pendingCleanups
2313+newEventEnv :: IO (EventEnv x)
2314+newEventEnv = do
16952315 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
16962316 holdInitRef <- newIORef []
2317+ dynInitRef <- newIORef []
16972318 mergeUpdateRef <- newIORef []
16982319 mergeInitRef <- newIORef []
16992320 heightRef <- newIORef zeroHeight
17002321 toClearRef <- newIORef []
2322+ toClearIntRef <- newIORef []
17012323 toClearRootRef <- newIORef []
17022324 coincidenceInfosRef <- newIORef []
1703− delayedRef <- liftIO $ newIORef IntMap.empty
1704− 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)
17052346 let go = do
17062347 result <- a
1707− 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
17082349 return result
1709− result <- runEventM go env
1710− toClear <- readIORef toClearRef
1711− forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
1712− toClearRoot <- readIORef toClearRootRef
1713− forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1714− 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
17152358 toReconnectRef <- newIORef []
1716− coincidenceInfos <- readIORef coincidenceInfosRef
2359+ coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
17172360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
17182361 writeIORef vRef v
1719− when debugInvalidate $ putStrLn $ "Invalidating Hold"
2362+ traceInvalidate $ "Invalidating Hold"
17202363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
1721− mergeUpdates <- readIORef mergeUpdateRef
1722− writeIORef mergeUpdateRef []
1723− let updateMerge :: SomeMergeUpdate x -> IO [EventSubscription x]
1724− updateMerge (SomeMergeUpdate (R.PatchDMap p :: R.PatchDMap k (Event x)) m) = do
1725− oldParents <- readIORef $ mergeSubscribedParents m
1726− let f (subscriptionsToKill, ps) (k :=> R.ComposeMaybe me) = do
1727− (mOldSubd, newPs) <- case me of
1728− Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1729− Just e -> do
1730− s <- liftIO $ newSubscriberMerge k m
1731− subscription@(EventSubscription _ subd) <- subscribe e s
1732− newParentHeight <- liftIO $ getEventSubscribedHeight subd
1733− let newParent = MergeSubscribedParent subscription s
1734− liftIO $ addMergeHeight newParentHeight m
1735− return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1736− forM_ mOldSubd $ \oldSubd -> do
1737− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ mergeSubscribedParentSubscription oldSubd
1738− liftIO $ removeMergeHeight oldHeight m
1739− return (maybeToList (mergeSubscribedParentSubscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1740− (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
1741− writeIORef (mergeSubscribedParents m) $! newParents
1742− return subscriptionsToKill
1743− when debugPropagate $ putStrLn "Updating merges"
1744− mergeSubscriptionsToKill <- concat <$> mapM updateMerge mergeUpdates
1745− 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"
17462369 toReconnect <- readIORef toReconnectRef
2370+ clearEventEnv env
17472371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
17482372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
17492373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
1750− when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2374+ traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
17512375 finalize wi
17522376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
17532377 wi' <- mkWeakPtrWithDebug i "wi'"
17542378 writeIORef (switchSubscribedOwnWeakInvalidator subscribed) $! wi'
17552379 writeIORef (switchSubscribedBehaviorParents subscribed) []
1756− writeIORef holdInitRef [] --TODO: Should we reuse this?
1757− e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) holdInitRef
1758− 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
17592383 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
17602384 sub <- newSubscriberSwitch subscribed
1761− 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
17622386 {-
17632387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
1764− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
17652389 EventRoot _ -> "EventRoot"
17662390 EventNever -> "EventNever"
17672391 _ -> "something else"
@@ -1776,14 +2400,13 @@ runFrame a = SpiderHost $ ask >>= \spiderTimeline -> lift $ do
17762400 myHeight <- readIORef $ switchSubscribedHeight subscribed
17772401 when (parentHeight /= myHeight) $ do
17782402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
1779− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1780− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> do
1781− 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
17822405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
17832406 unsubscribe subscription
17842407 mapM_ invalidateCoincidenceHeight mcs
17852408 forM_ coincidenceInfos $ \(SomeResetCoincidence _ mcs) -> mapM_ recalculateCoincidenceHeight mcs
1786− forM_ mergeUpdates $ \(SomeMergeUpdate _ m) -> revalidateMergeHeight m
2409+ mapM_ _someMergeUpdate_recalculateHeight mergeUpdates
17872410 forM_ toReconnect $ \(SomeSwitchSubscribed subscribed) -> do
17882411 height <- calculateSwitchHeight subscribed
17892412 updateSwitchHeight height subscribed
@@ -1813,50 +2436,12 @@ succHeight h@(Height a) =
18132436 then invalidHeight
18142437 else Height $ succ a
18152438
1816−removeMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1817−removeMergeHeight oldParentHeight subscribed = do
1818− when debugInvalidateHeight $ putStrLn $ "removeMergeHeight: " <> show oldParentHeight <> " Merge" <> showNodeId subscribed
1819− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1820− let newHeights = heightBagRemove oldParentHeight oldHeights
1821− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1822−
1823−invalidateMergeHeight :: MergeSubscribed x k -> IO ()
1824−invalidateMergeHeight subscribed = do
1825− oldHeight <- readIORef $ mergeSubscribedHeight subscribed
1826− -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1827− when (oldHeight /= invalidHeight) $ do
1828− writeIORef (mergeSubscribedHeight subscribed) $! invalidHeight
1829− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1830−
1831−addMergeHeight :: Height -> MergeSubscribed x k -> IO ()
1832−addMergeHeight newParentHeight subscribed = do
1833− when debugInvalidateHeight $ putStrLn $ "addMergeHeight: " <> show newParentHeight <> " Merge" <> showNodeId subscribed
1834− oldHeights <- readIORef $ mergeSubscribedHeightBag subscribed
1835− let newHeights = heightBagAdd newParentHeight oldHeights
1836− writeIORef (mergeSubscribedHeightBag subscribed) $! newHeights
1837−
1838−revalidateMergeHeight :: MergeSubscribed x k -> IO ()
1839−revalidateMergeHeight subscribed = do
1840− currentHeight <- readIORef $ mergeSubscribedHeight subscribed
1841− when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1842− heights <- readIORef $ mergeSubscribedHeightBag subscribed
1843− parents <- readIORef $ mergeSubscribedParents subscribed
1844− -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1845− case heightBagSize heights `compare` DMap.size parents of
1846− LT -> return ()
1847− EQ -> do
1848− let height = succHeight $ heightBagMax heights
1849− when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1850− writeIORef (mergeSubscribedHeight subscribed) $! height
1851− WeakBag.traverse (mergeSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1852− GT -> error $ "revalidateMergeHeight: more heights than parents for Merge" <> showNodeId subscribed
1853−
18542439invalidateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
18552440invalidateCoincidenceHeight subscribed = do
18562441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
18572442 when (oldHeight /= invalidHeight) $ do
18582443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
1859− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2444+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
18602445
18612446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
18622447updateSwitchHeight new subscribed = do
@@ -1864,7 +2449,7 @@ updateSwitchHeight new subscribed = do
18642449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
18652450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
18662451 writeIORef (switchSubscribedHeight subscribed) $! new
1867− WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2452+ WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
18682453
18692454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
18702455recalculateCoincidenceHeight subscribed = do
@@ -1873,7 +2458,7 @@ recalculateCoincidenceHeight subscribed = do
18732458 height <- calculateCoincidenceHeight subscribed
18742459 when (height /= invalidHeight) $ do
18752460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
1876− WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2461+ WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
18772462
18782463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
18792464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -1912,183 +2497,170 @@ invalidate toReconnectRef wis = do
19122497-- Reflex integration
19132498--------------------------------------------------------------------------------
19142499
1915−-- | The default, global Spider environment
1916−type Spider = SpiderTimeline Global
1917−
19182500-- | Designates the default, global Spider timeline
1919−data Global
1920−
1921−{-# NOINLINE globalSpiderTimeline #-}
1922−globalSpiderTimeline :: SpiderTimeline Global
1923−globalSpiderTimeline = unsafePerformIO unsafeNewSpiderTimeline
1924−
1925−-- | Stores all global data relevant to a particular Spider timeline; only one
1926−-- value should exist for each type @x@
1927−data SpiderTimeline x = SpiderTimeline
1928− { _spiderTimeline_toUnsubscribe :: !(IORef [EventSubscription x])
1929− , _spiderTimeline_lock :: !(MVar ())
1930− , _spiderTimeline_cleanups :: !(IORef [IO ()])
1931−#ifdef DEBUG
1932− , _spiderTimeline_depth :: !(IORef Int)
1933−#endif
1934− }
2501+data SpiderTimeline x
19352502type role SpiderTimeline nominal
19362503
1937−instance GEq SpiderTimeline where
1938− a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
1939− then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimeline can't have two different 'x' arguments
1940− else Nothing
1941−
1942−unsafeNewSpiderTimeline :: forall x. IO (SpiderTimeline x)
1943−unsafeNewSpiderTimeline = do
1944− toUnsubscribe <- newIORef []
1945− lock <- newMVar ()
1946− cleanups <- newIORef []
1947−#ifdef DEBUG
1948− depthRef <- newIORef 0
1949−#endif
1950− return $ SpiderTimeline
1951− { _spiderTimeline_toUnsubscribe = toUnsubscribe
1952− , _spiderTimeline_lock = lock
1953− , _spiderTimeline_cleanups = cleanups
1954−#ifdef DEBUG
1955− , _spiderTimeline_depth = depthRef
1956−#endif
1957− }
1958−
1959−-- | Create a new SpiderTimeline
1960−newSpiderTimeline :: IO (Some SpiderTimeline)
1961−newSpiderTimeline = withSpiderTimeline (pure . Some.This)
2504+-- | The default, global Spider environment
2505+type Spider = SpiderTimeline Global
19622506
1963−-- | Pass a new timeline to the given function.
1964−withSpiderTimeline :: (forall x. SpiderTimeline x -> IO r) -> IO r
1965−withSpiderTimeline k = unsafeNewSpiderTimeline >>= k
2507+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508+ {-# INLINABLE sample #-}
2509+ sample (SpiderBehavior b) = readBehaviorUntracked b
19662510
1967−newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2511+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512+ {-# INLINABLE hold #-}
2513+ hold = holdSpiderEventM
2514+ {-# INLINABLE holdDyn #-}
2515+ holdDyn = holdDynSpiderEventM
2516+ {-# INLINABLE holdIncremental #-}
2517+ holdIncremental = holdIncrementalSpiderEventM
2518+ {-# INLINABLE buildDynamic #-}
2519+ buildDynamic = buildDynamicSpiderEventM
2520+ {-# INLINABLE headE #-}
2521+ headE = R.slowHeadE
2522+-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2525+
2526+instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527+ {-# INLINABLE sample #-}
2528+ sample = coerce . readBehaviorTracked . unSpiderBehavior
19682529
1969−newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2530+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531+ {-# INLINABLE sample #-}
2532+ sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
19702533
1971−instance Functor (R.Dynamic (SpiderTimeline x)) where
1972− fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
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
19732548
1974−instance Applicative (R.Dynamic (SpiderTimeline x)) where
1975− pure = SpiderDynamic . dynamicConst
1976− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ zipDynWith ($) a b
1977− _ *> b = b
1978− a <* _ = a
19792549
1980−instance Monad (R.Dynamic (SpiderTimeline x)) where
2550+instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
19812551 {-# INLINE return #-}
19822552 return = pure
19832553 {-# INLINE (>>=) #-}
19842554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
19852555 {-# INLINE (>>) #-}
1986− _ >> y = y
2556+ (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
19872558 {-# INLINE fail #-}
19882559 fail _ = error "Dynamic does not support 'fail'"
2560+#endif
19892561
1990−instance R.Reflex (SpiderTimeline x) where
1991− newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
1992− newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
1993− newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
1994− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
1995− type PullM (SpiderTimeline x) = SpiderPullM x
1996− type PushM (SpiderTimeline x) = SpiderPushM x
1997− {-# INLINABLE never #-}
1998− never = SpiderEvent eventNever
1999− {-# INLINABLE constant #-}
2000− constant = SpiderBehavior . behaviorConst
2001− {-# INLINABLE push #-}
2002− push f = SpiderEvent . push (coerce f) . unSpiderEvent
2003− {-# INLINABLE pull #-}
2004− pull = SpiderBehavior . pull . coerce
2005− {-# INLINABLE merge #-}
2006− merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2007− {-# INLINABLE fan #-}
2008− fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2009− {-# INLINABLE switch #-}
2010− switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2011− {-# INLINABLE coincidence #-}
2012− coincidence = SpiderEvent . coincidence . (coerce :: Event x (R.Event (SpiderTimeline x) a) -> Event x (Event x a)) . unSpiderEvent
2013− {-# INLINABLE current #-}
2014− current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2015− {-# INLINABLE updated #-}
2016− updated = SpiderEvent . fmap runIdentity . dynamicUpdated . unSpiderDynamic
2017− {-# INLINABLE unsafeBuildDynamic #-}
2018− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
2019− {-# INLINABLE unsafeBuildIncremental #-}
2020− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2021− {-# INLINABLE mergeIncremental #-}
2022− mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (R.PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (R.PatchDMap k (Event x))) . unSpiderIncremental
2023− {-# INLINABLE currentIncremental #-}
2024− currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2025− {-# INLINABLE updatedIncremental #-}
2026− updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
2027− {-# INLINABLE incrementalToDynamic #-}
2028− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2029− c <- readBehaviorUntracked $ dynamicCurrent i
2030− return $ Identity <$> R.apply p c --TODO: Avoid the redundant 'apply'
2031− eventCoercion Coercion = Coercion
2032− behaviorCoercion Coercion = Coercion
2033− dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
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'
20342571
2035−instance R.MonadSample (SpiderTimeline x) (EventM x) where
2036− {-# INLINABLE sample #-}
2037− sample (SpiderBehavior b) = readBehaviorUntracked b
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
20382575
2039−instance R.MonadHold (SpiderTimeline x) (EventM x) where
2040− {-# INLINABLE hold #-}
2041− hold = holdSpiderEventM
2042− {-# INLINABLE holdDyn #-}
2043− holdDyn = holdDynSpiderEventM
2044− {-# INLINABLE holdIncremental #-}
2045− holdIncremental = holdIncrementalSpiderEventM
2576+mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577+mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578+{-# INLINE [1] mapDynamicSpider #-}
2579+
2580+instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581+ pure = SpiderDynamic . dynamicConst
2582+#if MIN_VERSION_base(4,10,0)
2583+ liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2584+#endif
2585+ SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586+ a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587+ (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588+
2589+holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590+holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
20462591
2047−holdSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Behavior (SpiderTimeline x) a)
2048−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2592+holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593+holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
20492594
2050−holdDynSpiderEventM :: a -> R.Event (SpiderTimeline x) a -> EventM x (R.Dynamic (SpiderTimeline x) a)
2051−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2595+holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596+holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
20522597
2053−holdIncrementalSpiderEventM :: R.Patch p => R.PatchTarget p -> R.Event (SpiderTimeline x) p -> EventM x (R.Incremental (SpiderTimeline x) p)
2054−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ hold v0 $ unSpiderEvent e
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
20552600
2056−instance R.MonadHold (SpiderTimeline x) (SpiderHost x) where
2601+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
20572602 {-# INLINABLE hold #-}
2058− hold v0 e = R.runHostFrame $ R.hold v0 e
2603+ hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
20592604 {-# INLINABLE holdDyn #-}
2060− holdDyn v0 e = R.runHostFrame $ R.holdDyn v0 e
2605+ holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
20612606 {-# INLINABLE holdIncremental #-}
2062− 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
20632618
2064−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
20652635 {-# INLINABLE sample #-}
20662636 sample = runFrame . readBehaviorUntracked . unSpiderBehavior
20672637
2068−instance R.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2638+instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
20692639 {-# INLINABLE sample #-}
2070− sample = coerce . readBehaviorTracked . unSpiderBehavior
2071−
2072−instance R.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2073− {-# INLINABLE sample #-}
2074− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2640+ sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
20752641
2076−instance R.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2642+instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
20772643 {-# INLINABLE hold #-}
2078− hold v0 e = R.current <$> R.holdDyn v0 e
2644+ hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
20792645 {-# INLINABLE holdDyn #-}
2080− 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
20812647 {-# INLINABLE holdIncremental #-}
2082− 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
20832655
2084−data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
2085−
2086−data SpiderEventHandle x a = SpiderEventHandle
2087− { spiderEventHandleSubscription :: EventSubscription x
2088− , spiderEventHandleValue :: IORef (Maybe a)
2089− }
2656+--------------------------------------------------------------------------------
2657+-- Deprecated items
2658+--------------------------------------------------------------------------------
20902659
2091−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
20922664 {-# INLINABLE subscribeEvent #-}
20932665 subscribeEvent e = SpiderHostFrame $ do
20942666 --TODO: Unsubscribe eventually (manually and/or with weak ref)
@@ -2105,18 +2677,149 @@ instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
21052677 , spiderEventHandleValue = val
21062678 }
21072679
2108−instance R.ReflexHost (SpiderTimeline x) where
2680+instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
21092681 type EventTrigger (SpiderTimeline x) = RootTrigger x
21102682 type EventHandle (SpiderTimeline x) = SpiderEventHandle x
21112683 type HostFrame (SpiderTimeline x) = SpiderHostFrame x
21122684
2113−instance R.MonadReadEvent (SpiderTimeline x) (ReadPhase x) where
2685+instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
21142686 {-# NOINLINE readEvent #-}
2115− readEvent h = ReadPhase $ fmap (fmap return) $ liftIO $ do
2687+ readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
21162688 result <- readIORef $ spiderEventHandleValue h
21172689 touch h
21182690 return result
21192691
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+
21202823instance MonadRef (EventM x) where
21212824 type Ref (EventM x) = Ref IO
21222825 {-# INLINABLE newRef #-}
@@ -2131,7 +2834,7 @@ instance MonadAtomicRef (EventM x) where
21312834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
21322835
21332836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2134−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)
21352838
21362839instance Monad (SpiderHost x) where
21372840 {-# INLINABLE (>>=) #-}
@@ -2140,20 +2843,27 @@ instance Monad (SpiderHost x) where
21402843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
21412844 {-# INLINABLE return #-}
21422845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
21432847 {-# INLINABLE fail #-}
2144− 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
21452854
21462855-- | Run an action affecting the global Spider timeline; this will be guarded by
21472856-- a mutex for that timeline
21482857runSpiderHost :: SpiderHost Global a -> IO a
2149−runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimeline
2858+runSpiderHost (SpiderHost a) = a
21502859
21512860-- | Run an action affecting a given Spider timeline; this will be guarded by a
21522861-- mutex for that timeline
2153−runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimeline x -> IO a
2154−runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2862+runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863+runSpiderHostForTimeline (SpiderHost a) _ = a
21552864
2156−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)
21572867
21582868instance Monad (SpiderHostFrame x) where
21592869 {-# INLINABLE (>>=) #-}
@@ -2162,26 +2872,21 @@ instance Monad (SpiderHostFrame x) where
21622872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
21632873 {-# INLINABLE return #-}
21642874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
21652876 {-# INLINABLE fail #-}
21662877 fail s = SpiderHostFrame $ fail s
2878+#endif
21672879
2168−instance R.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2169− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2170−
2171−instance R.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2172− {-# INLINABLE hold #-}
2173− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2174− {-# INLINABLE holdDyn #-}
2175− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ hold v0 $ coerce $ unSpiderEvent e
2176− {-# INLINABLE holdIncremental #-}
2177− 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 ()
21782883
2179−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)
21802885newEventWithTriggerIO f = do
21812886 es <- newFanEventWithTriggerIO $ \Refl -> f
21822887 return $ select es Refl
21832888
2184−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)
21852890newFanEventWithTriggerIO f = do
21862891 occRef <- newIORef DMap.empty
21872892 subscribedRef <- newIORef DMap.empty
@@ -2192,41 +2897,8 @@ newFanEventWithTriggerIO f = do
21922897 }
21932898 return $ EventSelector $ \k -> eventRoot k r
21942899
2195−instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2196− newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2197− newFanEventWithTrigger f = SpiderHost $ lift $ do
2198− es <- newFanEventWithTriggerIO f
2199− return $ R.EventSelector $ SpiderEvent . select es
2200−
2201−instance R.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2202− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2203− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2204− es <- newFanEventWithTriggerIO f
2205− return $ R.EventSelector $ SpiderEvent . select es
2206−
2207−instance R.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2208− {-# INLINABLE subscribeEvent #-}
2209− subscribeEvent = runFrame . runSpiderHostFrame . R.subscribeEvent
2210−
22112900newtype ReadPhase x a = ReadPhase (ResultM x a) deriving (Functor, Applicative, Monad, MonadFix)
22122901
2213−instance R.MonadSample (SpiderTimeline x) (ReadPhase x) where
2214− {-# INLINABLE sample #-}
2215− sample = ReadPhase . R.sample
2216−
2217−instance R.MonadHold (SpiderTimeline x) (ReadPhase x) where
2218− {-# INLINABLE hold #-}
2219− hold v0 e = ReadPhase $ R.hold v0 e
2220− {-# INLINABLE holdDyn #-}
2221− holdDyn v0 e = ReadPhase $ R.holdDyn v0 e
2222− {-# INLINABLE holdIncremental #-}
2223− holdIncremental v0 e = ReadPhase $ R.holdIncremental v0 e
2224−
2225−instance R.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2226− type ReadPhase (SpiderHost x) = ReadPhase x
2227− fireEventsAndRead es (ReadPhase a) = run es a
2228− runHostFrame = runFrame . runSpiderHostFrame
2229−
22302902instance MonadRef (SpiderHost x) where
22312903 type Ref (SpiderHost x) = Ref IO
22322904 newRef = SpiderHost . newRef
@@ -2249,9 +2921,10 @@ instance PrimMonad (SpiderHostFrame x) where
22492921 type PrimState (SpiderHostFrame x) = PrimState IO
22502922 primitive = SpiderHostFrame . EventM . primitive
22512923
2252−--------------------------------------------------------------------------------
2253−-- Deprecated items
2254−--------------------------------------------------------------------------------
2924+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925+ notReadyUntil _ = return ()
2926+ notReady = return ()
22552927
2256−{-# DEPRECATED SpiderEnv "Use 'SpiderTimeline' instead" #-}
2257−type SpiderEnv = SpiderTimeline
2928+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929+ notReadyUntil _ = return ()
2930+ notReady = return ()