@@ -8,50 +8,43 @@
88{-# LANGUAGE FunctionalDependencies #-}
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11+#if defined(DEBUG) || defined(DEBUG_CYCLES)
1112{-# LANGUAGE LambdaCase #-}
13+#endif
14+{-# LANGUAGE MagicHash #-}
15+{-# LANGUAGE MultiParamTypeClasses #-}
16+{-# LANGUAGE MultiWayIf #-}
1217{-# LANGUAGE RankNTypes #-}
1318{-# LANGUAGE RoleAnnotations #-}
1419{-# LANGUAGE ScopedTypeVariables #-}
1520{-# LANGUAGE TypeFamilies #-}
1621{-# LANGUAGE TypeOperators #-}
1722{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2423#ifdef USE_REFLEX_OPTIMIZER
2524{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2625#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
26+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27+{-# OPTIONS_GHC -fno-warn-orphans #-}
28+#endif
2829-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2930-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3031module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
3132
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
33+import Control.Applicative
3534import Control.Concurrent
3635import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
36+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3837import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
38+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4039import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
40+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4441import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4742import Data.Align
4843import Data.Coerce
49−import Data.Dependent.Map (DMap)
44+import Data.Dependent.Map (DMap, DSum (..))
5045import 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
5446import Data.Foldable hiding (concat, elem, sequence_)
47+import Data.Function
5548import Data.Functor.Constant
5649import Data.Functor.Misc
5750import Data.Functor.Product
@@ -59,73 +52,57 @@ import Data.GADT.Compare
5952import Data.IntMap.Strict (IntMap)
6053import qualified Data.IntMap.Strict as IntMap
6154import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
55+import Data.List hiding (foldl')
56+import Data.Maybe
57+import Data.Monoid ((<>))
6558import Data.Proxy
6659import Data.These
6760import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
61+import Data.Word
62+import GHC.Exts
7163import GHC.IORef (IORef (..))
7264import GHC.Stack
73−import Reflex.FastWeak
65+import Reflex.FunctorMaybe
7466import System.IO.Unsafe
7567import System.Mem.Weak
7668import Unsafe.Coerce
7769
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−
8770#ifdef DEBUG_CYCLES
8871import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9172import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9273import qualified Data.List.NonEmpty as NonEmpty
74+import Data.Monoid (mempty)
9375import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
95−
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
97−import qualified Data.FastWeakBag as FastWeakBag
76+#endif
9877
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10378import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10479import qualified Data.WeakBag as WeakBag
80+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
81+import Data.Reflection
82+import Data.Some (Some)
83+import qualified Data.Some as Some
84+import Data.Type.Coercion
10585import qualified Reflex.Class
10686import qualified Reflex.Class as R
10787import 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)
88+#endif
89+import Reflex.Patch
90+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
91+
92+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
93+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11294
11395#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
11596import System.IO (stderr)
116−import Data.List (isPrefixOf)
97+import qualified Data.ByteString.Char8 as BS8
11798#endif
11899
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123100#ifdef DEBUG_TRACE_EVENTS
101+
124102withStackOneLine :: (BS8.ByteString -> a) -> a
125103withStackOneLine expr = unsafePerformIO $ do
126104 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
105+ return (expr (BS8.pack (unwords (reverse stack))))
129106
130107#endif
131108
@@ -136,42 +113,28 @@ debugInvalidateHeight :: Bool
136113debugInvalidate :: Bool
137114
138115#ifdef DEBUG
116+
139117#define DEBUG_NODEIDS
140118
141−#ifdef DEBUG_TRACE_PROPAGATION
142119debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146120
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150121debugInvalidateHeight = False
151−#endif
152122
153−#ifdef DEBUG_TRACE_INVALIDATION
154123debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158124
159125class HasNodeId a where
160126 getNodeId :: a -> Int
161127
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
128+instance HasNodeId (Hold x p a) where
169129 getNodeId = holdNodeId
170130
131+instance HasNodeId (PushSubscribed x a b) where
132+ getNodeId = pushSubscribedNodeId
133+
171134instance HasNodeId (SwitchSubscribed x a) where
172135 getNodeId = switchSubscribedNodeId
173136
174−instance HasNodeId (FanSubscribed x v a) where
137+instance HasNodeId (FanSubscribed x a) where
175138 getNodeId = fanSubscribedNodeId
176139
177140instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +148,41 @@ instance HasNodeId (Pull x a) where
185148
186149{-# INLINE showNodeId #-}
187150showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
151+showNodeId = ("#"<>) . show . getNodeId
152+
153+showSubscriberType :: Subscriber x a -> String
154+showSubscriberType = \case
155+ SubscriberPush _ _ -> "SubscriberPush"
156+ SubscriberMerge _ _ -> "SubscriberMerge"
157+ SubscriberFan _ -> "SubscriberFan"
158+ SubscriberMergeChange _ -> "SubscriberMergeChange"
159+ SubscriberHold _ -> "SubscriberHold"
160+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
161+ SubscriberSwitch _ -> "SubscriberSwitch"
162+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
163+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
164+ SubscriberHandle -> "SubscriberHandle"
165+
166+showEventType :: Event x a -> String
167+showEventType = \case
168+ EventRoot _ _ -> "EventRoot"
169+ EventNever -> "EventNever"
170+ EventPush _ -> "EventPush"
171+ EventMerge _ -> "EventMerge"
172+ EventFan _ _ -> "EventFan"
173+ EventSwitch _ -> "EventSwitch"
174+ EventCoincidence _ -> "EventCoincidence"
175+ EventHold _ -> "EventHold"
176+ EventDyn _ -> "EventDyn"
177+ EventHoldIdentity _ -> "EventHoldIdentity"
178+ EventDynIdentity _ -> "EventDynIdentity"
193179
194180#else
195181
196182debugPropagate = False
183+
197184debugInvalidateHeight = False
185+
198186debugInvalidate = False
199187
200188-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +190,6 @@ debugInvalidate = False
202190showNodeId :: a -> String
203191showNodeId _ = ""
204192
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209193#endif
210194
211195#ifdef DEBUG_NODEIDS
@@ -215,6 +199,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215199
216200newNodeId :: IO Int
217201newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
202+
203+{-# NOINLINE unsafeNodeId #-}
204+unsafeNodeId :: a -> Int
205+unsafeNodeId a = unsafePerformIO $ do
206+ touch a
207+ newNodeId
218208#endif
219209
220210--------------------------------------------------------------------------------
@@ -250,165 +240,85 @@ subscribeAndRead = unEvent
250240-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251241-- caching; if the computation function is very cheap, this is (much) more
252242-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
243+{-# NOINLINE pushCheap #-}
254244pushCheap :: 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
245+pushCheap f e = Event $ \sub -> do
246+ (subscription, occ) <- subscribeAndRead e $ sub
257247 { subscriberPropagate = \a -> do
258− mb <- f a
248+ mb <- runComputeM $ f a
259249 mapM_ (subscriberPropagate sub) mb
260250 }
261− occ' <- join <$> mapM f occ
251+ occ' <- join <$> mapM (runComputeM . f) occ
262252 return (subscription, occ')
263253
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−
301254data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
255+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
256+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303257 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
258+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304259 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308260 }
309261
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−
325262-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326263-- repeatedly
327264--
328265--TODO: Try a caching strategy where we subscribe directly to the parent when
329−--there's only one subscriber, and then build our own FastWeakBag only when a second
266+--there's only one subscriber, and then build our own WeakBag only when a second
330267--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
268+{-# NOINLINE cacheEvent #-}
269+cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
333270cacheEvent e =
334271#ifdef DEBUG_TRACE_EVENTS
335272 withStackOneLine $ \callSite -> Event $
336273#else
337274 Event $
338275#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
276+ let !mSubscribedRef = unsafeNewIORef e Nothing
277+ in \sub -> {-# SCC "cacheEvent" #-} do
343278#ifdef DEBUG_TRACE_EVENTS
344279 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345280#endif
346− subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347− Just subscribedTicket -> return subscribedTicket
281+ mSubscribed <- liftIO $ readIORef mSubscribedRef
282+ case mSubscribed of
283+ Just subscribed -> liftIO $ do
284+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
285+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
286+ let es = EventSubscribed
287+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
288+ , eventSubscribedRetained = toAny subscribed
289+ }
290+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
348291 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
292+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
293+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
294+ occRef <- liftIO $ newIORef undefined
357295 (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
296+ { subscriberPropagate = \a -> do
297+ liftIO $ writeIORef occRef $ Just a
298+ scheduleClear occRef
299+ propagate a subscribers
300+ , subscriberInvalidateHeight = \old -> do
301+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
302+ , subscriberRecalculateHeight = \new -> do
303+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
304+ }
305+ liftIO $ writeIORef occRef occ
306+ when (isJust occ) $ scheduleClear occRef
369307 let !subscribed = CacheSubscribed
370308 { _cacheSubscribed_subscribers = subscribers
309+ , _cacheSubscribed_weakSelf = weakSelf
371310 , _cacheSubscribed_parent = parentSub
311+ , _cacheSubscribed_cached = mSubscribedRef
372312 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376313 }
377− subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378− liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379− return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
314+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
315+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
316+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
411317
318+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
319+cleanupCacheSubscribed self = do
320+ unsubscribe $ _cacheSubscribed_parent self
321+ writeIORef (_cacheSubscribed_cached self) Nothing
412322
413323subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414324subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +330,13 @@ wrap tag getSpecificSubscribed sub = do
420330 let es = tag subd
421331 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422332
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
333+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424334eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425335
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429336eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
337+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431338
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
339+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433340eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434341
435342eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +345,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438345eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439346eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440347
441−eventHold :: Hold x p -> Event x p
348+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442349eventHold !h = Event $ subscribeHoldEvent h
443350
444351eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
445352eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446353
447354{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
355+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449356subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450357 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451358 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,6 +371,16 @@ data Subscriber x a = Subscriber
464371 , subscriberRecalculateHeight :: !(Height -> IO ())
465372 }
466373
374+--TODO: Move this comment to WeakBag
375+-- These function are constructor functions that are marked NOINLINE so they are
376+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
377+-- so any weak references that are attached to the constructors will have their
378+-- finalizer run. Using the opaque constructor, does not see the
379+-- constructor application, so it behaves like an IORef and cannot be fused away.
380+--
381+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
382+-- the weak pointer to it in some cases.
383+
467384newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468385newSubscriberHold h = return $ Subscriber
469386 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +388,85 @@ newSubscriberHold h = return $ Subscriber
471388 , subscriberRecalculateHeight = \_ -> return ()
472389 }
473390
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
391+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
392+newSubscriberFan subscribed = return $ Subscriber
476393 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477394 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
395+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479396 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480397 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
398+ let f _ (Pair (Identity v) subsubs) = do
482399 propagate v $ _fanSubscribedChildren_list subsubs
483400 return $ Constant ()
484401 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485402 return ()
486403 , subscriberInvalidateHeight = \old -> do
404+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487405 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
406+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
407+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489408 , subscriberRecalculateHeight = \new -> do
409+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490410 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
411+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
412+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492413 }
493414
494415newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
416+newSubscriberSwitch subscribed = return $ Subscriber
496417 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
418+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497419 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498420 scheduleClear $ switchSubscribedOccurrence subscribed
499421 propagate a $ switchSubscribedSubscribers subscribed
500422 , subscriberInvalidateHeight = \_ -> do
423+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501424 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502425 when (oldHeight /= invalidHeight) $ do
503426 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
427+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
428+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
429+ , subscriberRecalculateHeight = \new -> do
430+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
431+ updateSwitchHeight new subscribed
432+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
433+ }
507434
508435newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
436+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510437 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
438+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511439 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512440 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513441 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514442 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515443 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517444 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518445 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519446 case occ of
520− Nothing ->
447+ Nothing -> do
521448 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522449 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
450+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
451+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525452 Just o -> do -- Since it's already firing, no need to adjust height
526453 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527454 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528455 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
456+ , subscriberInvalidateHeight = \_ -> do
457+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
458+ invalidateCoincidenceHeight subscribed
459+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
460+ , subscriberRecalculateHeight = \_ -> do
461+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
462+ recalculateCoincidenceHeight subscribed
463+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531464 }
532465
533466newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
467+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535468 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
469+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536470 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537471 case occ of
538472 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +474,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540474 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541475 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542476 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
477+ , subscriberInvalidateHeight = \_ -> do
478+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
479+ invalidateCoincidenceHeight subscribed
480+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
481+ , subscriberRecalculateHeight = \_ -> do
482+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
483+ recalculateCoincidenceHeight subscribed
484+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545485 }
546486
547487invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +491,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551491recalculateSubscriberHeight = flip subscriberRecalculateHeight
552492
553493-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
494+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
495+propagate a subscribers = withIncreasedDepth $ do
556496 -- 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
557497 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
559−
560−-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
563− -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
564− --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
498+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566499
567500--------------------------------------------------------------------------------
568501-- EventSubscribed
@@ -571,16 +504,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571504toAny :: a -> Any
572505toAny = unsafeCoerce
573506
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.
579507data EventSubscribed x = EventSubscribed
580508 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581509 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582510#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
511+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584512 , eventSubscribedHasOwnHeightRef :: !Bool
585513 , eventSubscribedWhoCreated :: !(IO [String])
586514#endif
@@ -607,23 +535,13 @@ eventSubscribedNever = EventSubscribed
607535 , eventSubscribedWhoCreated = return ["never"]
608536#endif
609537 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620538
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
539+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622540eventSubscribedFan !subscribed = EventSubscribed
623541 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624542 , eventSubscribedRetained = toAny subscribed
625543#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
544+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627545 , eventSubscribedHasOwnHeightRef = False
628546 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629547#endif
@@ -636,7 +554,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636554#ifdef DEBUG_CYCLES
637555 , eventSubscribedGetParents = do
638556 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
557+ return [Some.This $ _eventSubscription_subscribed s]
640558 , eventSubscribedHasOwnHeightRef = True
641559 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642560#endif
@@ -649,8 +567,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649567#ifdef DEBUG_CYCLES
650568 , eventSubscribedGetParents = do
651569 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
570+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
571+ innerParents = maybeToList $ fmap Some.This innerSubscription
654572 return $ outerParent : innerParents
655573 , eventSubscribedHasOwnHeightRef = True
656574 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +582,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664582whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665583whoCreatedEventSubscribed = eventSubscribedWhoCreated
666584
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
585+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668586walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
587+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670588 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671589 when (h == invalidHeight) $ do
672590 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
591+ modify (Some.This s :)
674592 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
593+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676594 return subscribers
677595#endif
678596
679597{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
598+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681599subscribeHoldEvent = subscribeAndRead . holdEvent
682600
683601--------------------------------------------------------------------------------
@@ -700,7 +618,7 @@ behaviorPull !p = Behavior $ do
700618 val <- liftIO $ readIORef $ pullValue p
701619 case val of
702620 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
621+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704622 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705623 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706624 return $ pullSubscribedValue subscribed
@@ -709,7 +627,7 @@ behaviorPull !p = Behavior $ do
709627 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710628 parentsRef <- liftIO $ newIORef []
711629 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
630+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713631 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714632 parents <- liftIO $ readIORef parentsRef
715633 let subscribed = PullSubscribed
@@ -719,7 +637,7 @@ behaviorPull !p = Behavior $ do
719637 , pullSubscribedParents = parents
720638 }
721639 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
640+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723641 return a
724642
725643behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,8 +648,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730648readHoldTracked h = do
731649 result <- liftIO $ readIORef $ holdValue h
732650 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
734− liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
651+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735652 return result
736653
737654{-# INLINABLE readBehaviorUntracked #-}
@@ -744,46 +661,42 @@ readBehaviorUntracked b = do
744661-- Dynamic
745662--------------------------------------------------------------------------------
746663
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`?
664+data Dynamic x p = Dynamic
665+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
666+ , dynamicUpdated :: !(Event x p)
752667 }
753668
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
669+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760670dynamicHold !h = Dynamic
761671 { dynamicCurrent = behaviorHold h
762672 , dynamicUpdated = eventHold h
763673 }
764674
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
675+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766676dynamicHoldIdentity = dynamicHold
767677
768−dynamicConst :: PatchTarget p -> DynamicS x p
678+dynamicConst :: PatchTarget p -> Dynamic x p
769679dynamicConst !a = Dynamic
770680 { dynamicCurrent = behaviorConst a
771681 , dynamicUpdated = eventNever
772682 }
773683
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
684+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775685dynamicDyn !d = Dynamic
776686 { dynamicCurrent = behaviorDyn d
777687 , dynamicUpdated = eventDyn d
778688 }
779689
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
690+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781691dynamicDynIdentity = dynamicDyn
782692
783693--------------------------------------------------------------------------------
784694-- Combinators
785695--------------------------------------------------------------------------------
786696
697+--TODO: Figure out why certain things are not 'representational', then make them
698+--representational so we can use coerce
699+
787700--type role Hold representational
788701data Hold x p
789702 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,7 +708,9 @@ data Hold x p
795708#endif
796709 }
797710
798−-- | A statically allocated 'SpiderTimeline'
711+-- | A statically allocated 'SpiderTimeline'; this is the only instance of
712+-- 'SpiderTimeline' that can used when using
713+-- -fspecialize-to-spidertimeline-global.
799714data Global
800715
801716{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -804,27 +719,30 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804719
805720-- | Stores all global data relevant to a particular Spider timeline; only one
806721-- 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
722+data SpiderTimelineEnv x = SpiderTimelineEnv
813723 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814724 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815725#ifdef DEBUG
816726 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817727#endif
818728 }
819−type role SpiderTimelineEnv' phantom
729+type role SpiderTimelineEnv nominal
820730
821731instance Eq (SpiderTimelineEnv x) where
822732 _ == _ = True -- Since only one exists of each type
823733
824734instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
735+#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
736+ geqToEq _ = id
737+ geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
738+ then case unsafeCoerce Refl :: a :~: b of
739+ Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
740+ else different
741+#else
742+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826743 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827744 else Nothing
745+#endif
828746
829747data EventEnv x
830748 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
@@ -832,9 +750,8 @@ data EventEnv x
832750 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833751 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834752 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
753+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
754+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838755 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839756 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840757 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +762,7 @@ runEventM :: EventM x a -> IO a
845762runEventM = unEventM
846763
847764asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
765+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849766
850767class MonadIO m => Defer a m where
851768 getDeferralQueue :: m (IORef [a])
@@ -894,7 +811,11 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
894811 delayedRef <- asksEventEnv eventEnvDelayedMerges
895812 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896813
814+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
815+class x ~ Global => HasSpiderTimeline x where
816+#else
897817class HasSpiderTimeline x where
818+#endif
898819 -- | Retrieve the current SpiderTimelineEnv
899820 spiderTimeline :: SpiderTimelineEnv x
900821
@@ -906,29 +827,21 @@ putCurrentHeight h = do
906827 heightRef <- asksEventEnv eventEnvCurrentHeight
907828 liftIO $ writeIORef heightRef $! h
908829
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
830+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910831 {-# INLINE getDeferralQueue #-}
911832 getDeferralQueue = asksEventEnv eventEnvClears
912833
913834{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
835+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
836+scheduleClear r = defer $ SomeClear r
916837
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
924−
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
838+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926839 {-# INLINE getDeferralQueue #-}
927840 getDeferralQueue = asksEventEnv eventEnvRootClears
928841
929842{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
843+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
844+scheduleRootClear r = defer $ SomeRootClear r
932845
933846instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934847 {-# INLINE getDeferralQueue #-}
@@ -957,7 +870,7 @@ hold v0 e = do
957870 return h
958871
959872{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
873+getHoldEventSubscription :: forall m p x. (Defer (SomeAssignment x) m, Defer (SomeHoldInit x) m, Defer SomeClear m, Patch p, HasCurrentHeight x m, Defer (SomeMergeInit x) m, Defer (SomeResetCoincidence x) m, HasSpiderTimeline x, m ~ EventM x) => Hold x p -> m (EventSubscription x)
961874getHoldEventSubscription h = do
962875 ep <- liftIO $ readIORef $ holdParent h
963876 case ep of
@@ -983,9 +896,9 @@ getHoldEventSubscription h = do
983896
984897type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985898
899+--type role BehaviorM representational
986900-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
901+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989902
990903instance Monad (BehaviorM x) where
991904 {-# INLINE (>>=) #-}
@@ -994,16 +907,14 @@ instance Monad (BehaviorM x) where
994907 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995908 {-# INLINE return #-}
996909 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998910 {-# INLINE fail #-}
999911 fail s = BehaviorM $ fail s
1000−#endif
1001912
1002913data BehaviorSubscribed x a
1003914 = forall p. BehaviorSubscribedHold (Hold x p)
1004915 | BehaviorSubscribedPull (PullSubscribed x a)
1005916
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
917+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007918
1008919--type role PullSubscribed representational
1009920data PullSubscribed x a
@@ -1038,7 +949,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038949#endif
1039950 }
1040951
1041−data Root x k
952+data Root x (k :: * -> *)
1042953 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043954 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044955 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +968,22 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057968newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058969
1059970-- 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)
971+newtype EventM x a = EventM { unEventM :: 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
972+
973+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x], IORef [SomeDynInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
974+
975+instance Defer (SomeHoldInit x) (ComputeM x) where
976+ getDeferralQueue = ComputeM $ asks fst
977+
978+instance Defer (SomeDynInit x) (ComputeM x) where
979+ getDeferralQueue = ComputeM $ asks snd
980+
981+{-# INLINABLE runComputeM #-}
982+runComputeM :: (Defer (SomeHoldInit x) m, Defer (SomeDynInit x) m) => ComputeM x a -> m a
983+runComputeM (ComputeM a) = do
984+ holds <- getDeferralQueue
985+ dyns <- getDeferralQueue
986+ liftIO $ runReaderT a (holds, dyns)
1061987
1062988newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1063989
@@ -1082,8 +1008,7 @@ heightBagFromList :: [Height] -> HeightBag
10821008heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831009
10841010heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1011+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871012
10881013heightBagRemove :: Height -> HeightBag -> HeightBag
10891014heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1017,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921017 0 -> IntMap.delete h c
10931018 _ -> IntMap.insert h (pred old) c
10941019
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−
11021020heightBagMax :: HeightBag -> Height
11031021heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041022 Just ((h, _), _) -> Height h
@@ -1116,25 +1034,25 @@ heightBagVerify b@(HeightBag s c) = if
11161034heightBagVerify = id
11171035#endif
11181036
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)))
1037+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1038+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1039+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1040+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231041 }
11241042
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
1043+data FanSubscribed (x :: *) k
1044+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1045+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1046+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291047 , fanSubscribedParent :: !(EventSubscription x)
11301048#ifdef DEBUG_NODEIDS
11311049 , fanSubscribedNodeId :: Int
11321050#endif
11331051 }
11341052
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1053+data Fan x k
1054+ = Fan { fanParent :: !(Event x (DMap k Identity))
1055+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381056 }
11391057
11401058data SwitchSubscribed x a
@@ -1188,35 +1106,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881106newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891107newInvalidatorPull p = return $! InvalidatorPull p
11901108
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1109+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1110+ fmapMaybe f = push $ return . f
11931111
11941112instance HasSpiderTimeline x => Align (Event x) where
11951113 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1198−#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
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)
1114+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromList [LeftTag :=> ea, RightTag :=> eb]
12121115
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1116+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141117
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1118+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161119newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171120
12181121--TODO: Avoid the duplication between this and R.zipDynWith
1219−zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> DynamicS x (Identity a) -> DynamicS x (Identity b) -> DynamicS x (Identity c)
1122+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201123zipDynWith f da db =
12211124 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221125 ec = flip push eab $ \o -> do
@@ -1231,20 +1134,26 @@ zipDynWith f da db =
12311134 return $ Just $ Identity $ f a b
12321135 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331136
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1137+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
12351138buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1139+ result <- liftIO $ newIORef $ Left (readV0, v')
12371140 let !d = Dyn result
12381141 defer $ SomeDynInit d
12391142 return d
12401143
12411144unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1145+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1146+ where x = (readV0, v')
12441147
12451148-- ResultM can read behaviors and events
12461149type ResultM = EventM
12471150
1151+{-# NOINLINE unsafeNewIORef #-}
1152+unsafeNewIORef :: a -> b -> IORef b
1153+unsafeNewIORef a b = unsafePerformIO $ do
1154+ touch a
1155+ newIORef b
1156+
12481157instance HasSpiderTimeline x => Functor (Event x) where
12491158 fmap f = push $ return . Just . f
12501159
@@ -1257,42 +1166,33 @@ push f e = cacheEvent (pushCheap f e)
12571166
12581167{-# INLINABLE pull #-}
12591168pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1169+pull a = behaviorPull $ Pull
1170+ { pullCompute = a
1171+ , pullValue = unsafeNewIORef a Nothing
12681172#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1173+ , pullNodeId = unsafeNodeId a
12701174#endif
1271− }
1175+ }
12721176
12731177{-# INLINABLE switch #-}
12741178switch :: 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− }
1179+switch a = eventSwitch $ Switch
1180+ { switchParent = a
1181+ , switchSubscribed = unsafeNewIORef a Nothing
1182+ }
12811183
12821184coincidence :: 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− }
1185+coincidence a = eventCoincidence $ Coincidence
1186+ { coincidenceParent = a
1187+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1188+ }
12891189
12901190-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911191run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921192run roots after = do
12931193 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
1194+ t <- SpiderHost ask
1195+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961196 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971197 occBefore <- liftIO $ do
12981198 occBefore <- readIORef occRef
@@ -1330,11 +1230,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301230 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311231 EQ -> a
13321232
1333−newtype Clear a = Clear (IORef (Maybe a))
1334−
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1233+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13361234
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1235+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381236
13391237data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401238
@@ -1346,110 +1244,55 @@ mkWeakPtrWithDebug x debugNote = do
13461244 x' <- evaluate x
13471245 mkWeakPtr x' $
13481246 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1247+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501248 else Nothing
13511249
13521250type WeakList a = [Weak a]
13531251
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
1360−
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1366− {
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378− }
1379−
1380−
13811252{-# 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
1253+#ifdef DEBUG
1254+withIncreasedDepth :: CanTrace x m => m a -> m a
1255+withIncreasedDepth a = do
1256+ spiderTimeline <- askSpiderTimelineEnv
1257+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851258 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1259+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871260 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121261#else
1262+withIncreasedDepth :: m a -> m a
1263+withIncreasedDepth = id
1264+#endif
14131265
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1266+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171267
14181268{-# INLINE tracePropagate #-}
14191269tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1270+tracePropagate p = traceWhen p debugPropagate
14211271
14221272{-# INLINE traceInvalidate #-}
14231273traceInvalidate :: 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 ()
1274+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14431275
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1276+{-# INLINE traceWhen #-}
1277+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1278+traceWhen p b message = traceMWhen p b $ return message
14471279
1280+{-# INLINE traceMWhen #-}
1281+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1282+traceMWhen _ b getMessage = when b $ do
1283+ message <- getMessage
1284+#ifdef DEBUG
1285+ spiderTimeline <- askSpiderTimelineEnv
1286+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1287+#else
1288+ let d = 0
14481289#endif
1290+ liftIO $ putStrLn $ replicate d ' ' <> message
14491291
14501292whoCreatedIORef :: IORef a -> IO [String]
14511293whoCreatedIORef (IORef a) = whoCreated $! a
14521294
1295+#ifdef DEBUG_CYCLES
14531296groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541297groupByHead = \case
14551298 [] -> []
@@ -1460,54 +1303,20 @@ groupByHead = \case
14601303 | otherwise -> (x, xs :| []) : l
14611304
14621305listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1306+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951307#endif
14961308
1497−
14981309{-# INLINE propagateSubscriberHold #-}
14991310propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001311propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1312+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021313 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031314 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051315 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061316 case {-# SCC "apply" #-} apply a v of
15071317 Nothing -> return ()
15081318 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1319+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111320 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121321 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131322 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1324,25 @@ propagateSubscriberHold h a = do
15151324data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161325
15171326runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1518−runBehaviorM a mwi holdInits = runReaderIO (unBehaviorM a) (mwi, holdInits)
1327+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191328
15201329askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211330askInvalidator = do
1522− (!m, _) <- ask
1331+ (!m, _) <- BehaviorM ask
15231332 case m of
15241333 Nothing -> return Nothing
15251334 Just (!wi, _) -> return $ Just wi
15261335
15271336askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281337askParentsRef = do
1529− (!m, _) <- ask
1338+ (!m, _) <- BehaviorM ask
15301339 case m of
15311340 Nothing -> return Nothing
15321341 Just (_, !p) -> return $ Just p
15331342
15341343askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351344askBehaviorHoldInits = do
1536− (_, !his) <- ask
1345+ (_, !his) <- BehaviorM ask
15371346 return his
15381347
15391348{-# INLINE getDynHold #-}
@@ -1541,27 +1350,30 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411350getDynHold d = do
15421351 mh <- liftIO $ readIORef $ unDyn d
15431352 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1353+ Right h -> return h
1354+ Left (readV0, v') -> do
15461355 holdInits <- getDeferralQueue
15471356 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
15541357 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1358+ liftIO $ writeIORef (unDyn d) $ Right h
15561359 return h
15571360
1558−
15591361-- Always refers to 0
15601362{-# NOINLINE zeroRef #-}
15611363zeroRef :: IORef Height
15621364zeroRef = unsafePerformIO $ newIORef zeroHeight
15631365
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)
1366+type CanSubscribe x m =
1367+ ( HasSpiderTimeline x
1368+ , HasCurrentHeight x m
1369+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1370+ , Defer SomeClear m -- Wiping out event firings
1371+ , Defer (SomeAssignment x) m -- Updating state
1372+ , Defer (SomeResetCoincidence x) m
1373+ , m ~ EventM x
1374+ )
1375+
1376+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651377getRootSubscribed k r sub = do
15661378 mSubscribed <- readIORef $ rootSubscribed r
15671379 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1387,9 @@ getRootSubscribed k r sub = do
15751387 let !cached = rootSubscribed r
15761388 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771389 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1390+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811391 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821392 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861393 let !subscribed = RootSubscribed
15871394 { rootSubscribedKey = k
15881395 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1398,7 @@ getRootSubscribed k r sub = do
15911398 , rootSubscribedUninit = uninit
15921399 , rootSubscribedWeakSelf = weakSelf
15931400#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1401+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951402#endif
15961403 }
15971404 -- If we die at the same moment that all our children die, they will
@@ -1621,90 +1428,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211428subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221429subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231430
1624−newtype EventSelectorInt x a = EventSelectorInt { selectInt :: Int -> Event x a }
1625−
1626−data FanInt x a = FanInt
1627− { _fanInt_subscribers :: {-# UNPACK #-} !(FastMutableIntMap (FastWeakBag (Subscriber x a))) --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1628− , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629− , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
1633− }
1634−
1635−newFanInt :: IO (FanInt x a)
1636−newFanInt = do
1637− subscribers <- FastMutableIntMap.newEmpty --TODO: Clean up the keys in here when their child weak bags get empty --TODO: Remove our own subscription when the subscribers list is completely empty
1638− subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639− occRef <- newIORef $ error "fanInt: no occurrence"
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− }
1704−
1705−
17061431{-# 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))
1432+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 ~ EventM x, GCompare k) => k a -> Fan x k -> Subscriber x a -> m (WeakBagTicket, FanSubscribed x k, Maybe a)
17081433getFanSubscribed k f sub = do
17091434 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101435 case mSubscribed of
@@ -1722,16 +1447,13 @@ getFanSubscribed k f sub = do
17221447 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231448 occRef <- liftIO $ newIORef parentOcc
17241449 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281450 let subscribed = FanSubscribed
17291451 { fanSubscribedCachedSubscribed = fanSubscribed f
17301452 , fanSubscribedOccurrence = occRef
17311453 , fanSubscribedParent = subscription
17321454 , fanSubscribedSubscribers = subscribersRef
17331455#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1456+ , fanSubscribedNodeId = unsafeNodeId f
17351457#endif
17361458 }
17371459 let !self = (k, subscribed)
@@ -1741,7 +1463,7 @@ getFanSubscribed k f sub = do
17411463 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421464 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431465
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1466+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451467cleanupFanSubscribed (k, subscribed) = do
17461468 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471469 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1475,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531475 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541476
17551477{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1478+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571479subscribeFanSubscribed k subscribed sub = do
17581480 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591481 case DMap.lookup k subscribers of
@@ -1766,7 +1488,7 @@ subscribeFanSubscribed k subscribed sub = do
17661488 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671489
17681490{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1491+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 ~ EventM x) => Switch x a -> Subscriber x a -> m (WeakBagTicket, SwitchSubscribed x a, Maybe a)
17701492getSwitchSubscribed s sub = do
17711493 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721494 case mSubscribed of
@@ -1791,9 +1513,6 @@ getSwitchSubscribed s sub = do
17911513 when (isJust parentOcc) $ scheduleClear occRef
17921514 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931515 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971516 let !subscribed = SwitchSubscribed
17981517 { switchSubscribedCachedSubscribed = switchSubscribed s
17991518 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1525,7 @@ getSwitchSubscribed s sub = do
18061525 , switchSubscribedCurrentParent = subscriptionRef
18071526 , switchSubscribedWeakSelf = weakSelf
18081527#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1528+ , switchSubscribedNodeId = unsafeNodeId s
18101529#endif
18111530 }
18121531 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1825,7 +1544,7 @@ subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBa
18251544subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261545
18271546{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1547+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 ~ EventM x) => Coincidence x a -> Subscriber x a -> m (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
18291548getCoincidenceSubscribed c sub = do
18301549 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311550 case mSubscribed of
@@ -1851,9 +1570,6 @@ getCoincidenceSubscribed c sub = do
18511570 scheduleClear innerSubdRef
18521571 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531572 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571573 let subscribed = CoincidenceSubscribed
18581574 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591575 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1580,7 @@ getCoincidenceSubscribed c sub = do
18641580 , coincidenceSubscribedInnerParent = innerSubdRef
18651581 , coincidenceSubscribedWeakSelf = weakSelf
18661582#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1583+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681584#endif
18691585 }
18701586 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1597,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811597subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821598subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831599
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)
1600+{-# INLINE merge #-}
1601+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1602+merge d = cacheEvent (mergeCheap d)
18891603
18901604{-# 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)
1605+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1606+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951607
18961608{-# 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
1609+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1610+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19031611 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1612+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051613 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061614 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071615 (mOldSubd, newPs) <- case me of
19081616 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091617 Just e -> do
19101618 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1619+ subscription@(EventSubscription _ subd) <- subscribe e s
19121620 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131621 let newParent = MergeSubscribedParent subscription
19141622 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151623 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161624 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1625+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201626 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211627 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221628 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1629+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251630 getInitialSubscribers initialParents subscriber = do
19261631 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271632 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1633+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291634 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1635+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311636 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321637 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331638 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341639 )
1935−
19361640 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371641 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381642
19391643{-# 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
1644+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1645+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19451646 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1647+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471648 updateMe subscriber heightBagRef oldParents p = do
19481649 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1650+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501651 subscribeParent k e = do
19511652 keyRef <- liftIO $ newIORef k
19521653 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,185 +1656,122 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551656 newParentHeight <- getEventSubscribedHeight subd
19561657 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571658 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1659+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591660 -- 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
1661+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611662 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621663 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1664+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661665 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671666 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681667 Just toKey -> do
19691668 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701669 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1670+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741671 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1672+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761673 getInitialSubscribers initialParents subscriber = do
19771674 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781675 keyRef <- liftIO $ newIORef k
19791676 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1677+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811678 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1679+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831680 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841681 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851682 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861683 )
1987−
19881684 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891685 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901686
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1687+type MergeUpdateFunc k x p s
1688+ = (forall a. EventM x (k a) -> Subscriber x a)
19931689 -> IORef HeightBag
19941690 -> DMap k s
19951691 -> p
19961692 -> EventM x ([EventSubscription x], DMap k s)
19971693
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)
1694+type MergeInitFunc k x s
1695+ = DMap k (Event x)
1696+ -> (forall a. EventM x (k a) -> Subscriber x a)
1697+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041698
20051699type MergeDestroyFunc k s
20061700 = DMap k s
20071701 -> IO ()
20081702
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
2095− }
2096−
2097−--TODO: Be able to run as much of this as possible promptly
2098−updateMerge :: (HasSpiderTimeline x, GCompare k) => EventSubscribed x -> Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100− where updateMe = do
2101− oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
2103− liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104− return subscriptionsToKill
2105−
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1703+{-# INLINE mergeCheap' #-}
1704+mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> (DMap k s -> Int) -> Dynamic x p -> Event x (DMap k Identity)
1705+mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub -> do
21101706 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111707 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121708 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131709 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141710 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)
1711+ let scheduleSelf height = scheduleMerge' height heightRef $ do
1712+ m <- liftIO $ readIORef accumRef
1713+ liftIO $ writeIORef accumRef $! DMap.empty
1714+ --TODO: Assert that m is not empty
1715+ subscriberPropagate sub m
1716+ invalidateMyHeight = do
1717+ oldHeight <- readIORef heightRef
1718+ when (oldHeight /= invalidHeight) $ do -- If the height used to be valid, it must be invalid now; we should never have *more* heights than we have parents
1719+ writeIORef heightRef $! invalidHeight
1720+ subscriberInvalidateHeight sub oldHeight
1721+ revalidateMyHeight = do
1722+ currentHeight <- readIORef heightRef
1723+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1724+ heights <- readIORef heightBagRef
1725+ parents <- readIORef parentsRef
1726+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1727+ case heightBagSize heights `compare` numParents parents of
1728+ LT -> return ()
1729+ EQ -> do
1730+ let height = succHeight $ heightBagMax heights
1731+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1732+ writeIORef heightRef $! height
1733+ subscriberRecalculateHeight sub height
1734+ GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (numParents parents) <> ") for Merge"
1735+ subscriber :: forall a. EventM x (k a) -> Subscriber x a
1736+ subscriber getKey = Subscriber
1737+ { subscriberPropagate = \a -> do
1738+ oldM <- liftIO $ readIORef accumRef
1739+ k <- getKey
1740+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1741+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1742+ liftIO $ writeIORef accumRef $! newM
1743+ when (DMap.null oldM) $ do -- Only schedule the firing once
1744+ height <- liftIO $ readIORef heightRef
1745+ --TODO: assertions about height
1746+ currentHeight <- getCurrentHeight
1747+ when (height <= currentHeight) $ do
1748+ if height /= invalidHeight
1749+ then do
1750+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1751+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1752+ else liftIO $ do
21201753#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
1754+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1755+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1756+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1757+#else
1758+ let cycleInfo = ""
21261759#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
1760+ error $ "Causality loop found" <> cycleInfo
1761+ scheduleSelf height
1762+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1763+ modifyIORef' heightBagRef $ heightBagRemove old
1764+ invalidateMyHeight
1765+ , subscriberRecalculateHeight = \new -> do
1766+ modifyIORef' heightBagRef $ heightBagAdd new
1767+ revalidateMyHeight
21351768 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1769+ let updateMe x = do
1770+ oldParents <- liftIO $ readIORef parentsRef
1771+ (subscriptionsToKill, newParents) <- updateFunc subscriber heightBagRef oldParents x
1772+ liftIO $ writeIORef parentsRef $! newParents
1773+ return subscriptionsToKill
1774+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents subscriber
21371775 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381776 myHeight = if invalidHeight `elem` heights
21391777 then invalidHeight
@@ -2142,153 +1780,43 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421780 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431781 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441782 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1783+ unless (DMap.null accum) $ do
1784+ scheduleSelf myHeight
1785+ occRef <- liftIO $ newIORef occ
1786+ when (isJust occ) $ scheduleClear occRef
21461787 liftIO $ writeIORef accumRef $! accum
21471788 liftIO $ writeIORef heightRef $! myHeight
21481789 liftIO $ writeIORef heightBagRef $! myHeightBag
1790+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491791 liftIO $ writeIORef parentsRef $! initialParentState
21501792 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1793+ let s = Subscriber
21521794 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1795+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1796+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
21551797 , subscriberInvalidateHeight = \_ -> return ()
21561798 , subscriberRecalculateHeight = \_ -> return ()
21571799 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1800+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1801+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
21601802 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611803 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621804 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1805+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641806 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)
1807+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1808+ , occ
1809+ )
22801810
22811811newtype 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) }
22831812
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1813+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1814+fan e =
22871815 let f = Fan
22881816 { fanParent = e
2289− , fanSubscribed = ref
1817+ , fanSubscribed = unsafeNewIORef e Nothing
22901818 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1819+ in EventSelector $ \k -> eventFan k f
22921820
22931821runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22941822runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2319,14 +1847,13 @@ newEventEnv = do
23191847 mergeInitRef <- newIORef []
23201848 heightRef <- newIORef zeroHeight
23211849 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231850 toClearRootRef <- newIORef []
23241851 coincidenceInfosRef <- newIORef []
23251852 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1853+ return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23271854
23281855clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1856+clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
23301857 writeIORef toAssignRef []
23311858 writeIORef holdInitRef []
23321859 writeIORef dynInitRef []
@@ -2334,44 +1861,41 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23341861 writeIORef mergeInitRef []
23351862 writeIORef heightRef zeroHeight
23361863 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
23381864 writeIORef toClearRootRef []
23391865 writeIORef coincidenceInfosRef []
23401866 writeIORef delayedRef IntMap.empty
23411867
23421868-- | Run an event action outside of a frame
23431869runFrame :: 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)
1870+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1871+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23461872 let go = do
23471873 result <- a
23481874 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
23491875 return result
23501876 result <- runEventM go
23511877 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
1878+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23551879 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1880+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23571881 toAssign <- readIORef $ eventEnvAssignments env
23581882 toReconnectRef <- newIORef []
23591883 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23601884 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611885 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1886+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631887 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23641888 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23651889 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1890+ when debugPropagate $ putStrLn "Updating merges"
23671891 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1892+ when debugPropagate $ putStrLn "Updating merges done"
23691893 toReconnect <- readIORef toReconnectRef
23701894 clearEventEnv env
23711895 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721896 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731897 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1898+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751899 finalize wi
23761900 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771901 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2382,10 +1906,10 @@ runFrame a = SpiderHost $ do
23821906 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
23831907 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841908 sub <- newSubscriberSwitch subscribed
2385− subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
1909+ 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
23861910 {-
23871911 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1912+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891913 EventRoot _ -> "EventRoot"
23901914 EventNever -> "EventNever"
23911915 _ -> "something else"
@@ -2400,7 +1924,7 @@ runFrame a = SpiderHost $ do
24001924 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011925 when (parentHeight /= myHeight) $ do
24021926 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1927+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24041928 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
24051929 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061930 unsubscribe subscription
@@ -2441,7 +1965,7 @@ invalidateCoincidenceHeight subscribed = do
24411965 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421966 when (oldHeight /= invalidHeight) $ do
24431967 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1968+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451969
24461970updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471971updateSwitchHeight new subscribed = do
@@ -2449,7 +1973,7 @@ updateSwitchHeight new subscribed = do
24491973 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501974 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511975 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1976+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531977
24541978recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551979recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1982,7 @@ recalculateCoincidenceHeight subscribed = do
24581982 height <- calculateCoincidenceHeight subscribed
24591983 when (height /= invalidHeight) $ do
24601984 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1985+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621986
24631987calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641988calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,218 +2021,13 @@ invalidate toReconnectRef wis = do
24972021-- Reflex integration
24982022--------------------------------------------------------------------------------
24992023
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
2504−-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
2506−
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2510−
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2525−
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2529−
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533−
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535− {-# INLINABLE hold #-}
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
2549−
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551− {-# INLINE return #-}
2552− return = pure
2553− {-# INLINE (>>=) #-}
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555− {-# INLINE (>>) #-}
2556− (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2560−#endif
2561−
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564−newJoinDyn d =
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571−
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575−
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2579−
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581− pure = SpiderDynamic . dynamicConst
2582−#if MIN_VERSION_base(4,10,0)
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2024+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2025+-- When we're specializing, we include this from Reflex.Class instead, because
2026+-- it needs access to these types; when we're not, we want them here, so our
2027+-- instance isn't an orphan instance.
2028+#include "SpiderTimeline.include.hs"
2029+#include "SpiderTimelineHost.include.hs"
25842030#endif
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588−
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2591−
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594−
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597−
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600−
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602− {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604− {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606− {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
2615−
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618−
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2633−
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635− {-# INLINABLE sample #-}
2636− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637−
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639− {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2641−
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643− {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645− {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647− {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655−
2656−--------------------------------------------------------------------------------
2657−-- Deprecated items
2658−--------------------------------------------------------------------------------
2659−
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662−type SpiderEnv = SpiderTimeline
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664− {-# INLINABLE subscribeEvent #-}
2665− subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667− val <- liftIO $ newIORef Nothing
2668− subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669− { subscriberPropagate = \a -> do
2670− liftIO $ writeIORef val $ Just a
2671− scheduleClear val
2672− , subscriberInvalidateHeight = \_ -> return ()
2673− , subscriberRecalculateHeight = \_ -> return ()
2674− }
2675− return $ SpiderEventHandle
2676− { spiderEventHandleSubscription = subscription
2677− , spiderEventHandleValue = val
2678− }
2679−
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684−
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2689− touch h
2690− return result
2691−
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697−
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703−
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
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
27122031
27132032unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
27142033unsafeNewSpiderTimelineEnv = do
@@ -2717,7 +2036,7 @@ unsafeNewSpiderTimelineEnv = do
27172036#ifdef DEBUG
27182037 depthRef <- newIORef 0
27192038#endif
2720− return $ STE $ SpiderTimelineEnv
2039+ return $ SpiderTimelineEnv
27212040 { _spiderTimeline_lock = lock
27222041 , _spiderTimeline_eventEnv = env
27232042#ifdef DEBUG
@@ -2725,40 +2044,41 @@ unsafeNewSpiderTimelineEnv = do
27252044#endif
27262045 }
27272046
2047+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27282048-- | Create a new SpiderTimelineEnv
27292049newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2050+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312051
2732−data LocalSpiderTimeline (x :: Type) s
2052+data LocalSpiderTimeline x s
27332053
27342054instance Reifies s (SpiderTimelineEnv x) =>
27352055 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2056+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372057
27382058localSpiderTimeline
2739− :: proxy s
2059+ :: Proxy s
27402060 -> SpiderTimelineEnv x
27412061 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2062+localSpiderTimeline _ = unsafeCoerce
27432063
27442064-- | Pass a new timeline to the given function.
27452065withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
27462066withSpiderTimeline k = do
27472067 env <- unsafeNewSpiderTimelineEnv
27482068 reify env $ \s -> k $ localSpiderTimeline s env
2069+#endif
27492070
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
2071+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27532072
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2073+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552074
2075+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27562076instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572077 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582078 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592079 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 }
2080+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2081+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622082 type PullM (SpiderTimeline x) = SpiderPullM x
27632083 type PushM (SpiderTimeline x) = SpiderPushM x
27642084 {-# INLINABLE never #-}
@@ -2771,15 +2091,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712091 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722092 {-# INLINABLE pull #-}
27732093 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
2094+ {-# INLINABLE merge #-}
2095+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2096+ {-# INLINABLE fan #-}
2097+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832098 {-# INLINABLE switch #-}
27842099 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852100 {-# INLINABLE coincidence #-}
@@ -2787,15 +2102,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872102 {-# INLINABLE current #-}
27882103 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892104 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2105+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912106 {-# INLINABLE unsafeBuildDynamic #-}
27922107 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932108 {-# INLINABLE unsafeBuildIncremental #-}
27942109 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
2110+ {-# INLINABLE mergeIncremental #-}
2111+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2112+ {-# INLINABLE mergeIncrementalWithMove #-}
2113+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992114 {-# INLINABLE currentIncremental #-}
28002115 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012116 {-# INLINABLE updatedIncremental #-}
@@ -2806,12 +2121,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062121 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072122 eventCoercion Coercion = Coercion
28082123 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))
2124+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2125+#endif
28152126
28162127data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28172128
@@ -2834,7 +2145,7 @@ instance MonadAtomicRef (EventM x) where
28342145 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352146
28362147-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2148+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382149
28392150instance Monad (SpiderHost x) where
28402151 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2154,22 @@ instance Monad (SpiderHost x) where
28432154 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442155 {-# INLINABLE return #-}
28452156 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472157 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2849−#endif
2850−
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2158+ fail s = SpiderHost $ fail s
28542159
28552160-- | Run an action affecting the global Spider timeline; this will be guarded by
28562161-- a mutex for that timeline
28572162runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2163+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592164
2165+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
28602166-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612167-- mutex for that timeline
28622168runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2169+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2170+#endif
28642171
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2172+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672173
28682174instance Monad (SpiderHostFrame x) where
28692175 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2178,15 @@ instance Monad (SpiderHostFrame x) where
28722178 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732179 {-# INLINABLE return #-}
28742180 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762181 {-# INLINABLE fail #-}
28772182 fail s = SpiderHostFrame $ fail s
2878−#endif
2879−
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
28832183
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2184+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852185newEventWithTriggerIO f = do
28862186 es <- newFanEventWithTriggerIO $ \Refl -> f
28872187 return $ select es Refl
28882188
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2189+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902190newFanEventWithTriggerIO f = do
28912191 occRef <- newIORef DMap.empty
28922192 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2220,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202220instance PrimMonad (SpiderHostFrame x) where
29212221 type PrimState (SpiderHostFrame x) = PrimState IO
29222222 primitive = SpiderHostFrame . EventM . primitive
2923−
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2927−
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()