@@ -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,56 @@ 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+
91+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
92+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11293
11394#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
11595import System.IO (stderr)
116−import Data.List (isPrefixOf)
96+import qualified Data.ByteString.Char8 as BS8
11797#endif
11898
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12399#ifdef DEBUG_TRACE_EVENTS
100+
124101withStackOneLine :: (BS8.ByteString -> a) -> a
125102withStackOneLine expr = unsafePerformIO $ do
126103 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
104+ return (expr (BS8.pack (unwords (reverse stack))))
129105
130106#endif
131107
@@ -136,42 +112,28 @@ debugInvalidateHeight :: Bool
136112debugInvalidate :: Bool
137113
138114#ifdef DEBUG
115+
139116#define DEBUG_NODEIDS
140117
141−#ifdef DEBUG_TRACE_PROPAGATION
142118debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146119
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150120debugInvalidateHeight = False
151−#endif
152121
153−#ifdef DEBUG_TRACE_INVALIDATION
154122debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158123
159124class HasNodeId a where
160125 getNodeId :: a -> Int
161126
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
127+instance HasNodeId (Hold x p a) where
169128 getNodeId = holdNodeId
170129
130+instance HasNodeId (PushSubscribed x a b) where
131+ getNodeId = pushSubscribedNodeId
132+
171133instance HasNodeId (SwitchSubscribed x a) where
172134 getNodeId = switchSubscribedNodeId
173135
174−instance HasNodeId (FanSubscribed x v a) where
136+instance HasNodeId (FanSubscribed x a) where
175137 getNodeId = fanSubscribedNodeId
176138
177139instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +147,41 @@ instance HasNodeId (Pull x a) where
185147
186148{-# INLINE showNodeId #-}
187149showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
150+showNodeId = ("#"<>) . show . getNodeId
151+
152+showSubscriberType :: Subscriber x a -> String
153+showSubscriberType = \case
154+ SubscriberPush _ _ -> "SubscriberPush"
155+ SubscriberMerge _ _ -> "SubscriberMerge"
156+ SubscriberFan _ -> "SubscriberFan"
157+ SubscriberMergeChange _ -> "SubscriberMergeChange"
158+ SubscriberHold _ -> "SubscriberHold"
159+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
160+ SubscriberSwitch _ -> "SubscriberSwitch"
161+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
162+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
163+ SubscriberHandle -> "SubscriberHandle"
164+
165+showEventType :: Event x a -> String
166+showEventType = \case
167+ EventRoot _ _ -> "EventRoot"
168+ EventNever -> "EventNever"
169+ EventPush _ -> "EventPush"
170+ EventMerge _ -> "EventMerge"
171+ EventFan _ _ -> "EventFan"
172+ EventSwitch _ -> "EventSwitch"
173+ EventCoincidence _ -> "EventCoincidence"
174+ EventHold _ -> "EventHold"
175+ EventDyn _ -> "EventDyn"
176+ EventHoldIdentity _ -> "EventHoldIdentity"
177+ EventDynIdentity _ -> "EventDynIdentity"
193178
194179#else
195180
196181debugPropagate = False
182+
197183debugInvalidateHeight = False
184+
198185debugInvalidate = False
199186
200187-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +189,6 @@ debugInvalidate = False
202189showNodeId :: a -> String
203190showNodeId _ = ""
204191
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209192#endif
210193
211194#ifdef DEBUG_NODEIDS
@@ -215,6 +198,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215198
216199newNodeId :: IO Int
217200newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
201+
202+{-# NOINLINE unsafeNodeId #-}
203+unsafeNodeId :: a -> Int
204+unsafeNodeId a = unsafePerformIO $ do
205+ touch a
206+ newNodeId
218207#endif
219208
220209--------------------------------------------------------------------------------
@@ -250,165 +239,85 @@ subscribeAndRead = unEvent
250239-- | Construct an 'Event' equivalent to that constructed by 'push', but with no
251240-- caching; if the computation function is very cheap, this is (much) more
252241-- efficient than 'push'
253−{-# INLINE [1] pushCheap #-}
242+{-# NOINLINE pushCheap #-}
254243pushCheap :: 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
244+pushCheap f e = Event $ \sub -> do
245+ (subscription, occ) <- subscribeAndRead e $ sub
257246 { subscriberPropagate = \a -> do
258− mb <- f a
247+ mb <- runComputeM $ f a
259248 mapM_ (subscriberPropagate sub) mb
260249 }
261− occ' <- join <$> mapM f occ
250+ occ' <- join <$> mapM (runComputeM . f) occ
262251 return (subscription, occ')
263252
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−
301253data CacheSubscribed x a
302− = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
254+ = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(WeakBag (Subscriber x a))
255+ , _cacheSubscribed_weakSelf :: {-# UNPACK #-} !(IORef (Weak (CacheSubscribed x a)))
303256 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
257+ , _cacheSubscribed_cached :: {-# UNPACK #-} !(IORef (Maybe (CacheSubscribed x a)))
304258 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308259 }
309260
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−
325261-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326262-- repeatedly
327263--
328264--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
265+--there's only one subscriber, and then build our own WeakBag only when a second
330266--subscriber joins
331−{-# NOINLINE [0] cacheEvent #-}
332−cacheEvent :: forall x a. HasSpiderTimeline x => Event x a -> Event x a
267+{-# NOINLINE cacheEvent #-}
268+cacheEvent :: HasSpiderTimeline x => Event x a -> Event x a
333269cacheEvent e =
334270#ifdef DEBUG_TRACE_EVENTS
335271 withStackOneLine $ \callSite -> Event $
336272#else
337273 Event $
338274#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
275+ let !mSubscribedRef = unsafeNewIORef e Nothing
276+ in \sub -> {-# SCC "cacheEvent" #-} do
343277#ifdef DEBUG_TRACE_EVENTS
344278 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345279#endif
346− subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347− Just subscribedTicket -> return subscribedTicket
280+ mSubscribed <- liftIO $ readIORef mSubscribedRef
281+ case mSubscribed of
282+ Just subscribed -> liftIO $ do
283+ ticket <- WeakBag.insert sub (_cacheSubscribed_subscribers subscribed) (_cacheSubscribed_weakSelf subscribed) cleanupCacheSubscribed
284+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
285+ let es = EventSubscribed
286+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
287+ , eventSubscribedRetained = toAny subscribed
288+ }
289+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) es, occ)
348290 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
291+ weakSelf <- liftIO $ newIORef $ error "cacheEvent: weakSelf not yet intialized"
292+ (subscribers, ticket) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCacheSubscribed
293+ occRef <- liftIO $ newIORef undefined
357294 (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
295+ { subscriberPropagate = \a -> do
296+ liftIO $ writeIORef occRef $ Just a
297+ scheduleClear occRef
298+ propagate a subscribers
299+ , subscriberInvalidateHeight = \old -> do
300+ WeakBag.traverse subscribers $ invalidateSubscriberHeight old
301+ , subscriberRecalculateHeight = \new -> do
302+ WeakBag.traverse subscribers $ recalculateSubscriberHeight new
303+ }
304+ liftIO $ writeIORef occRef occ
305+ when (isJust occ) $ scheduleClear occRef
369306 let !subscribed = CacheSubscribed
370307 { _cacheSubscribed_subscribers = subscribers
308+ , _cacheSubscribed_weakSelf = weakSelf
371309 , _cacheSubscribed_parent = parentSub
310+ , _cacheSubscribed_cached = mSubscribedRef
372311 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376312 }
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)
313+ liftIO $ writeIORef mSubscribedRef $ Just subscribed
314+ liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "PushSubscribed"
315+ return (EventSubscription (WeakBag.remove ticket >> touch ticket) (EventSubscribed (eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub) (toAny subscribed)), occ)
411316
317+cleanupCacheSubscribed :: CacheSubscribed x a -> IO ()
318+cleanupCacheSubscribed self = do
319+ unsubscribe $ _cacheSubscribed_parent self
320+ writeIORef (_cacheSubscribed_cached self) Nothing
412321
413322subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414323subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +329,13 @@ wrap tag getSpecificSubscribed sub = do
420329 let es = tag subd
421330 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422331
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
332+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424333eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425334
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429335eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
336+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431337
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
338+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433339eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434340
435341eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,14 +344,14 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438344eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439345eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440346
441−eventHold :: Hold x p -> Event x p
347+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442348eventHold !h = Event $ subscribeHoldEvent h
443349
444350eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
445351eventDyn !j = Event $ \sub -> getDynHold j >>= \h -> subscribeHoldEvent h sub
446352
447353{-# INLINE subscribeCoincidenceInner #-}
448−subscribeCoincidenceInner :: HasSpiderTimeline x => Event x a -> Height -> CoincidenceSubscribed x a -> EventM x (Maybe a, Height, EventSubscribed x)
354+subscribeCoincidenceInner :: CanSubscribe x m => Event x a -> Height -> CoincidenceSubscribed x a -> m (Maybe a, Height, EventSubscribed x)
449355subscribeCoincidenceInner inner outerHeight subscribedUnsafe = do
450356 subInner <- liftIO $ newSubscriberCoincidenceInner subscribedUnsafe
451357 (subscription@(EventSubscription _ innerSubd), innerOcc) <- subscribeAndRead inner subInner
@@ -464,6 +370,16 @@ data Subscriber x a = Subscriber
464370 , subscriberRecalculateHeight :: !(Height -> IO ())
465371 }
466372
373+--TODO: Move this comment to WeakBag
374+-- These function are constructor functions that are marked NOINLINE so they are
375+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
376+-- so any weak references that are attached to the constructors will have their
377+-- finalizer run. Using the opaque constructor, does not see the
378+-- constructor application, so it behaves like an IORef and cannot be fused away.
379+--
380+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
381+-- the weak pointer to it in some cases.
382+
467383newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468384newSubscriberHold h = return $ Subscriber
469385 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +387,85 @@ newSubscriberHold h = return $ Subscriber
471387 , subscriberRecalculateHeight = \_ -> return ()
472388 }
473389
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
390+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
391+newSubscriberFan subscribed = return $ Subscriber
476392 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477393 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
394+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479395 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480396 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
397+ let f _ (Pair (Identity v) subsubs) = do
482398 propagate v $ _fanSubscribedChildren_list subsubs
483399 return $ Constant ()
484400 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485401 return ()
486402 , subscriberInvalidateHeight = \old -> do
403+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487404 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
405+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
406+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489407 , subscriberRecalculateHeight = \new -> do
408+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490409 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
410+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
411+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492412 }
493413
494414newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
415+newSubscriberSwitch subscribed = return $ Subscriber
496416 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
417+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497418 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498419 scheduleClear $ switchSubscribedOccurrence subscribed
499420 propagate a $ switchSubscribedSubscribers subscribed
500421 , subscriberInvalidateHeight = \_ -> do
422+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501423 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502424 when (oldHeight /= invalidHeight) $ do
503425 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
426+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
427+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
428+ , subscriberRecalculateHeight = \new -> do
429+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
430+ updateSwitchHeight new subscribed
431+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
432+ }
507433
508434newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
435+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510436 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
437+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511438 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512439 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513440 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514441 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515442 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517443 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518444 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519445 case occ of
520− Nothing ->
446+ Nothing -> do
521447 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522448 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
449+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
450+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525451 Just o -> do -- Since it's already firing, no need to adjust height
526452 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527453 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528454 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
455+ , subscriberInvalidateHeight = \_ -> do
456+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
457+ invalidateCoincidenceHeight subscribed
458+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
459+ , subscriberRecalculateHeight = \_ -> do
460+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
461+ recalculateCoincidenceHeight subscribed
462+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531463 }
532464
533465newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
466+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535467 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
468+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536469 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537470 case occ of
538471 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +473,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540473 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541474 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542475 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
476+ , subscriberInvalidateHeight = \_ -> do
477+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
478+ invalidateCoincidenceHeight subscribed
479+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
480+ , subscriberRecalculateHeight = \_ -> do
481+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
482+ recalculateCoincidenceHeight subscribed
483+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545484 }
546485
547486invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +490,11 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551490recalculateSubscriberHeight = flip subscriberRecalculateHeight
552491
553492-- | 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) $
493+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
494+propagate a subscribers = withIncreasedDepth $ do
556495 -- 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
557496 --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
497+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566498
567499--------------------------------------------------------------------------------
568500-- EventSubscribed
@@ -571,16 +503,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571503toAny :: a -> Any
572504toAny = unsafeCoerce
573505
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.
579506data EventSubscribed x = EventSubscribed
580507 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581508 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582509#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
510+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584511 , eventSubscribedHasOwnHeightRef :: !Bool
585512 , eventSubscribedWhoCreated :: !(IO [String])
586513#endif
@@ -607,23 +534,13 @@ eventSubscribedNever = EventSubscribed
607534 , eventSubscribedWhoCreated = return ["never"]
608535#endif
609536 }
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− }
620537
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
538+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622539eventSubscribedFan !subscribed = EventSubscribed
623540 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624541 , eventSubscribedRetained = toAny subscribed
625542#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
543+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627544 , eventSubscribedHasOwnHeightRef = False
628545 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629546#endif
@@ -636,7 +553,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636553#ifdef DEBUG_CYCLES
637554 , eventSubscribedGetParents = do
638555 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
556+ return [Some.This $ _eventSubscription_subscribed s]
640557 , eventSubscribedHasOwnHeightRef = True
641558 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642559#endif
@@ -649,8 +566,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649566#ifdef DEBUG_CYCLES
650567 , eventSubscribedGetParents = do
651568 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
569+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
570+ innerParents = maybeToList $ fmap Some.This innerSubscription
654571 return $ outerParent : innerParents
655572 , eventSubscribedHasOwnHeightRef = True
656573 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +581,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664581whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665582whoCreatedEventSubscribed = eventSubscribedWhoCreated
666583
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
584+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668585walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
586+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670587 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671588 when (h == invalidHeight) $ do
672589 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
590+ modify (Some.This s :)
674591 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
592+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676593 return subscribers
677594#endif
678595
679596{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
597+subscribeHoldEvent :: CanSubscribe x m => Hold x p -> Subscriber x p -> m (EventSubscription x, Maybe p)
681598subscribeHoldEvent = subscribeAndRead . holdEvent
682599
683600--------------------------------------------------------------------------------
@@ -700,7 +617,7 @@ behaviorPull !p = Behavior $ do
700617 val <- liftIO $ readIORef $ pullValue p
701618 case val of
702619 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
620+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704621 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705622 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706623 return $ pullSubscribedValue subscribed
@@ -709,7 +626,7 @@ behaviorPull !p = Behavior $ do
709626 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710627 parentsRef <- liftIO $ newIORef []
711628 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
629+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713630 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714631 parents <- liftIO $ readIORef parentsRef
715632 let subscribed = PullSubscribed
@@ -719,7 +636,7 @@ behaviorPull !p = Behavior $ do
719636 , pullSubscribedParents = parents
720637 }
721638 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
639+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723640 return a
724641
725642behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,8 +647,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730647readHoldTracked h = do
731648 result <- liftIO $ readIORef $ holdValue h
732649 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
650+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
735651 return result
736652
737653{-# INLINABLE readBehaviorUntracked #-}
@@ -744,46 +660,42 @@ readBehaviorUntracked b = do
744660-- Dynamic
745661--------------------------------------------------------------------------------
746662
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`?
663+data Dynamic x p = Dynamic
664+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
665+ , dynamicUpdated :: !(Event x p)
752666 }
753667
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
668+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760669dynamicHold !h = Dynamic
761670 { dynamicCurrent = behaviorHold h
762671 , dynamicUpdated = eventHold h
763672 }
764673
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
674+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766675dynamicHoldIdentity = dynamicHold
767676
768−dynamicConst :: PatchTarget p -> DynamicS x p
677+dynamicConst :: PatchTarget p -> Dynamic x p
769678dynamicConst !a = Dynamic
770679 { dynamicCurrent = behaviorConst a
771680 , dynamicUpdated = eventNever
772681 }
773682
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
683+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775684dynamicDyn !d = Dynamic
776685 { dynamicCurrent = behaviorDyn d
777686 , dynamicUpdated = eventDyn d
778687 }
779688
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
689+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781690dynamicDynIdentity = dynamicDyn
782691
783692--------------------------------------------------------------------------------
784693-- Combinators
785694--------------------------------------------------------------------------------
786695
696+--TODO: Figure out why certain things are not 'representational', then make them
697+--representational so we can use coerce
698+
787699--type role Hold representational
788700data Hold x p
789701 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,7 +707,9 @@ data Hold x p
795707#endif
796708 }
797709
798−-- | A statically allocated 'SpiderTimeline'
710+-- | A statically allocated 'SpiderTimeline'; this is the only instance of
711+-- 'SpiderTimeline' that can used when using
712+-- -fspecialize-to-spidertimeline-global.
799713data Global
800714
801715{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -804,37 +718,27 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804718
805719-- | Stores all global data relevant to a particular Spider timeline; only one
806720-- 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
721+data SpiderTimelineEnv x = SpiderTimelineEnv
813722 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814723 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815724#ifdef DEBUG
816725 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817726#endif
818727 }
819−type role SpiderTimelineEnv' phantom
820−
821−instance Eq (SpiderTimelineEnv x) where
822− _ == _ = True -- Since only one exists of each type
728+type role SpiderTimelineEnv nominal
823729
824730instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
731+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826732 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827733 else Nothing
828734
829735data EventEnv x
830736 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
831737 , eventEnvHoldInits :: !(IORef [SomeHoldInit x]) -- Needed for Subscribe
832− , eventEnvDynInits :: !(IORef [SomeDynInit x])
833738 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834739 , 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])
740+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
741+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838742 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839743 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840744 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +749,7 @@ runEventM :: EventM x a -> IO a
845749runEventM = unEventM
846750
847751asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
752+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849753
850754class MonadIO m => Defer a m where
851755 getDeferralQueue :: m (IORef [a])
@@ -864,10 +768,6 @@ instance HasSpiderTimeline x => Defer (SomeHoldInit x) (EventM x) where
864768 {-# INLINE getDeferralQueue #-}
865769 getDeferralQueue = asksEventEnv eventEnvHoldInits
866770
867−instance HasSpiderTimeline x => Defer (SomeDynInit x) (EventM x) where
868− {-# INLINE getDeferralQueue #-}
869− getDeferralQueue = asksEventEnv eventEnvDynInits
870−
871771instance Defer (SomeHoldInit x) (BehaviorM x) where
872772 {-# INLINE getDeferralQueue #-}
873773 getDeferralQueue = BehaviorM $ asks snd
@@ -894,7 +794,11 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
894794 delayedRef <- asksEventEnv eventEnvDelayedMerges
895795 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896796
797+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
798+class x ~ Global => HasSpiderTimeline x where
799+#else
897800class HasSpiderTimeline x where
801+#endif
898802 -- | Retrieve the current SpiderTimelineEnv
899803 spiderTimeline :: SpiderTimelineEnv x
900804
@@ -906,29 +810,21 @@ putCurrentHeight h = do
906810 heightRef <- asksEventEnv eventEnvCurrentHeight
907811 liftIO $ writeIORef heightRef $! h
908812
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
813+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910814 {-# INLINE getDeferralQueue #-}
911815 getDeferralQueue = asksEventEnv eventEnvClears
912816
913817{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
916−
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
918− {-# INLINE getDeferralQueue #-}
919− getDeferralQueue = asksEventEnv eventEnvIntClears
920−
921−{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
818+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
819+scheduleClear r = defer $ SomeClear r
924820
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
821+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926822 {-# INLINE getDeferralQueue #-}
927823 getDeferralQueue = asksEventEnv eventEnvRootClears
928824
929825{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
826+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
827+scheduleRootClear r = defer $ SomeRootClear r
932828
933829instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934830 {-# INLINE getDeferralQueue #-}
@@ -957,7 +853,7 @@ hold v0 e = do
957853 return h
958854
959855{-# INLINE getHoldEventSubscription #-}
960−getHoldEventSubscription :: forall p x. (HasSpiderTimeline x, Patch p) => Hold x p -> EventM x (EventSubscription x)
856+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)
961857getHoldEventSubscription h = do
962858 ep <- liftIO $ readIORef $ holdParent h
963859 case ep of
@@ -983,9 +879,9 @@ getHoldEventSubscription h = do
983879
984880type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985881
882+--type role BehaviorM representational
986883-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
884+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989885
990886instance Monad (BehaviorM x) where
991887 {-# INLINE (>>=) #-}
@@ -994,16 +890,14 @@ instance Monad (BehaviorM x) where
994890 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995891 {-# INLINE return #-}
996892 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998893 {-# INLINE fail #-}
999894 fail s = BehaviorM $ fail s
1000−#endif
1001895
1002896data BehaviorSubscribed x a
1003897 = forall p. BehaviorSubscribedHold (Hold x p)
1004898 | BehaviorSubscribedPull (PullSubscribed x a)
1005899
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
900+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007901
1008902--type role PullSubscribed representational
1009903data PullSubscribed x a
@@ -1038,7 +932,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038932#endif
1039933 }
1040934
1041−data Root x k
935+data Root x (k :: * -> *)
1042936 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043937 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044938 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1046,8 +940,6 @@ data Root x k
1046940
1047941data SomeHoldInit x = forall p. Patch p => SomeHoldInit !(Hold x p)
1048942
1049−data SomeDynInit x = forall p. Patch p => SomeDynInit !(Dyn x p)
1050−
1051943data SomeMergeUpdate x = SomeMergeUpdate
1052944 { _someMergeUpdate_update :: !(EventM x [EventSubscription x])
1053945 , _someMergeUpdate_invalidateHeight :: !(IO ())
@@ -1057,7 +949,16 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057949newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058950
1059951-- 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)
952+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
953+
954+newtype ComputeM x a = ComputeM (ReaderT (IORef [SomeHoldInit x]) IO a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
955+
956+instance Defer (SomeHoldInit x) (ComputeM x) where
957+ getDeferralQueue = ComputeM ask
958+
959+{-# INLINABLE runComputeM #-}
960+runComputeM :: Defer (SomeHoldInit x) m => ComputeM x a -> m a
961+runComputeM (ComputeM a) = liftIO . runReaderT a =<< getDeferralQueue
1061962
1062963newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1063964
@@ -1082,8 +983,7 @@ heightBagFromList :: [Height] -> HeightBag
1082983heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083984
1084985heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
986+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087987
1088988heightBagRemove :: Height -> HeightBag -> HeightBag
1089989heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +992,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092992 0 -> IntMap.delete h c
1093993 _ -> IntMap.insert h (pred old) c
1094994
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−
1102995heightBagMax :: HeightBag -> Height
1103996heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104997 Just ((h, _), _) -> Height h
@@ -1116,25 +1009,25 @@ heightBagVerify b@(HeightBag s c) = if
11161009heightBagVerify = id
11171010#endif
11181011
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)))
1012+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1013+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1014+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1015+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231016 }
11241017
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
1018+data FanSubscribed (x :: *) k
1019+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1020+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1021+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291022 , fanSubscribedParent :: !(EventSubscription x)
11301023#ifdef DEBUG_NODEIDS
11311024 , fanSubscribedNodeId :: Int
11321025#endif
11331026 }
11341027
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1028+data Fan x k
1029+ = Fan { fanParent :: !(Event x (DMap k Identity))
1030+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381031 }
11391032
11401033data SwitchSubscribed x a
@@ -1188,35 +1081,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881081newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891082newInvalidatorPull p = return $! InvalidatorPull p
11901083
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1084+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1085+ fmapMaybe f = push $ return . f
11931086
11941087instance HasSpiderTimeline x => Align (Event x) where
11951088 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]
1089+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromList [LeftTag :=> ea, RightTag :=> eb]
12011090
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
1091+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12081092
1209−data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210− | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211− | HoldDyn !(Hold x p)
1212−
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1214−
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1216−newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1093+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1094+newMapDyn f d = dynamicDynIdentity $ unsafeDyn (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171095
12181096--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)
1097+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201098zipDynWith f da db =
12211099 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221100 ec = flip push eab $ \o -> do
@@ -1229,22 +1107,19 @@ zipDynWith f da db =
12291107 return (a, b)
12301108 These (Identity a) (Identity b) -> return (a, b)
12311109 return $ Just $ Identity $ f a b
1232− in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
1233−
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1235−buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1237− let !d = Dyn result
1238− defer $ SomeDynInit d
1239− return d
1110+ in dynamicDynIdentity $ unsafeDyn (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12401111
1241−unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1112+unsafeDyn :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1113+unsafeDyn readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1114+ where x = (readV0, v')
12441115
12451116-- ResultM can read behaviors and events
12461117type ResultM = EventM
12471118
1119+{-# NOINLINE unsafeNewIORef #-}
1120+unsafeNewIORef :: a -> b -> IORef b
1121+unsafeNewIORef _ b = unsafePerformIO $ newIORef b
1122+
12481123instance HasSpiderTimeline x => Functor (Event x) where
12491124 fmap f = push $ return . Just . f
12501125
@@ -1257,42 +1132,33 @@ push f e = cacheEvent (pushCheap f e)
12571132
12581133{-# INLINABLE pull #-}
12591134pull :: 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
1135+pull a = behaviorPull $ Pull
1136+ { pullCompute = a
1137+ , pullValue = unsafeNewIORef a Nothing
12681138#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1139+ , pullNodeId = unsafeNodeId a
12701140#endif
1271− }
1141+ }
12721142
12731143{-# INLINABLE switch #-}
12741144switch :: 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− }
1145+switch a = eventSwitch $ Switch
1146+ { switchParent = a
1147+ , switchSubscribed = unsafeNewIORef a Nothing
1148+ }
12811149
12821150coincidence :: 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− }
1151+coincidence a = eventCoincidence $ Coincidence
1152+ { coincidenceParent = a
1153+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1154+ }
12891155
12901156-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911157run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921158run roots after = do
12931159 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
1160+ t <- SpiderHost ask
1161+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961162 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971163 occBefore <- liftIO $ do
12981164 occBefore <- readIORef occRef
@@ -1330,11 +1196,9 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301196 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311197 EQ -> a
13321198
1333−newtype Clear a = Clear (IORef (Maybe a))
1334−
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1199+data SomeClear = forall a. SomeClear (IORef (Maybe a))
13361200
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1201+data SomeRootClear = forall k. SomeRootClear (IORef (DMap k Identity))
13381202
13391203data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401204
@@ -1346,110 +1210,55 @@ mkWeakPtrWithDebug x debugNote = do
13461210 x' <- evaluate x
13471211 mkWeakPtr x' $
13481212 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1213+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501214 else Nothing
13511215
13521216type WeakList a = [Weak a]
13531217
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−
13811218{-# 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
1219+#ifdef DEBUG
1220+withIncreasedDepth :: CanTrace x m => m a -> m a
1221+withIncreasedDepth a = do
1222+ spiderTimeline <- askSpiderTimelineEnv
1223+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851224 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1225+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871226 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−
14121227#else
1228+withIncreasedDepth :: m a -> m a
1229+withIncreasedDepth = id
1230+#endif
14131231
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1232+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171233
14181234{-# INLINE tracePropagate #-}
14191235tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1236+tracePropagate p = traceWhen p debugPropagate
14211237
14221238{-# INLINE traceInvalidate #-}
14231239traceInvalidate :: 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 ()
1240+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14431241
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1242+{-# INLINE traceWhen #-}
1243+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1244+traceWhen p b message = traceMWhen p b $ return message
14471245
1246+{-# INLINE traceMWhen #-}
1247+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1248+traceMWhen _ b getMessage = when b $ do
1249+ message <- getMessage
1250+#ifdef DEBUG
1251+ spiderTimeline <- askSpiderTimelineEnv
1252+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1253+#else
1254+ let d = 0
14481255#endif
1256+ liftIO $ putStrLn $ replicate d ' ' <> message
14491257
14501258whoCreatedIORef :: IORef a -> IO [String]
14511259whoCreatedIORef (IORef a) = whoCreated $! a
14521260
1261+#ifdef DEBUG_CYCLES
14531262groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541263groupByHead = \case
14551264 [] -> []
@@ -1460,54 +1269,20 @@ groupByHead = \case
14601269 | otherwise -> (x, xs :| []) : l
14611270
14621271listsToForest :: 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−
1272+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951273#endif
14961274
1497−
14981275{-# INLINE propagateSubscriberHold #-}
14991276propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001277propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1278+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021279 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031280 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051281 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061282 case {-# SCC "apply" #-} apply a v of
15071283 Nothing -> return ()
15081284 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1285+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111286 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121287 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131288 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1290,25 @@ propagateSubscriberHold h a = do
15151290data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161291
15171292runBehaviorM :: 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)
1293+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191294
15201295askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211296askInvalidator = do
1522− (!m, _) <- ask
1297+ (!m, _) <- BehaviorM ask
15231298 case m of
15241299 Nothing -> return Nothing
15251300 Just (!wi, _) -> return $ Just wi
15261301
15271302askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281303askParentsRef = do
1529− (!m, _) <- ask
1304+ (!m, _) <- BehaviorM ask
15301305 case m of
15311306 Nothing -> return Nothing
15321307 Just (_, !p) -> return $ Just p
15331308
15341309askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351310askBehaviorHoldInits = do
1536− (_, !his) <- ask
1311+ (_, !his) <- BehaviorM ask
15371312 return his
15381313
15391314{-# INLINE getDynHold #-}
@@ -1541,27 +1316,30 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411316getDynHold d = do
15421317 mh <- liftIO $ readIORef $ unDyn d
15431318 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1319+ Right h -> return h
1320+ Left (readV0, v') -> do
15461321 holdInits <- getDeferralQueue
15471322 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
15541323 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1324+ liftIO $ writeIORef (unDyn d) $ Right h
15561325 return h
15571326
1558−
15591327-- Always refers to 0
15601328{-# NOINLINE zeroRef #-}
15611329zeroRef :: IORef Height
15621330zeroRef = unsafePerformIO $ newIORef zeroHeight
15631331
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)
1332+type CanSubscribe x m =
1333+ ( HasSpiderTimeline x
1334+ , HasCurrentHeight x m
1335+ , Defer (SomeHoldInit x) m, Defer (SomeMergeInit x) m -- The things we need to lazily initialize state
1336+ , Defer SomeClear m -- Wiping out event firings
1337+ , Defer (SomeAssignment x) m -- Updating state
1338+ , Defer (SomeResetCoincidence x) m
1339+ , m ~ EventM x
1340+ )
1341+
1342+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651343getRootSubscribed k r sub = do
15661344 mSubscribed <- readIORef $ rootSubscribed r
15671345 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1353,9 @@ getRootSubscribed k r sub = do
15751353 let !cached = rootSubscribed r
15761354 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771355 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1356+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811357 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821358 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861359 let !subscribed = RootSubscribed
15871360 { rootSubscribedKey = k
15881361 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1364,7 @@ getRootSubscribed k r sub = do
15911364 , rootSubscribedUninit = uninit
15921365 , rootSubscribedWeakSelf = weakSelf
15931366#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1367+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951368#endif
15961369 }
15971370 -- If we die at the same moment that all our children die, they will
@@ -1621,90 +1394,8 @@ cleanupRootSubscribed self@RootSubscribed { rootSubscribedKey = k, rootSubscribe
16211394subscribeRootSubscribed :: RootSubscribed x a -> Subscriber x a -> IO WeakBagTicket
16221395subscribeRootSubscribed subscribed sub = WeakBag.insert sub (rootSubscribedSubscribers subscribed) (rootSubscribedWeakSelf subscribed) cleanupRootSubscribed
16231396
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−
17061397{-# 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))
1398+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)
17081399getFanSubscribed k f sub = do
17091400 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101401 case mSubscribed of
@@ -1722,16 +1413,13 @@ getFanSubscribed k f sub = do
17221413 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231414 occRef <- liftIO $ newIORef parentOcc
17241415 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281416 let subscribed = FanSubscribed
17291417 { fanSubscribedCachedSubscribed = fanSubscribed f
17301418 , fanSubscribedOccurrence = occRef
17311419 , fanSubscribedParent = subscription
17321420 , fanSubscribedSubscribers = subscribersRef
17331421#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1422+ , fanSubscribedNodeId = unsafeNodeId f
17351423#endif
17361424 }
17371425 let !self = (k, subscribed)
@@ -1741,7 +1429,7 @@ getFanSubscribed k f sub = do
17411429 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421430 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431431
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1432+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451433cleanupFanSubscribed (k, subscribed) = do
17461434 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471435 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1441,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531441 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541442
17551443{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1444+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571445subscribeFanSubscribed k subscribed sub = do
17581446 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591447 case DMap.lookup k subscribers of
@@ -1766,7 +1454,7 @@ subscribeFanSubscribed k subscribed sub = do
17661454 Just (FanSubscribedChildren list _ weakSelf) -> {-# SCC "hitSubscribeFanSubscribed" #-} WeakBag.insert sub list weakSelf cleanupFanSubscribed
17671455
17681456{-# INLINABLE getSwitchSubscribed #-}
1769−getSwitchSubscribed :: HasSpiderTimeline x => Switch x a -> Subscriber x a -> EventM x (WeakBagTicket, SwitchSubscribed x a, Maybe a)
1457+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)
17701458getSwitchSubscribed s sub = do
17711459 mSubscribed <- liftIO $ readIORef $ switchSubscribed s
17721460 case mSubscribed of
@@ -1791,9 +1479,6 @@ getSwitchSubscribed s sub = do
17911479 when (isJust parentOcc) $ scheduleClear occRef
17921480 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931481 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971482 let !subscribed = SwitchSubscribed
17981483 { switchSubscribedCachedSubscribed = switchSubscribed s
17991484 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1491,7 @@ getSwitchSubscribed s sub = do
18061491 , switchSubscribedCurrentParent = subscriptionRef
18071492 , switchSubscribedWeakSelf = weakSelf
18081493#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1494+ , switchSubscribedNodeId = unsafeNodeId s
18101495#endif
18111496 }
18121497 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1825,7 +1510,7 @@ subscribeSwitchSubscribed :: SwitchSubscribed x a -> Subscriber x a -> IO WeakBa
18251510subscribeSwitchSubscribed subscribed sub = WeakBag.insert sub (switchSubscribedSubscribers subscribed) (switchSubscribedWeakSelf subscribed) cleanupSwitchSubscribed
18261511
18271512{-# INLINABLE getCoincidenceSubscribed #-}
1828−getCoincidenceSubscribed :: forall x a. HasSpiderTimeline x => Coincidence x a -> Subscriber x a -> EventM x (WeakBagTicket, CoincidenceSubscribed x a, Maybe a)
1513+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)
18291514getCoincidenceSubscribed c sub = do
18301515 mSubscribed <- liftIO $ readIORef $ coincidenceSubscribed c
18311516 case mSubscribed of
@@ -1851,9 +1536,6 @@ getCoincidenceSubscribed c sub = do
18511536 scheduleClear innerSubdRef
18521537 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531538 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571539 let subscribed = CoincidenceSubscribed
18581540 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591541 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1546,7 @@ getCoincidenceSubscribed c sub = do
18641546 , coincidenceSubscribedInnerParent = innerSubdRef
18651547 , coincidenceSubscribedWeakSelf = weakSelf
18661548#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1549+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681550#endif
18691551 }
18701552 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,259 +1563,189 @@ cleanupCoincidenceSubscribed subscribed = do
18811563subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821564subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831565
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)
1566+{-# INLINE merge #-}
1567+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1568+merge d = cacheEvent (mergeCheap d)
18891569
18901570{-# 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)
1571+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1572+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951573
18961574{-# 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
1575+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1576+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19031577 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1578+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051579 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061580 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071581 (mOldSubd, newPs) <- case me of
19081582 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091583 Just e -> do
19101584 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1585+ subscription@(EventSubscription _ subd) <- subscribe e s
19121586 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131587 let newParent = MergeSubscribedParent subscription
19141588 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151589 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161590 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1591+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201592 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211593 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221594 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1595+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251596 getInitialSubscribers initialParents subscriber = do
19261597 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271598 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1599+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291600 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1601+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311602 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321603 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331604 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341605 )
1935−
19361606 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371607 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381608
19391609{-# 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
1610+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1611+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.size
19451612 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947− updateMe subscriber heightBagRef oldParents p = do
1948− -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1950− subscribeParent k e = do
1951− keyRef <- liftIO $ newIORef k
1952− let s = subscriber $ liftIO $ readIORef keyRef
1953− subscription@(EventSubscription _ subd) <- subscribe e s
1954− liftIO $ do
1955− newParentHeight <- getEventSubscribedHeight subd
1956− modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957− return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1959− -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961− moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962− Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1613+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1614+ updateMe subscriber heightBagRef oldParents pWrapped = do
1615+ let p = unPatchDMapWithMove pWrapped
1616+ let f (subscriptionsToKill, ps) (k :=> edit) = do
1617+ let deleteHere = return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1618+ insertHere e = do
1619+ keyRef <- liftIO $ newIORef k
1620+ let s = subscriber $ liftIO $ readIORef keyRef
1621+ subscription@(EventSubscription _ subd) <- subscribe e s
1622+ liftIO $ do
1623+ newParentHeight <- getEventSubscribedHeight subd
1624+ let newParent = MergeSubscribedParentWithMove subscription keyRef
1625+ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1626+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1627+ (mOldSubd, newPs) <- case edit of
1628+ DMapEdit_Delete moved -> do
1629+ (toDelete, newPs) <- deleteHere
1630+ return (if moved then Nothing else toDelete, newPs)
1631+ DMapEdit_Insert moved e -> do
1632+ (toDelete, newPs) <- insertHere e
1633+ return (if moved then Nothing else toDelete, newPs)
1634+ DMapEdit_Move moved sourceKey -> do
1635+ (toDelete, newPs) <- case DMap.lookup sourceKey ps of
1636+ Nothing -> deleteHere
1637+ Just s@(MergeSubscribedParentWithMove _ keyRef) -> do
1638+ liftIO $ writeIORef keyRef k
1639+ return $ DMap.insertLookupWithKey' (\_ new _ -> new) k s ps
1640+ return (if moved then Nothing else toDelete, newPs)
1641+ forM_ mOldSubd $ \oldSubd -> do
1642+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription oldSubd
19661643 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967− return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968− Just toKey -> do
1969− liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970− return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1974− return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1644+ return (maybeToList (_mergeSubscribedParentWithMove_subscription <$> mOldSubd) ++ subscriptionsToKill, newPs)
1645+ foldM f ([], oldParents) $ DMap.toList p
1646+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761647 getInitialSubscribers initialParents subscriber = do
19771648 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781649 keyRef <- liftIO $ newIORef k
19791650 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1651+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811652 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1653+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831654 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841655 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851656 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861657 )
1987−
19881658 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891659 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901660
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1661+type MergeUpdateFunc k x p s
1662+ = (forall a. EventM x (k a) -> Subscriber x a)
19931663 -> IORef HeightBag
19941664 -> DMap k s
19951665 -> p
19961666 -> EventM x ([EventSubscription x], DMap k s)
19971667
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)
1668+type MergeInitFunc k x s
1669+ = DMap k (Event x)
1670+ -> (forall a. EventM x (k a) -> Subscriber x a)
1671+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041672
20051673type MergeDestroyFunc k s
20061674 = DMap k s
20071675 -> IO ()
20081676
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
1677+{-# INLINE mergeCheap' #-}
1678+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)
1679+mergeCheap' getInitialSubscribers updateFunc destroy numParents d = Event $ \sub -> do
21101680 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111681 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121682 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131683 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141684 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)
1685+ let scheduleSelf height = scheduleMerge' height heightRef $ do
1686+ m <- liftIO $ readIORef accumRef
1687+ liftIO $ writeIORef accumRef $! DMap.empty
1688+ --TODO: Assert that m is not empty
1689+ subscriberPropagate sub m
1690+ invalidateMyHeight = do
1691+ oldHeight <- readIORef heightRef
1692+ 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
1693+ writeIORef heightRef $! invalidHeight
1694+ subscriberInvalidateHeight sub oldHeight
1695+ revalidateMyHeight = do
1696+ currentHeight <- readIORef heightRef
1697+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1698+ heights <- readIORef heightBagRef
1699+ parents <- readIORef parentsRef
1700+ -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1701+ case heightBagSize heights `compare` numParents parents of
1702+ LT -> return ()
1703+ EQ -> do
1704+ let height = succHeight $ heightBagMax heights
1705+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
1706+ writeIORef heightRef $! height
1707+ subscriberRecalculateHeight sub height
1708+ GT -> error $ "revalidateMergeHeight: more heights than parents for Merge"
1709+ subscriber :: forall a. EventM x (k a) -> Subscriber x a
1710+ subscriber getKey = Subscriber
1711+ { subscriberPropagate = \a -> do
1712+ oldM <- liftIO $ readIORef accumRef
1713+ k <- getKey
1714+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
1715+ tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1716+ liftIO $ writeIORef accumRef $! newM
1717+ when (DMap.null oldM) $ do -- Only schedule the firing once
1718+ height <- liftIO $ readIORef heightRef
1719+ --TODO: assertions about height
1720+ currentHeight <- getCurrentHeight
1721+ when (height <= currentHeight) $ do
1722+ if height /= invalidHeight
1723+ then do
1724+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1725+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1726+ else liftIO $ do
21201727#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
1728+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1729+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1730+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1731+#else
1732+ let cycleInfo = ""
21261733#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
1734+ error $ "Causality loop found" <> cycleInfo
1735+ scheduleSelf height
1736+ , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1737+ modifyIORef' heightBagRef $ heightBagRemove old
1738+ invalidateMyHeight
1739+ , subscriberRecalculateHeight = \new -> do
1740+ modifyIORef' heightBagRef $ heightBagAdd new
1741+ revalidateMyHeight
21351742 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1743+ let updateMe x = do
1744+ oldParents <- liftIO $ readIORef parentsRef
1745+ (subscriptionsToKill, newParents) <- updateFunc subscriber heightBagRef oldParents x
1746+ liftIO $ writeIORef parentsRef $! newParents
1747+ return subscriptionsToKill
1748+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents subscriber
21371749 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381750 myHeight = if invalidHeight `elem` heights
21391751 then invalidHeight
@@ -2142,236 +1754,114 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421754 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431755 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441756 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1757+ unless (DMap.null accum) $ do
1758+ scheduleSelf myHeight
1759+ occRef <- liftIO $ newIORef occ
1760+ when (isJust occ) $ scheduleClear occRef
21461761 liftIO $ writeIORef accumRef $! accum
21471762 liftIO $ writeIORef heightRef $! myHeight
21481763 liftIO $ writeIORef heightBagRef $! myHeightBag
1764+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491765 liftIO $ writeIORef parentsRef $! initialParentState
21501766 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1767+ let s = Subscriber
21521768 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1769+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1770+ defer $ SomeMergeUpdate (updateMe a) invalidateMyHeight revalidateMyHeight
21551771 , subscriberInvalidateHeight = \_ -> return ()
21561772 , subscriberRecalculateHeight = \_ -> return ()
21571773 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1774+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1775+ forM_ change $ \c -> defer $ SomeMergeUpdate (updateMe c) invalidateMyHeight revalidateMyHeight
21601776 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611777 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621778 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1779+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641780 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)
1781+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1782+ , occ
1783+ )
22801784
22811785newtype 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) }
22831786
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
1787+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
1788+fan e =
22871789 let f = Fan
22881790 { fanParent = e
2289− , fanSubscribed = ref
1791+ , fanSubscribed = unsafeNewIORef e Nothing
22901792 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
1793+ in EventSelector $ \k -> eventFan k f
22921794
2293−runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294−runHoldInits holdInitRef dynInitRef mergeInitRef = do
1795+runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeMergeInit x] -> EventM x ()
1796+runHoldInits holdInitRef mergeInitRef = do
22951797 holdInits <- liftIO $ readIORef holdInitRef
2296− dynInits <- liftIO $ readIORef dynInitRef
22971798 mergeInits <- liftIO $ readIORef mergeInitRef
2298− unless (null holdInits && null dynInits && null mergeInits) $ do
1799+ unless (null holdInits && null mergeInits) $ do
22991800 liftIO $ writeIORef holdInitRef []
2300− liftIO $ writeIORef dynInitRef []
23011801 liftIO $ writeIORef mergeInitRef []
23021802 mapM_ initHold holdInits
2303− mapM_ initDyn dynInits
23041803 mapM_ unSomeMergeInit mergeInits
2305− runHoldInits holdInitRef dynInitRef mergeInitRef
1804+ runHoldInits holdInitRef mergeInitRef
23061805
23071806initHold :: HasSpiderTimeline x => SomeHoldInit x -> EventM x ()
23081807initHold (SomeHoldInit h) = void $ getHoldEventSubscription h
23091808
2310−initDyn :: HasSpiderTimeline x => SomeDynInit x -> EventM x ()
2311−initDyn (SomeDynInit d) = void $ getDynHold d
2312−
23131809newEventEnv :: IO (EventEnv x)
23141810newEventEnv = do
23151811 toAssignRef <- newIORef [] -- This should only actually get used when events are firing
23161812 holdInitRef <- newIORef []
2317− dynInitRef <- newIORef []
23181813 mergeUpdateRef <- newIORef []
23191814 mergeInitRef <- newIORef []
23201815 heightRef <- newIORef zeroHeight
23211816 toClearRef <- newIORef []
2322− toClearIntRef <- newIORef []
23231817 toClearRootRef <- newIORef []
23241818 coincidenceInfosRef <- newIORef []
23251819 delayedRef <- newIORef IntMap.empty
2326− return $ EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef
1820+ return $ EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef
23271821
23281822clearEventEnv :: EventEnv x -> IO ()
2329−clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeInitRef toClearRef toClearIntRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
1823+clearEventEnv (EventEnv toAssignRef holdInitRef mergeUpdateRef mergeInitRef toClearRef toClearRootRef heightRef coincidenceInfosRef delayedRef) = do
23301824 writeIORef toAssignRef []
23311825 writeIORef holdInitRef []
2332− writeIORef dynInitRef []
23331826 writeIORef mergeUpdateRef []
23341827 writeIORef mergeInitRef []
23351828 writeIORef heightRef zeroHeight
23361829 writeIORef toClearRef []
2337− writeIORef toClearIntRef []
23381830 writeIORef toClearRootRef []
23391831 writeIORef coincidenceInfosRef []
23401832 writeIORef delayedRef IntMap.empty
23411833
23421834-- | Run an event action outside of a frame
23431835runFrame :: 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)
1836+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
1837+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23461838 let go = do
23471839 result <- a
2348− runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
1840+ runHoldInits (eventEnvHoldInits 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
23491841 return result
23501842 result <- runEventM go
23511843 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
1844+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23551845 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
1846+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23571847 toAssign <- readIORef $ eventEnvAssignments env
23581848 toReconnectRef <- newIORef []
23591849 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23601850 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23611851 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
1852+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23631853 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23641854 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23651855 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
1856+ when debugPropagate $ putStrLn "Updating merges"
23671857 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
1858+ when debugPropagate $ putStrLn "Updating merges done"
23691859 toReconnect <- readIORef toReconnectRef
23701860 clearEventEnv env
23711861 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23721862 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23731863 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
1864+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23751865 finalize wi
23761866 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23771867 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2379,13 +1869,13 @@ runFrame a = SpiderHost $ do
23791869 writeIORef (switchSubscribedBehaviorParents subscribed) []
23801870 writeIORef (eventEnvHoldInits env) [] --TODO: Should we reuse this?
23811871 e <- runBehaviorM (readBehaviorTracked (switchSubscribedParent subscribed)) (Just (wi', switchSubscribedBehaviorParents subscribed)) $ eventEnvHoldInits env
2382− runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
1872+ runEventM $ runHoldInits (eventEnvHoldInits 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
23831873 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23841874 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
1875+ 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
23861876 {-
23871877 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
1878+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23891879 EventRoot _ -> "EventRoot"
23901880 EventNever -> "EventNever"
23911881 _ -> "something else"
@@ -2400,7 +1890,7 @@ runFrame a = SpiderHost $ do
24001890 myHeight <- readIORef $ switchSubscribedHeight subscribed
24011891 when (parentHeight /= myHeight) $ do
24021892 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
1893+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24041894 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
24051895 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24061896 unsubscribe subscription
@@ -2441,7 +1931,7 @@ invalidateCoincidenceHeight subscribed = do
24411931 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24421932 when (oldHeight /= invalidHeight) $ do
24431933 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
1934+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24451935
24461936updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24471937updateSwitchHeight new subscribed = do
@@ -2449,7 +1939,7 @@ updateSwitchHeight new subscribed = do
24491939 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24501940 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24511941 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
1942+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24531943
24541944recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24551945recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +1948,7 @@ recalculateCoincidenceHeight subscribed = do
24581948 height <- calculateCoincidenceHeight subscribed
24591949 when (height /= invalidHeight) $ do
24601950 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
1951+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24621952
24631953calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24641954calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,218 +1987,13 @@ invalidate toReconnectRef wis = do
24971987-- Reflex integration
24981988--------------------------------------------------------------------------------
24991989
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)
1990+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
1991+-- When we're specializing, we include this from Reflex.Class instead, because
1992+-- it needs access to these types; when we're not, we want them here, so our
1993+-- instance isn't an orphan instance.
1994+#include "SpiderTimeline.include.hs"
1995+#include "SpiderTimelineHost.include.hs"
25841996#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
27121997
27131998unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
27141999unsafeNewSpiderTimelineEnv = do
@@ -2717,7 +2002,7 @@ unsafeNewSpiderTimelineEnv = do
27172002#ifdef DEBUG
27182003 depthRef <- newIORef 0
27192004#endif
2720− return $ STE $ SpiderTimelineEnv
2005+ return $ SpiderTimelineEnv
27212006 { _spiderTimeline_lock = lock
27222007 , _spiderTimeline_eventEnv = env
27232008#ifdef DEBUG
@@ -2725,40 +2010,41 @@ unsafeNewSpiderTimelineEnv = do
27252010#endif
27262011 }
27272012
2013+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27282014-- | Create a new SpiderTimelineEnv
27292015newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2016+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312017
2732−data LocalSpiderTimeline (x :: Type) s
2018+data LocalSpiderTimeline x s
27332019
27342020instance Reifies s (SpiderTimelineEnv x) =>
27352021 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2022+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372023
27382024localSpiderTimeline
2739− :: proxy s
2025+ :: Proxy s
27402026 -> SpiderTimelineEnv x
27412027 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2028+localSpiderTimeline _ = unsafeCoerce
27432029
27442030-- | Pass a new timeline to the given function.
27452031withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
27462032withSpiderTimeline k = do
27472033 env <- unsafeNewSpiderTimelineEnv
27482034 reify env $ \s -> k $ localSpiderTimeline s env
2035+#endif
27492036
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2751−
2752−type ComputeM = EventM
2037+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27532038
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2039+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552040
2041+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27562042instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572043 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582044 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592045 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 }
2046+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2047+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622048 type PullM (SpiderTimeline x) = SpiderPullM x
27632049 type PushM (SpiderTimeline x) = SpiderPushM x
27642050 {-# INLINABLE never #-}
@@ -2771,15 +2057,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712057 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722058 {-# INLINABLE pull #-}
27732059 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
2060+ {-# INLINABLE merge #-}
2061+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2062+ {-# INLINABLE fan #-}
2063+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832064 {-# INLINABLE switch #-}
27842065 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852066 {-# INLINABLE coincidence #-}
@@ -2787,31 +2068,27 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872068 {-# INLINABLE current #-}
27882069 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892070 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2071+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912072 {-# INLINABLE unsafeBuildDynamic #-}
2792− unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2073+ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (coerce readV0) $ coerce $ unSpiderEvent v'
27932074 {-# INLINABLE unsafeBuildIncremental #-}
2794− unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2075+ unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
2076+ {-# INLINABLE mergeIncremental #-}
2077+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2078+ {-# INLINABLE mergeIncrementalWithMove #-}
2079+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992080 {-# INLINABLE currentIncremental #-}
28002081 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012082 {-# INLINABLE updatedIncremental #-}
28022083 updatedIncremental = SpiderEvent . dynamicUpdated . unSpiderIncremental
28032084 {-# INLINABLE incrementalToDynamic #-}
2804− incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
2085+ incrementalToDynamic (SpiderIncremental i) = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (readBehaviorUntracked $ dynamicCurrent i) $ flip push (dynamicUpdated i) $ \p -> do
28052086 c <- readBehaviorUntracked $ dynamicCurrent i
28062087 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072088 eventCoercion Coercion = Coercion
28082089 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))
2090+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2091+#endif
28152092
28162093data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28172094
@@ -2834,7 +2111,7 @@ instance MonadAtomicRef (EventM x) where
28342111 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352112
28362113-- | 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)
2114+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382115
28392116instance Monad (SpiderHost x) where
28402117 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2120,22 @@ instance Monad (SpiderHost x) where
28432120 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442121 {-# INLINABLE return #-}
28452122 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472123 {-# 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
2124+ fail s = SpiderHost $ fail s
28542125
28552126-- | Run an action affecting the global Spider timeline; this will be guarded by
28562127-- a mutex for that timeline
28572128runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2129+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592130
2131+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
28602132-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612133-- mutex for that timeline
28622134runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2135+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2136+#endif
28642137
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2138+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672139
28682140instance Monad (SpiderHostFrame x) where
28692141 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2144,15 @@ instance Monad (SpiderHostFrame x) where
28722144 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732145 {-# INLINABLE return #-}
28742146 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762147 {-# INLINABLE fail #-}
28772148 fail s = SpiderHostFrame $ fail s
2878−#endif
2879−
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
28832149
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2150+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852151newEventWithTriggerIO f = do
28862152 es <- newFanEventWithTriggerIO $ \Refl -> f
28872153 return $ select es Refl
28882154
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2155+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902156newFanEventWithTriggerIO f = do
28912157 occRef <- newIORef DMap.empty
28922158 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2186,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202186instance PrimMonad (SpiderHostFrame x) where
29212187 type PrimState (SpiderHostFrame x) = PrimState IO
29222188 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 ()