@@ -9,22 +9,17 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
1214{-# LANGUAGE RankNTypes #-}
1315{-# LANGUAGE RoleAnnotations #-}
1416{-# LANGUAGE ScopedTypeVariables #-}
1517{-# LANGUAGE TypeFamilies #-}
1618{-# LANGUAGE TypeOperators #-}
1719{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2420#ifdef USE_REFLEX_OPTIMIZER
2521{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2622#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2823-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2924-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3025module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -38,17 +33,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3833import Control.Monad.Exception
3934import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4035import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
36+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4437import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4738import Data.Align
4839import Data.Coerce
49−import Data.Dependent.Map (DMap)
40+import Data.Dependent.Map (DMap, DSum (..))
5041import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5242import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5343import qualified Data.FastMutableIntMap as FastMutableIntMap
5444import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,15 +49,13 @@ import Data.GADT.Compare
5949import Data.IntMap.Strict (IntMap)
6050import qualified Data.IntMap.Strict as IntMap
6151import Data.IORef
62−import Data.Kind (Type)
6352import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
53+import Data.Monoid ((<>))
6554import Data.Proxy
6655import Data.These
6756import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6957import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
58+import GHC.Exts
7159import GHC.IORef (IORef (..))
7260import GHC.Stack
7361import Reflex.FastWeak
@@ -75,103 +63,55 @@ import System.IO.Unsafe
7563import System.Mem.Weak
7664import Unsafe.Coerce
7765
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−
8766#ifdef DEBUG_CYCLES
8867import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9168import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9269import qualified Data.List.NonEmpty as NonEmpty
70+import Data.Monoid (mempty)
9371import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
72+#endif
9573
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
74+import Data.FastWeakBag (FastWeakBag)
9775import qualified Data.FastWeakBag as FastWeakBag
98−
9976import Data.Reflection
10077import Data.Some (Some(Some))
10178import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10379import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10480import qualified Data.WeakBag as WeakBag
10581import qualified Reflex.Class
10682import qualified Reflex.Class as R
10783import qualified Reflex.Host.Class
10884import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
85+import Reflex.Patch
86+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11287
11388#ifdef DEBUG_TRACE_EVENTS
11489import qualified Data.ByteString.Char8 as BS8
11590import System.IO (stderr)
116−import Data.List (isPrefixOf)
11791#endif
11892
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12393#ifdef DEBUG_TRACE_EVENTS
94+
12495withStackOneLine :: (BS8.ByteString -> a) -> a
12596withStackOneLine expr = unsafePerformIO $ do
12697 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
98+ return (expr (BS8.pack (unwords (reverse stack))))
12999
130100#endif
131101
132−debugPropagate :: Bool
133−
134−debugInvalidateHeight :: Bool
135−
136−debugInvalidate :: Bool
137−
138102#ifdef DEBUG
139103#define DEBUG_NODEIDS
140104
141−#ifdef DEBUG_TRACE_PROPAGATION
142−debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146−
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150−debugInvalidateHeight = False
151−#endif
152−
153−#ifdef DEBUG_TRACE_INVALIDATION
154−debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158−
159105class HasNodeId a where
160106 getNodeId :: a -> Int
161107
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168108instance HasNodeId (Hold x p) where
169109 getNodeId = holdNodeId
170110
171111instance HasNodeId (SwitchSubscribed x a) where
172112 getNodeId = switchSubscribedNodeId
173113
174−instance HasNodeId (FanSubscribed x v a) where
114+instance HasNodeId (FanSubscribed x a) where
175115 getNodeId = fanSubscribedNodeId
176116
177117instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,27 +125,16 @@ instance HasNodeId (Pull x a) where
185125
186126{-# INLINE showNodeId #-}
187127showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
128+showNodeId = ("#"<>) . show . getNodeId
192129
193130
194131#else
195132
196−debugPropagate = False
197−debugInvalidateHeight = False
198−debugInvalidate = False
199−
200133-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
201134{-# INLINE showNodeId #-}
202135showNodeId :: a -> String
203136showNodeId _ = ""
204137
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209138#endif
210139
211140#ifdef DEBUG_NODEIDS
@@ -215,6 +144,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215144
216145newNodeId :: IO Int
217146newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
147+
148+{-# NOINLINE unsafeNodeId #-}
149+unsafeNodeId :: a -> Int
150+unsafeNodeId a = unsafePerformIO $ do
151+ touch a
152+ newNodeId
218153#endif
219154
220155--------------------------------------------------------------------------------
@@ -251,9 +186,9 @@ subscribeAndRead = unEvent
251186-- caching; if the computation function is very cheap, this is (much) more
252187-- efficient than 'push'
253188{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
189+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255190pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
191+ (subscription, occ) <- subscribeAndRead e $ sub
257192 { subscriberPropagate = \a -> do
258193 mb <- f a
259194 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +207,10 @@ terminalSubscriber p = Subscriber
272207
273208-- | Subscribe to an Event only for the duration of one occurrence
274209{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
210+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276211subscribeAndReadHead e sub = do
277212 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
213+ (subscription, occ) <- subscribeAndRead e $ sub
279214 { subscriberPropagate = \a -> do
280215 liftIO $ unsubscribe =<< readIORef subscriptionRef
281216 subscriberPropagate sub a
@@ -286,42 +221,24 @@ subscribeAndReadHead e sub = do
286221 return (subscription, occ)
287222
288223--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)
224+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290225headE originalE = do
291226 parent <- liftIO $ newIORef $ Just originalE
292227 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293228 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
229+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295230 when (isJust occ) clearParent
296− return $ Event $ \sub ->
231+ return $ Event $ \sub -> do
297232 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
233+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299234 Just e -> subscribeAndReadHead e sub
300235
301236data CacheSubscribed x a
302237 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303238 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304239 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308240 }
309241
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−
325242-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326243-- repeatedly
327244--
@@ -336,33 +253,27 @@ cacheEvent e =
336253#else
337254 Event $
338255#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
256+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
257+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
258+ in \sub -> {-# SCC "cacheEvent" #-} do
343259#ifdef DEBUG_TRACE_EVENTS
344260 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345261#endif
346262 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347263 Just subscribedTicket -> return subscribedTicket
348264 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352265 subscribers <- liftIO FastWeakBag.empty
353266 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
357267 (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− }
268+ { subscriberPropagate = \a -> do
269+ liftIO $ writeIORef occRef $ Just a
270+ scheduleClear occRef
271+ propagateFast a subscribers
272+ , subscriberInvalidateHeight = \old -> do
273+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
274+ , subscriberRecalculateHeight = \new -> do
275+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
276+ }
366277 when (isJust occ) $ do
367278 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368279 scheduleClear occRef
@@ -370,45 +281,29 @@ cacheEvent e =
370281 { _cacheSubscribed_subscribers = subscribers
371282 , _cacheSubscribed_parent = parentSub
372283 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376284 }
377285 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378286 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379287 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
411−
288+ liftIO $ do
289+ subscribed <- getFastWeakTicketValue subscribedTicket
290+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
291+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
292+ let es = EventSubscription
293+ { _eventSubscription_unsubscribe = do
294+ FastWeakBag.remove ticket
295+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
296+ when isEmpty $ do
297+ writeIORef mSubscribedRef emptyFastWeak
298+ unsubscribe $ _cacheSubscribed_parent subscribed
299+ touch ticket
300+ touch subscribedTicket
301+ , _eventSubscription_subscribed = EventSubscribed
302+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
303+ , eventSubscribedRetained = toAny subscribedTicket
304+ }
305+ }
306+ return (es, occ)
412307
413308subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414309subscribe e s = fst <$> subscribeAndRead e s
@@ -423,13 +318,10 @@ wrap tag getSpecificSubscribed sub = do
423318eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
424319eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425320
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429321eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
322+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431323
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
324+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433325eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434326
435327eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +356,16 @@ data Subscriber x a = Subscriber
464356 , subscriberRecalculateHeight :: !(Height -> IO ())
465357 }
466358
359+--TODO: Move this comment to WeakBag
360+-- These function are constructor functions that are marked NOINLINE so they are
361+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
362+-- so any weak references that are attached to the constructors will have their
363+-- finalizer run. Using the opaque constructor, does not see the
364+-- constructor application, so it behaves like an IORef and cannot be fused away.
365+--
366+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
367+-- the weak pointer to it in some cases.
368+
467369newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468370newSubscriberHold h = return $ Subscriber
469371 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,26 +373,28 @@ newSubscriberHold h = return $ Subscriber
471373 , subscriberRecalculateHeight = \_ -> return ()
472374 }
473375
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
376+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475377newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
476378 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477379 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478380 tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
479381 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480382 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
383+ let f _ (Pair (Identity v) subsubs) = do
482384 propagate v $ _fanSubscribedChildren_list subsubs
483385 return $ Constant ()
484386 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485387 return ()
486388 , subscriberInvalidateHeight = \old -> do
487389 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
390+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
391+
489392 , subscriberRecalculateHeight = \new -> do
490393 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
394+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
492395 }
493396
397+
494398newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495399newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
496400 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
@@ -501,7 +405,7 @@ newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <
501405 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502406 when (oldHeight /= invalidHeight) $ do
503407 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
408+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505409 , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506410 }
507411
@@ -517,17 +421,17 @@ newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoinciden
517421 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518422 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519423 case occ of
520− Nothing ->
424+ Nothing -> do
521425 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522426 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
427+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
428+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525429 Just o -> do -- Since it's already firing, no need to adjust height
526430 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527431 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528432 propagate o $ coincidenceSubscribedSubscribers subscribed
529433 , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
434+ , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
531435 }
532436
533437newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
@@ -551,18 +455,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551455recalculateSubscriberHeight = flip subscriberRecalculateHeight
552456
553457-- | 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) $
458+propagate :: forall a x. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
459+propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
556460 -- 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
557461 --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
462+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559463
560464-- | 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) $
465+propagateFast :: forall a x. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
466+propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $ do
563467 -- 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
564468 --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
469+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566470
567471--------------------------------------------------------------------------------
568472-- EventSubscribed
@@ -571,16 +475,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571475toAny :: a -> Any
572476toAny = unsafeCoerce
573477
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.
579478data EventSubscribed x = EventSubscribed
580479 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581480 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582481#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
482+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584483 , eventSubscribedHasOwnHeightRef :: !Bool
585484 , eventSubscribedWhoCreated :: !(IO [String])
586485#endif
@@ -607,23 +506,13 @@ eventSubscribedNever = EventSubscribed
607506 , eventSubscribedWhoCreated = return ["never"]
608507#endif
609508 }
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− }
620509
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
510+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622511eventSubscribedFan !subscribed = EventSubscribed
623512 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624513 , eventSubscribedRetained = toAny subscribed
625514#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
515+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627516 , eventSubscribedHasOwnHeightRef = False
628517 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629518#endif
@@ -636,7 +525,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636525#ifdef DEBUG_CYCLES
637526 , eventSubscribedGetParents = do
638527 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
528+ return [Some $ _eventSubscription_subscribed s]
640529 , eventSubscribedHasOwnHeightRef = True
641530 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642531#endif
@@ -649,8 +538,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649538#ifdef DEBUG_CYCLES
650539 , eventSubscribedGetParents = do
651540 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
541+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
542+ innerParents = maybeToList $ fmap Some innerSubscription
654543 return $ outerParent : innerParents
655544 , eventSubscribedHasOwnHeightRef = True
656545 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +553,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664553whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665554whoCreatedEventSubscribed = eventSubscribedWhoCreated
666555
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
556+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668557walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
558+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670559 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671560 when (h == invalidHeight) $ do
672561 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
562+ modify (Some s :)
674563 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
564+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676565 return subscribers
677566#endif
678567
@@ -709,7 +598,7 @@ behaviorPull !p = Behavior $ do
709598 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710599 parentsRef <- liftIO $ newIORef []
711600 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
601+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713602 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714603 parents <- liftIO $ readIORef parentsRef
715604 let subscribed = PullSubscribed
@@ -744,46 +633,42 @@ readBehaviorUntracked b = do
744633-- Dynamic
745634--------------------------------------------------------------------------------
746635
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
636+data Dynamic x p = Dynamic
637+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751638 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752639 }
753640
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
641+dynamicHold :: Hold x p -> Dynamic x p
760642dynamicHold !h = Dynamic
761643 { dynamicCurrent = behaviorHold h
762644 , dynamicUpdated = eventHold h
763645 }
764646
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
647+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766648dynamicHoldIdentity = dynamicHold
767649
768−dynamicConst :: PatchTarget p -> DynamicS x p
650+dynamicConst :: PatchTarget p -> Dynamic x p
769651dynamicConst !a = Dynamic
770652 { dynamicCurrent = behaviorConst a
771653 , dynamicUpdated = eventNever
772654 }
773655
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
656+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775657dynamicDyn !d = Dynamic
776658 { dynamicCurrent = behaviorDyn d
777659 , dynamicUpdated = eventDyn d
778660 }
779661
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
662+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781663dynamicDynIdentity = dynamicDyn
782664
783665--------------------------------------------------------------------------------
784666-- Combinators
785667--------------------------------------------------------------------------------
786668
669+--TODO: Figure out why certain things are not 'representational', then make them
670+--representational so we can use coerce
671+
787672--type role Hold representational
788673data Hold x p
789674 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +689,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804689
805690-- | Stores all global data relevant to a particular Spider timeline; only one
806691-- 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
692+data SpiderTimelineEnv x = SpiderTimelineEnv
813693 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814694 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815695#ifdef DEBUG
816696 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817697#endif
818698 }
819−type role SpiderTimelineEnv' phantom
699+type role SpiderTimelineEnv nominal
820700
821701instance Eq (SpiderTimelineEnv x) where
822702 _ == _ = True -- Since only one exists of each type
823703
824704instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
705+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826706 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827707 else Nothing
828708
@@ -845,7 +725,7 @@ runEventM :: EventM x a -> IO a
845725runEventM = unEventM
846726
847727asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
728+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849729
850730class MonadIO m => Defer a m where
851731 getDeferralQueue :: m (IORef [a])
@@ -983,9 +863,9 @@ getHoldEventSubscription h = do
983863
984864type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985865
866+--type role BehaviorM representational
986867-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
868+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989869
990870instance Monad (BehaviorM x) where
991871 {-# INLINE (>>=) #-}
@@ -994,10 +874,8 @@ instance Monad (BehaviorM x) where
994874 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995875 {-# INLINE return #-}
996876 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998877 {-# INLINE fail #-}
999878 fail s = BehaviorM $ fail s
1000−#endif
1001879
1002880data BehaviorSubscribed x a
1003881 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +916,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038916#endif
1039917 }
1040918
1041−data Root x k
919+data Root x (k :: * -> *)
1042920 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043921 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044922 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +935,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057935newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1058936
1059937-- 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)
938+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1061939
1062940newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1063941
@@ -1082,8 +960,7 @@ heightBagFromList :: [Height] -> HeightBag
1082960heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1083961
1084962heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
963+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1087964
1088965heightBagRemove :: Height -> HeightBag -> HeightBag
1089966heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +969,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092969 0 -> IntMap.delete h c
1093970 _ -> IntMap.insert h (pred old) c
1094971
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−
1102972heightBagMax :: HeightBag -> Height
1103973heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104974 Just ((h, _), _) -> Height h
@@ -1116,25 +986,25 @@ heightBagVerify b@(HeightBag s c) = if
1116986heightBagVerify = id
1117987#endif
1118988
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)))
989+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
990+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
991+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
992+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1123993 }
1124994
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
995+data FanSubscribed (x :: *) k
996+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
997+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
998+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129999 , fanSubscribedParent :: !(EventSubscription x)
11301000#ifdef DEBUG_NODEIDS
11311001 , fanSubscribedNodeId :: Int
11321002#endif
11331003 }
11341004
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1005+data Fan x k
1006+ = Fan { fanParent :: !(Event x (DMap k Identity))
1007+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381008 }
11391009
11401010data SwitchSubscribed x a
@@ -1196,27 +1066,19 @@ instance HasSpiderTimeline x => Align (Event x) where
11961066#if MIN_VERSION_these(0, 8, 0)
11971067instance HasSpiderTimeline x => Semialign (Event x) where
11981068#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201−
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1206− zip x y = mapMaybe justThese $ align x y
1207−#endif
1069+ align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12081070
12091071data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101072 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111073 | HoldDyn !(Hold x p)
12121074
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1075+newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
12141076
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1077+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161078newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171079
12181080--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)
1081+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201082zipDynWith f da db =
12211083 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221084 ec = flip push eab $ \o -> do
@@ -1239,12 +1101,18 @@ buildDynamic readV0 v' = do
12391101 return d
12401102
12411103unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1104+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1105+ where x = (readV0, v')
12441106
12451107-- ResultM can read behaviors and events
12461108type ResultM = EventM
12471109
1110+{-# NOINLINE unsafeNewIORef #-}
1111+unsafeNewIORef :: a -> b -> IORef b
1112+unsafeNewIORef a b = unsafePerformIO $ do
1113+ touch a
1114+ newIORef b
1115+
12481116instance HasSpiderTimeline x => Functor (Event x) where
12491117 fmap f = push $ return . Just . f
12501118
@@ -1257,42 +1125,33 @@ push f e = cacheEvent (pushCheap f e)
12571125
12581126{-# INLINABLE pull #-}
12591127pull :: 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
1128+pull a = behaviorPull $ Pull
1129+ { pullCompute = a
1130+ , pullValue = unsafeNewIORef a Nothing
12681131#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1132+ , pullNodeId = unsafeNodeId a
12701133#endif
1271− }
1134+ }
12721135
12731136{-# INLINABLE switch #-}
12741137switch :: 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− }
1138+switch a = eventSwitch $ Switch
1139+ { switchParent = a
1140+ , switchSubscribed = unsafeNewIORef a Nothing
1141+ }
12811142
12821143coincidence :: 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− }
1144+coincidence a = eventCoincidence $ Coincidence
1145+ { coincidenceParent = a
1146+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1147+ }
12891148
12901149-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911150run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921151run roots after = do
12931152 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941153 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1154+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961155 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971156 occBefore <- liftIO $ do
12981157 occBefore <- readIORef occRef
@@ -1346,7 +1205,7 @@ mkWeakPtrWithDebug x debugNote = do
13461205 x' <- evaluate x
13471206 mkWeakPtr x' $
13481207 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1208+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501209 else Nothing
13511210
13521211type WeakList a = [Weak a]
@@ -1359,44 +1218,37 @@ type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
13591218#ifdef DEBUG
13601219
13611220debugSubscriber :: 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
1221+debugSubscriber description subscribed = return $ Subscriber
13661222 {
13671223 subscriberPropagate = \m -> do
13681224 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
13691225 subscriberPropagate subscribed m
13701226 , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1227+ putStrLn $ "invalidateSubscriberHeight: " <> description
13721228 subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1229+ putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
13741230 , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1231+ putStrLn $ "subscriberRecalculateHeight: " <> description
13761232 subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1233+ putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
13781234 }
13791235
13801236
13811237{-# INLINE withIncreasedDepth #-}
13821238withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
13831239withIncreasedDepth _ a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1240+ liftIO $ modifyIORef' (_spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)) succ
13851241 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1242+ liftIO $ modifyIORef' (_spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)) pred
13871243 return result
13881244
13891245{-# INLINE tracePropagate #-}
13901246tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1247+tracePropagate p = trace p
13921248
13931249{-# INLINE traceInvalidate #-}
13941250traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1251+traceInvalidate = liftIO . putStrLn
14001252
14011253{-# INLINE trace #-}
14021254trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1406,13 +1258,13 @@ trace p message = traceM p $ return message
14061258traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
14071259traceM _ getMessage = do
14081260 message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1261+ d <- liftIO $ readIORef $ _spiderTimeline_depth (spiderTimeline :: SpiderTimelineEnv x)
1262+ liftIO $ putStrLn $ replicate d ' ' <> message
14111263
14121264#else
14131265
14141266{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1267+withIncreasedDepth :: forall x m proxy a. HasSpiderTimeline x => proxy x -> m a -> m a
14161268withIncreasedDepth _ = id
14171269
14181270{-# INLINE tracePropagate #-}
@@ -1423,20 +1275,10 @@ tracePropagate _ _ = return ()
14231275traceInvalidate :: String -> IO ()
14241276traceInvalidate _ = return ()
14251277
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
14301278{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1279+debugSubscriber :: HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
14321280debugSubscriber _ = return
14331281
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
14401282{-# INLINE trace #-}
14411283trace :: (CanTrace x m) => proxy x -> String -> m ()
14421284trace _ _ = return ()
@@ -1447,9 +1289,13 @@ traceM _ _ = return ()
14471289
14481290#endif
14491291
1292+
1293+
1294+
14501295whoCreatedIORef :: IORef a -> IO [String]
14511296whoCreatedIORef (IORef a) = whoCreated $! a
14521297
1298+#ifdef DEBUG_CYCLES
14531299groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541300groupByHead = \case
14551301 [] -> []
@@ -1460,45 +1306,13 @@ groupByHead = \case
14601306 | otherwise -> (x, xs :| []) : l
14611307
14621308listsToForest :: 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
1309+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741310#endif
14751311
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1495−#endif
1496−
1497−
14981312{-# INLINE propagateSubscriberHold #-}
14991313propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001314propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1315+ traceM (Proxy :: Proxy x) $ liftIO $ do
15021316 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031317 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
15041318
@@ -1506,7 +1320,7 @@ propagateSubscriberHold h a = do
15061320 case {-# SCC "apply" #-} apply a v of
15071321 Nothing -> return ()
15081322 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1323+ withIncreasedDepth (Proxy :: Proxy x) $
15101324 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
15111325 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121326 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1515,25 +1329,25 @@ propagateSubscriberHold h a = do
15151329data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161330
15171331runBehaviorM :: 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)
1332+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191333
15201334askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211335askInvalidator = do
1522− (!m, _) <- ask
1336+ (!m, _) <- BehaviorM ask
15231337 case m of
15241338 Nothing -> return Nothing
15251339 Just (!wi, _) -> return $ Just wi
15261340
15271341askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281342askParentsRef = do
1529− (!m, _) <- ask
1343+ (!m, _) <- BehaviorM ask
15301344 case m of
15311345 Nothing -> return Nothing
15321346 Just (_, !p) -> return $ Just p
15331347
15341348askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351349askBehaviorHoldInits = do
1536− (_, !his) <- ask
1350+ (_, !his) <- BehaviorM ask
15371351 return his
15381352
15391353{-# INLINE getDynHold #-}
@@ -1580,9 +1394,6 @@ getRootSubscribed k r sub = do
15801394
15811395 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821396 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861397 let !subscribed = RootSubscribed
15871398 { rootSubscribedKey = k
15881399 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1402,7 @@ getRootSubscribed k r sub = do
15911402 , rootSubscribedUninit = uninit
15921403 , rootSubscribedWeakSelf = weakSelf
15931404#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1405+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951406#endif
15961407 }
15971408 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1438,6 @@ data FanInt x a = FanInt
16271438 { _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
16281439 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291440 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331441 }
16341442
16351443newFanInt :: IO (FanInt x a)
@@ -1637,39 +1445,38 @@ newFanInt = do
16371445 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
16381446 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391447 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431448 return $ FanInt
16441449 { _fanInt_subscribers = subscribers
16451450 , _fanInt_subscriptionRef = subscriptionRef
16461451 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501452 }
16511453
1454+{-# NOINLINE unsafeNewFanInt #-}
1455+unsafeNewFanInt :: b -> FanInt x a
1456+unsafeNewFanInt b = unsafePerformIO $ do
1457+ touch b
1458+ newFanInt
1459+
16521460fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1461+fanInt p =
1462+ let self = unsafeNewFanInt p
1463+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561464 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571465 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
1466+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601467 { subscriberPropagate = \m -> do
16611468 liftIO $ writeIORef (_fanInt_occRef self) m
16621469 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 ->
1470+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1471+ FastWeakBag.traverse b $ \s -> do
16651472 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1473+ , subscriberInvalidateHeight = \old -> do
1474+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1475+ FastWeakBag.traverse b $ \s -> do
16691476 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1477+ , subscriberRecalculateHeight = \new -> do
1478+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1479+ FastWeakBag.traverse b $ \s -> do
16731480 subscriberRecalculateHeight s new
16741481 }
16751482 liftIO $ do
@@ -1683,28 +1490,13 @@ fanInt p = unsafePerformIO $ do
16831490 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841491 return b
16851492 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1493+ t <- liftIO $ FastWeakBag.insert sub b
16871494 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−
1495+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1496+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051497
17061498{-# 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))
1499+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081500getFanSubscribed k f sub = do
17091501 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101502 case mSubscribed of
@@ -1722,16 +1514,13 @@ getFanSubscribed k f sub = do
17221514 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231515 occRef <- liftIO $ newIORef parentOcc
17241516 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281517 let subscribed = FanSubscribed
17291518 { fanSubscribedCachedSubscribed = fanSubscribed f
17301519 , fanSubscribedOccurrence = occRef
17311520 , fanSubscribedParent = subscription
17321521 , fanSubscribedSubscribers = subscribersRef
17331522#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1523+ , fanSubscribedNodeId = unsafeNodeId f
17351524#endif
17361525 }
17371526 let !self = (k, subscribed)
@@ -1741,7 +1530,7 @@ getFanSubscribed k f sub = do
17411530 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421531 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431532
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1533+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451534cleanupFanSubscribed (k, subscribed) = do
17461535 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471536 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1542,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531542 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541543
17551544{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1545+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571546subscribeFanSubscribed k subscribed sub = do
17581547 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591548 case DMap.lookup k subscribers of
@@ -1791,9 +1580,6 @@ getSwitchSubscribed s sub = do
17911580 when (isJust parentOcc) $ scheduleClear occRef
17921581 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931582 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971583 let !subscribed = SwitchSubscribed
17981584 { switchSubscribedCachedSubscribed = switchSubscribed s
17991585 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1592,7 @@ getSwitchSubscribed s sub = do
18061592 , switchSubscribedCurrentParent = subscriptionRef
18071593 , switchSubscribedWeakSelf = weakSelf
18081594#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1595+ , switchSubscribedNodeId = unsafeNodeId s
18101596#endif
18111597 }
18121598 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1637,6 @@ getCoincidenceSubscribed c sub = do
18511637 scheduleClear innerSubdRef
18521638 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531639 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571640 let subscribed = CoincidenceSubscribed
18581641 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591642 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1647,7 @@ getCoincidenceSubscribed c sub = do
18641647 , coincidenceSubscribedInnerParent = innerSubdRef
18651648 , coincidenceSubscribedWeakSelf = weakSelf
18661649#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1650+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681651#endif
18691652 }
18701653 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1664,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811664subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821665subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831666
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)
1667+{-# INLINE merge #-}
1668+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1669+merge d = cacheEvent (mergeCheap d)
18891670
18901671{-# 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)
1672+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1673+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951674
18961675{-# 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
1676+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1677+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031678 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1679+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051680 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061681 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071682 (mOldSubd, newPs) <- case me of
19081683 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091684 Just e -> do
19101685 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1686+ subscription@(EventSubscription _ subd) <- subscribe e s
19121687 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131688 let newParent = MergeSubscribedParent subscription
19141689 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151690 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161691 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1692+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201693 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211694 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221695 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1696+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251697 getInitialSubscribers initialParents subscriber = do
19261698 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271699 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1700+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291701 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1702+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311703 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321704 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331705 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341706 )
1935−
19361707 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371708 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381709
19391710{-# 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
1711+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1712+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451713 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1714+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471715 updateMe subscriber heightBagRef oldParents p = do
19481716 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1717+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501718 subscribeParent k e = do
19511719 keyRef <- liftIO $ newIORef k
19521720 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1723,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551723 newParentHeight <- getEventSubscribedHeight subd
19561724 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571725 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1726+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591727 -- 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
1728+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611729 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621730 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1731+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661732 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671733 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681734 Just toKey -> do
19691735 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701736 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1737+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741738 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1739+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761740 getInitialSubscribers initialParents subscriber = do
19771741 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781742 keyRef <- liftIO $ newIORef k
19791743 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1744+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811745 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1746+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831747 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841748 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851749 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861750 )
1987−
19881751 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891752 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901753
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1754+type MergeUpdateFunc k x p s
1755+ = (forall a. EventM x (k a) -> Subscriber x a)
19931756 -> IORef HeightBag
19941757 -> DMap k s
19951758 -> p
19961759 -> EventM x ([EventSubscription x], DMap k s)
19971760
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)
1761+type MergeInitFunc k x s
1762+ = DMap k (Event x)
1763+ -> (forall a. EventM x (k a) -> Subscriber x a)
1764+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041765
20051766type MergeDestroyFunc k s
20061767 = DMap k s
20071768 -> IO ()
20081769
2009−data Merge x k v s = Merge
1770+data Merge x k s = Merge
20101771 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111772 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121773 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1774+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1775+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151776 }
20161777
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1778+invalidateMergeHeight :: Merge x k s -> IO ()
20181779invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191780
20201781invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211782invalidateMergeHeight' heightRef sub = do
20221783 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
1784+ 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
20251785 writeIORef heightRef $! invalidHeight
20261786 subscriberInvalidateHeight sub oldHeight
20271787
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1788+
1789+revalidateMergeHeight :: Merge x k s -> IO ()
20291790revalidateMergeHeight m = do
20301791 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
1792+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341793 heights <- readIORef $ _merge_heightBagRef m
20351794 parents <- readIORef $ _merge_parentsRef m
20361795 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1797,44 @@ revalidateMergeHeight m = do
20381797 LT -> return ()
20391798 EQ -> do
20401799 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1800+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
20421801 writeIORef (_merge_heightRef m) $! height
20431802 subscriberRecalculateHeight (_merge_sub m) height
20441803 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451804
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1805+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471806scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481807 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
1808+ liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty -- Once we're done with this, we can clear it immediately, because if there's a cacheEvent in front of us, it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
20521809 --TODO: Assert that m is not empty
20531810 subscriberPropagate (_merge_sub m) vals
20541811
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
1812+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1813+mergeSubscriber m getKey = Subscriber
20781814 { subscriberPropagate = \a -> do
20791815 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801816 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1817+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821818 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831819 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841820 when (DMap.null oldM) $ do -- Only schedule the firing once
20851821 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1822+ --TODO: assertions about height
1823+ currentHeight <- getCurrentHeight
1824+ when (height <= currentHeight) $ do
1825+ if height /= invalidHeight
1826+ then do
1827+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1828+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1829+ else liftIO $ do
1830+#ifdef DEBUG_CYCLES
1831+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1832+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1833+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1834+#else
1835+ let cycleInfo = ""
1836+#endif
1837+ error $ "Causality loop found" <> cycleInfo
20881838 scheduleMergeSelf m height
20891839 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901840 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1845,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951845 }
20961846
20971847--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)
1848+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1849+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001850 where updateMe = do
21011851 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1852+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031853 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041854 return subscriptionsToKill
21051855
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
1856+{-# INLINE mergeCheap' #-}
1857+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 -> Dynamic x p -> Event x (DMap k Identity)
1858+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101859 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111860 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121861 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131862 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141863 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2116−
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
2120−#ifdef DEBUG_CYCLES
2121− , eventSubscribedGetParents = do
2122− let getParent' (_ :=> v) = _eventSubscription_subscribed (getParent v)
2123− fmap getParent' . DMap.toList <$> readIORef parentsRef
2124− , eventSubscribedHasOwnHeightRef = False
2125− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2126−#endif
2127− }
2128−
2129− m = Merge
1864+ let m = Merge
21301865 { _merge_parentsRef = parentsRef
21311866 , _merge_heightBagRef = heightBagRef
21321867 , _merge_heightRef = heightRef
21331868 , _merge_sub = sub
21341869 , _merge_accumRef = accumRef
21351870 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1871+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371872 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381873 myHeight = if invalidHeight `elem` heights
21391874 then invalidHeight
@@ -2142,57 +1877,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421877 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431878 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441879 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1880+ unless (DMap.null accum) $ do
1881+ scheduleMergeSelf m myHeight
21461882 liftIO $ writeIORef accumRef $! accum
21471883 liftIO $ writeIORef heightRef $! myHeight
21481884 liftIO $ writeIORef heightBagRef $! myHeightBag
1885+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491886 liftIO $ writeIORef parentsRef $! initialParentState
21501887 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1888+ let s = Subscriber
21521889 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1890+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1891+ defer $ updateMerge m updateFunc a
21551892 , subscriberInvalidateHeight = \_ -> return ()
21561893 , subscriberRecalculateHeight = \_ -> return ()
21571894 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1895+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1896+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601897 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611898 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621899 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1900+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641901 let unsubscribeAll = destroy =<< readIORef parentsRef
1902+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1903+ , occ
1904+ )
21651905
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)
1906+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701907mergeInt = cacheEvent . mergeIntCheap
21711908
21721909{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1910+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741911mergeIntCheap d = Event $ \sub -> do
21751912 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761913 accum <- liftIO $ FastMutableIntMap.newEmpty
21771914 heightRef <- liftIO $ newIORef zeroHeight
21781915 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791916 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− }
21901917 let scheduleSelf = do
21911918 height <- liftIO $ readIORef $ heightRef
21921919 scheduleMerge' height heightRef $ do
21931920 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941921 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1922+ invalidateMyHeight = do
1923+ invalidateMergeHeight' heightRef sub
21961924 recalculateMyHeight = do
21971925 currentHeight <- readIORef heightRef
21981926 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?
@@ -2202,14 +1930,12 @@ mergeIntCheap d = Event $ \sub -> do
22021930 LT -> return ()
22031931 EQ -> do
22041932 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1933+ traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
22061934 writeIORef heightRef $! height
22071935 subscriberRecalculateHeight sub height
22081936 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091937 mySubscriber k = Subscriber
22101938 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131939 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141940 liftIO $ FastMutableIntMap.insert accum k a
22151941 when wasEmpty scheduleSelf
@@ -2243,6 +1969,7 @@ mergeIntCheap d = Event $ \sub -> do
22431969 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22441970 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22451971 return Nothing
1972+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22461973 defer $ SomeMergeInit $ do
22471974 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22481975 where
@@ -2256,39 +1983,35 @@ mergeIntCheap d = Event $ \sub -> do
22561983 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22571984 liftIO $ for_ oldParents $ \oldParent -> do
22581985 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22611986 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22621987 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
1988+ let s = Subscriber
22641989 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22651990 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22661991 defer $ updateMe a
22671992 , subscriberInvalidateHeight = \_ -> return ()
22681993 , subscriberRecalculateHeight = \_ -> return ()
22691994 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1995+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22711996 forM_ change $ \c -> defer $ updateMe c
22721997 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22731998 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22741999 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2000+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762001 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2002+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2003+ , occ
2004+ )
22802005
22812006newtype 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) }
22832007
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2008+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2009+fan e =
22872010 let f = Fan
22882011 { fanParent = e
2289− , fanSubscribed = ref
2012+ , fanSubscribed = unsafeNewIORef e Nothing
22902013 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2014+ in EventSelector $ \k -> eventFan k f
22922015
22932016runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942017runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2065,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422065-- | Run an event action outside of a frame
23432066runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442067runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2068+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462069 let go = do
23472070 result <- a
23482071 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
@@ -2385,7 +2108,7 @@ runFrame a = SpiderHost $ do
23852108 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
23862109 {-
23872110 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2111+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892112 EventRoot _ -> "EventRoot"
23902113 EventNever -> "EventNever"
23912114 _ -> "something else"
@@ -2400,7 +2123,7 @@ runFrame a = SpiderHost $ do
24002123 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012124 when (parentHeight /= myHeight) $ do
24022125 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2126+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042127 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
24052128 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062129 unsubscribe subscription
@@ -2441,7 +2164,7 @@ invalidateCoincidenceHeight subscribed = do
24412164 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422165 when (oldHeight /= invalidHeight) $ do
24432166 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2167+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452168
24462169updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472170updateSwitchHeight new subscribed = do
@@ -2449,7 +2172,7 @@ updateSwitchHeight new subscribed = do
24492172 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502173 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512174 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2175+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532176
24542177recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552178recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2181,7 @@ recalculateCoincidenceHeight subscribed = do
24582181 height <- calculateCoincidenceHeight subscribed
24592182 when (height /= invalidHeight) $ do
24602183 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2184+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622185
24632186calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642187calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2243,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202243 {-# INLINABLE headE #-}
25212244 headE = R.slowHeadE
25222245-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252246
25262247instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272248 {-# INLINABLE sample #-}
@@ -2543,9 +2264,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432264 {-# INLINABLE headE #-}
25442265 headE = R.slowHeadE
25452266-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492267
25502268instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512269 {-# INLINE return #-}
@@ -2554,13 +2272,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542272 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552273 {-# INLINE (>>) #-}
25562274 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582275 {-# INLINE fail #-}
25592276 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612277
25622278{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2279+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642280newJoinDyn d =
25652281 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662282 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2325,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092325 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102326 {-# INLINABLE headE #-}
26112327 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152328
26162329instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172330 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2341,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282341 {-# INLINABLE headE #-}
26292342 headE = R.slowHeadE
26302343-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332344
26342345instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352346 {-# INLINABLE sample #-}
@@ -2650,8 +2361,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502361 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512362 {-# INLINABLE headE #-}
26522363 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552364
26562365--------------------------------------------------------------------------------
26572366-- Deprecated items
@@ -2717,7 +2426,7 @@ unsafeNewSpiderTimelineEnv = do
27172426#ifdef DEBUG
27182427 depthRef <- newIORef 0
27192428#endif
2720− return $ STE $ SpiderTimelineEnv
2429+ return $ SpiderTimelineEnv
27212430 { _spiderTimeline_lock = lock
27222431 , _spiderTimeline_eventEnv = env
27232432#ifdef DEBUG
@@ -2729,17 +2438,17 @@ unsafeNewSpiderTimelineEnv = do
27292438newSpiderTimeline :: IO (Some SpiderTimelineEnv)
27302439newSpiderTimeline = withSpiderTimeline (pure . Some)
27312440
2732−data LocalSpiderTimeline (x :: Type) s
2441+data LocalSpiderTimeline x s
27332442
27342443instance Reifies s (SpiderTimelineEnv x) =>
27352444 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2445+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372446
27382447localSpiderTimeline
2739− :: proxy s
2448+ :: Proxy s
27402449 -> SpiderTimelineEnv x
27412450 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2451+localSpiderTimeline _ = unsafeCoerce
27432452
27442453-- | Pass a new timeline to the given function.
27452454withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2456,18 @@ withSpiderTimeline k = do
27472456 env <- unsafeNewSpiderTimelineEnv
27482457 reify env $ \s -> k $ localSpiderTimeline s env
27492458
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2459+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512460
27522461type ComputeM = EventM
27532462
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2463+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552464
27562465instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572466 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582467 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592468 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 }
2469+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2470+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622471 type PullM (SpiderTimeline x) = SpiderPullM x
27632472 type PushM (SpiderTimeline x) = SpiderPushM x
27642473 {-# INLINABLE never #-}
@@ -2771,15 +2480,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712480 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722481 {-# INLINABLE pull #-}
27732482 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
2483+ {-# INLINABLE merge #-}
2484+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2485+ {-# INLINABLE fan #-}
2486+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832487 {-# INLINABLE switch #-}
27842488 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852489 {-# INLINABLE coincidence #-}
@@ -2787,15 +2491,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872491 {-# INLINABLE current #-}
27882492 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892493 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2494+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912495 {-# INLINABLE unsafeBuildDynamic #-}
27922496 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932497 {-# INLINABLE unsafeBuildIncremental #-}
27942498 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
2499+ {-# INLINABLE mergeIncremental #-}
2500+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2501+ {-# INLINABLE mergeIncrementalWithMove #-}
2502+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992503 {-# INLINABLE currentIncremental #-}
28002504 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012505 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2510,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062510 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072511 eventCoercion Coercion = Coercion
28082512 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2513+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112514 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2515+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132516 {-# INLINABLE fanInt #-}
28142517 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152518
@@ -2834,7 +2537,7 @@ instance MonadAtomicRef (EventM x) where
28342537 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352538
28362539-- | 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)
2540+newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382541
28392542instance Monad (SpiderHost x) where
28402543 {-# INLINABLE (>>=) #-}
@@ -2843,14 +2546,8 @@ instance Monad (SpiderHost x) where
28432546 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442547 {-# INLINABLE return #-}
28452548 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472549 {-# 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
2550+ fail s = SpiderHost $ fail s
28542551
28552552-- | Run an action affecting the global Spider timeline; this will be guarded by
28562553-- a mutex for that timeline
@@ -2862,7 +2559,7 @@ runSpiderHost (SpiderHost a) = a
28622559runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
28632560runSpiderHostForTimeline (SpiderHost a) _ = a
28642561
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2562+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
28662563 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672564
28682565instance Monad (SpiderHostFrame x) where
@@ -2872,10 +2569,8 @@ instance Monad (SpiderHostFrame x) where
28722569 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732570 {-# INLINABLE return #-}
28742571 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762572 {-# INLINABLE fail #-}
28772573 fail s = SpiderHostFrame $ fail s
2878−#endif
28792574
28802575instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812576 notReadyUntil _ = pure ()
@@ -2920,11 +2615,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202615instance PrimMonad (SpiderHostFrame x) where
29212616 type PrimState (SpiderHostFrame x) = PrimState IO
29222617 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 ()