@@ -9,6 +9,7 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
1213{-# LANGUAGE RankNTypes #-}
1314{-# LANGUAGE RoleAnnotations #-}
1415{-# LANGUAGE ScopedTypeVariables #-}
@@ -16,11 +17,7 @@
1617{-# LANGUAGE TypeOperators #-}
1718{-# LANGUAGE UndecidableInstances #-}
1819{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
2120{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2421#ifdef USE_REFLEX_OPTIMIZER
2522{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2623#endif
@@ -38,17 +35,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3835import Control.Monad.Exception
3936import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4037import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
38+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4439import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4740import Data.Align
4841import Data.Coerce
49−import Data.Dependent.Map (DMap)
42+import Data.Dependent.Map (DMap, DSum (..))
5043import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5244import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5345import qualified Data.FastMutableIntMap as FastMutableIntMap
5446import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +53,12 @@ import qualified Data.IntMap.Strict as IntMap
6153import Data.IORef
6254import Data.Kind (Type)
6355import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
56+import Data.Monoid ((<>))
6557import Data.Proxy
6658import Data.These
6759import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6960import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
61+import GHC.Exts
7162import GHC.IORef (IORef (..))
7263import GHC.Stack
7364import Reflex.FastWeak
@@ -86,16 +77,14 @@ import Data.Zip (Zip (..))
8677
8778#ifdef DEBUG_CYCLES
8879import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9180import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9281import qualified Data.List.NonEmpty as NonEmpty
82+import Data.Monoid (mempty)
9383import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
84+#endif
9585
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
86+import Data.FastWeakBag (FastWeakBag)
9787import qualified Data.FastWeakBag as FastWeakBag
98−
9988import Data.Reflection
10089import Data.Some (Some(Some))
10190import Data.Type.Coercion
@@ -106,26 +95,20 @@ import qualified Reflex.Class
10695import qualified Reflex.Class as R
10796import qualified Reflex.Host.Class
10897import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
98+import Reflex.Patch
99+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
112100
113101#ifdef DEBUG_TRACE_EVENTS
114102import qualified Data.ByteString.Char8 as BS8
115103import System.IO (stderr)
116−import Data.List (isPrefixOf)
117104#endif
118105
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123106#ifdef DEBUG_TRACE_EVENTS
107+
124108withStackOneLine :: (BS8.ByteString -> a) -> a
125109withStackOneLine expr = unsafePerformIO $ do
126110 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
111+ return (expr (BS8.pack (unwords (reverse stack))))
129112
130113#endif
131114
@@ -136,42 +119,28 @@ debugInvalidateHeight :: Bool
136119debugInvalidate :: Bool
137120
138121#ifdef DEBUG
122+
139123#define DEBUG_NODEIDS
140124
141−#ifdef DEBUG_TRACE_PROPAGATION
142125debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146126
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150127debugInvalidateHeight = False
151−#endif
152128
153−#ifdef DEBUG_TRACE_INVALIDATION
154129debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158130
159131class HasNodeId a where
160132 getNodeId :: a -> Int
161133
162−instance HasNodeId (CacheSubscribed x a) where
163− getNodeId = _cacheSubscribed_nodeId
164−
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
167−
168−instance HasNodeId (Hold x p) where
134+instance HasNodeId (Hold x p a) where
169135 getNodeId = holdNodeId
170136
137+instance HasNodeId (PushSubscribed x a b) where
138+ getNodeId = pushSubscribedNodeId
139+
171140instance HasNodeId (SwitchSubscribed x a) where
172141 getNodeId = switchSubscribedNodeId
173142
174−instance HasNodeId (FanSubscribed x v a) where
143+instance HasNodeId (FanSubscribed x a) where
175144 getNodeId = fanSubscribedNodeId
176145
177146instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +154,41 @@ instance HasNodeId (Pull x a) where
185154
186155{-# INLINE showNodeId #-}
187156showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
157+showNodeId = ("#"<>) . show . getNodeId
158+
159+showSubscriberType :: Subscriber x a -> String
160+showSubscriberType = \case
161+ SubscriberPush _ _ -> "SubscriberPush"
162+ SubscriberMerge _ _ -> "SubscriberMerge"
163+ SubscriberFan _ -> "SubscriberFan"
164+ SubscriberMergeChange _ -> "SubscriberMergeChange"
165+ SubscriberHold _ -> "SubscriberHold"
166+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
167+ SubscriberSwitch _ -> "SubscriberSwitch"
168+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
169+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
170+ SubscriberHandle -> "SubscriberHandle"
171+
172+showEventType :: Event x a -> String
173+showEventType = \case
174+ EventRoot _ _ -> "EventRoot"
175+ EventNever -> "EventNever"
176+ EventPush _ -> "EventPush"
177+ EventMerge _ -> "EventMerge"
178+ EventFan _ _ -> "EventFan"
179+ EventSwitch _ -> "EventSwitch"
180+ EventCoincidence _ -> "EventCoincidence"
181+ EventHold _ -> "EventHold"
182+ EventDyn _ -> "EventDyn"
183+ EventHoldIdentity _ -> "EventHoldIdentity"
184+ EventDynIdentity _ -> "EventDynIdentity"
193185
194186#else
195187
196188debugPropagate = False
189+
197190debugInvalidateHeight = False
191+
198192debugInvalidate = False
199193
200194-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +196,6 @@ debugInvalidate = False
202196showNodeId :: a -> String
203197showNodeId _ = ""
204198
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209199#endif
210200
211201#ifdef DEBUG_NODEIDS
@@ -215,6 +205,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215205
216206newNodeId :: IO Int
217207newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
208+
209+{-# NOINLINE unsafeNodeId #-}
210+unsafeNodeId :: a -> Int
211+unsafeNodeId a = unsafePerformIO $ do
212+ touch a
213+ newNodeId
218214#endif
219215
220216--------------------------------------------------------------------------------
@@ -251,9 +247,9 @@ subscribeAndRead = unEvent
251247-- caching; if the computation function is very cheap, this is (much) more
252248-- efficient than 'push'
253249{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
250+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255251pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
252+ (subscription, occ) <- subscribeAndRead e $ sub
257253 { subscriberPropagate = \a -> do
258254 mb <- f a
259255 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +268,10 @@ terminalSubscriber p = Subscriber
272268
273269-- | Subscribe to an Event only for the duration of one occurrence
274270{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
271+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276272subscribeAndReadHead e sub = do
277273 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
274+ (subscription, occ) <- subscribeAndRead e $ sub
279275 { subscriberPropagate = \a -> do
280276 liftIO $ unsubscribe =<< readIORef subscriptionRef
281277 subscriberPropagate sub a
@@ -286,42 +282,24 @@ subscribeAndReadHead e sub = do
286282 return (subscription, occ)
287283
288284--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)
285+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290286headE originalE = do
291287 parent <- liftIO $ newIORef $ Just originalE
292288 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293289 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
290+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295291 when (isJust occ) clearParent
296− return $ Event $ \sub ->
292+ return $ Event $ \sub -> do
297293 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
294+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299295 Just e -> subscribeAndReadHead e sub
300296
301297data CacheSubscribed x a
302298 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303299 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304300 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308301 }
309302
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−
325303-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326304-- repeatedly
327305--
@@ -336,33 +314,27 @@ cacheEvent e =
336314#else
337315 Event $
338316#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
317+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
318+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
319+ in \sub -> {-# SCC "cacheEvent" #-} do
343320#ifdef DEBUG_TRACE_EVENTS
344321 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345322#endif
346323 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347324 Just subscribedTicket -> return subscribedTicket
348325 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352326 subscribers <- liftIO FastWeakBag.empty
353327 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
357328 (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− }
329+ { subscriberPropagate = \a -> do
330+ liftIO $ writeIORef occRef $ Just a
331+ scheduleClear occRef
332+ propagateFast a subscribers
333+ , subscriberInvalidateHeight = \old -> do
334+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
335+ , subscriberRecalculateHeight = \new -> do
336+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
337+ }
366338 when (isJust occ) $ do
367339 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368340 scheduleClear occRef
@@ -370,45 +342,29 @@ cacheEvent e =
370342 { _cacheSubscribed_subscribers = subscribers
371343 , _cacheSubscribed_parent = parentSub
372344 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376345 }
377346 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378347 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379348 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−
349+ liftIO $ do
350+ subscribed <- getFastWeakTicketValue subscribedTicket
351+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
352+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
353+ let es = EventSubscription
354+ { _eventSubscription_unsubscribe = do
355+ FastWeakBag.remove ticket
356+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
357+ when isEmpty $ do
358+ writeIORef mSubscribedRef emptyFastWeak
359+ unsubscribe $ _cacheSubscribed_parent subscribed
360+ touch ticket
361+ touch subscribedTicket
362+ , _eventSubscription_subscribed = EventSubscribed
363+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
364+ , eventSubscribedRetained = toAny subscribedTicket
365+ }
366+ }
367+ return (es, occ)
412368
413369subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414370subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +376,13 @@ wrap tag getSpecificSubscribed sub = do
420376 let es = tag subd
421377 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422378
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
379+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424380eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425381
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429382eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
383+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431384
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
385+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433386eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434387
435388eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +417,16 @@ data Subscriber x a = Subscriber
464417 , subscriberRecalculateHeight :: !(Height -> IO ())
465418 }
466419
420+--TODO: Move this comment to WeakBag
421+-- These function are constructor functions that are marked NOINLINE so they are
422+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
423+-- so any weak references that are attached to the constructors will have their
424+-- finalizer run. Using the opaque constructor, does not see the
425+-- constructor application, so it behaves like an IORef and cannot be fused away.
426+--
427+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
428+-- the weak pointer to it in some cases.
429+
467430newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468431newSubscriberHold h = return $ Subscriber
469432 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +434,85 @@ newSubscriberHold h = return $ Subscriber
471434 , subscriberRecalculateHeight = \_ -> return ()
472435 }
473436
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
437+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
438+newSubscriberFan subscribed = return $ Subscriber
476439 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477440 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
441+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479442 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480443 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
444+ let f _ (Pair (Identity v) subsubs) = do
482445 propagate v $ _fanSubscribedChildren_list subsubs
483446 return $ Constant ()
484447 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485448 return ()
486449 , subscriberInvalidateHeight = \old -> do
450+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487451 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
452+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
453+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489454 , subscriberRecalculateHeight = \new -> do
455+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490456 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
457+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
458+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492459 }
493460
494461newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
462+newSubscriberSwitch subscribed = return $ Subscriber
496463 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
464+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497465 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498466 scheduleClear $ switchSubscribedOccurrence subscribed
499467 propagate a $ switchSubscribedSubscribers subscribed
500468 , subscriberInvalidateHeight = \_ -> do
469+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501470 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502471 when (oldHeight /= invalidHeight) $ do
503472 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
473+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
474+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
475+ , subscriberRecalculateHeight = \new -> do
476+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
477+ updateSwitchHeight new subscribed
478+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
479+ }
507480
508481newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
482+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510483 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
484+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511485 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512486 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513487 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514488 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515489 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517490 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518491 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519492 case occ of
520− Nothing ->
493+ Nothing -> do
521494 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522495 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
496+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
497+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525498 Just o -> do -- Since it's already firing, no need to adjust height
526499 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527500 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528501 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
502+ , subscriberInvalidateHeight = \_ -> do
503+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
504+ invalidateCoincidenceHeight subscribed
505+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
506+ , subscriberRecalculateHeight = \_ -> do
507+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
508+ recalculateCoincidenceHeight subscribed
509+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531510 }
532511
533512newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
513+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535514 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
515+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536516 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537517 case occ of
538518 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +520,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540520 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541521 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542522 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
523+ , subscriberInvalidateHeight = \_ -> do
524+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
525+ invalidateCoincidenceHeight subscribed
526+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
527+ , subscriberRecalculateHeight = \_ -> do
528+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
529+ recalculateCoincidenceHeight subscribed
530+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545531 }
546532
547533invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +537,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551537recalculateSubscriberHeight = flip subscriberRecalculateHeight
552538
553539-- | 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) $
540+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
541+propagate a subscribers = withIncreasedDepth $ do
556542 -- 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
557543 --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
544+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559545
560546-- | 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) $
547+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
548+propagateFast a subscribers = withIncreasedDepth $ do
563549 -- 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
564550 --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
551+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566552
567553--------------------------------------------------------------------------------
568554-- EventSubscribed
@@ -571,16 +557,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571557toAny :: a -> Any
572558toAny = unsafeCoerce
573559
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.
579560data EventSubscribed x = EventSubscribed
580561 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581562 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582563#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
564+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584565 , eventSubscribedHasOwnHeightRef :: !Bool
585566 , eventSubscribedWhoCreated :: !(IO [String])
586567#endif
@@ -607,23 +588,13 @@ eventSubscribedNever = EventSubscribed
607588 , eventSubscribedWhoCreated = return ["never"]
608589#endif
609590 }
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− }
620591
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
592+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622593eventSubscribedFan !subscribed = EventSubscribed
623594 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624595 , eventSubscribedRetained = toAny subscribed
625596#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
597+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627598 , eventSubscribedHasOwnHeightRef = False
628599 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629600#endif
@@ -636,7 +607,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636607#ifdef DEBUG_CYCLES
637608 , eventSubscribedGetParents = do
638609 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
610+ return [Some $ _eventSubscription_subscribed s]
640611 , eventSubscribedHasOwnHeightRef = True
641612 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642613#endif
@@ -649,8 +620,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649620#ifdef DEBUG_CYCLES
650621 , eventSubscribedGetParents = do
651622 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
623+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
624+ innerParents = maybeToList $ fmap Some innerSubscription
654625 return $ outerParent : innerParents
655626 , eventSubscribedHasOwnHeightRef = True
656627 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +635,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664635whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665636whoCreatedEventSubscribed = eventSubscribedWhoCreated
666637
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
638+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668639walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
640+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670641 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671642 when (h == invalidHeight) $ do
672643 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
644+ modify (Some s :)
674645 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
646+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676647 return subscribers
677648#endif
678649
@@ -709,7 +680,7 @@ behaviorPull !p = Behavior $ do
709680 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710681 parentsRef <- liftIO $ newIORef []
711682 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
683+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713684 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714685 parents <- liftIO $ readIORef parentsRef
715686 let subscribed = PullSubscribed
@@ -744,46 +715,42 @@ readBehaviorUntracked b = do
744715-- Dynamic
745716--------------------------------------------------------------------------------
746717
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
718+data Dynamic x p = Dynamic
719+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751720 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752721 }
753722
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
723+dynamicHold :: Hold x p -> Dynamic x p
760724dynamicHold !h = Dynamic
761725 { dynamicCurrent = behaviorHold h
762726 , dynamicUpdated = eventHold h
763727 }
764728
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
729+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766730dynamicHoldIdentity = dynamicHold
767731
768−dynamicConst :: PatchTarget p -> DynamicS x p
732+dynamicConst :: PatchTarget p -> Dynamic x p
769733dynamicConst !a = Dynamic
770734 { dynamicCurrent = behaviorConst a
771735 , dynamicUpdated = eventNever
772736 }
773737
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
738+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775739dynamicDyn !d = Dynamic
776740 { dynamicCurrent = behaviorDyn d
777741 , dynamicUpdated = eventDyn d
778742 }
779743
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
744+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781745dynamicDynIdentity = dynamicDyn
782746
783747--------------------------------------------------------------------------------
784748-- Combinators
785749--------------------------------------------------------------------------------
786750
751+--TODO: Figure out why certain things are not 'representational', then make them
752+--representational so we can use coerce
753+
787754--type role Hold representational
788755data Hold x p
789756 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +771,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804771
805772-- | Stores all global data relevant to a particular Spider timeline; only one
806773-- 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
774+data SpiderTimelineEnv x = SpiderTimelineEnv
813775 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814776 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815777#ifdef DEBUG
816778 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817779#endif
818780 }
819−type role SpiderTimelineEnv' phantom
781+type role SpiderTimelineEnv nominal
820782
821783instance Eq (SpiderTimelineEnv x) where
822784 _ == _ = True -- Since only one exists of each type
823785
824786instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
787+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826788 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827789 else Nothing
828790
@@ -845,7 +807,7 @@ runEventM :: EventM x a -> IO a
845807runEventM = unEventM
846808
847809asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
810+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849811
850812class MonadIO m => Defer a m where
851813 getDeferralQueue :: m (IORef [a])
@@ -983,9 +945,9 @@ getHoldEventSubscription h = do
983945
984946type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985947
948+--type role BehaviorM representational
986949-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
950+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989951
990952instance Monad (BehaviorM x) where
991953 {-# INLINE (>>=) #-}
@@ -994,10 +956,8 @@ instance Monad (BehaviorM x) where
994956 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995957 {-# INLINE return #-}
996958 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998959 {-# INLINE fail #-}
999960 fail s = BehaviorM $ fail s
1000−#endif
1001961
1002962data BehaviorSubscribed x a
1003963 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +998,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038998#endif
1039999 }
10401000
1041−data Root x k
1001+data Root x (k :: * -> *)
10421002 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
10431003 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
10441004 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1017,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571017newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581018
10591019-- 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)
1020+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
10611021
10621022newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631023
@@ -1082,8 +1042,7 @@ heightBagFromList :: [Height] -> HeightBag
10821042heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831043
10841044heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1045+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871046
10881047heightBagRemove :: Height -> HeightBag -> HeightBag
10891048heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1051,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921051 0 -> IntMap.delete h c
10931052 _ -> IntMap.insert h (pred old) c
10941053
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−
11021054heightBagMax :: HeightBag -> Height
11031055heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041056 Just ((h, _), _) -> Height h
@@ -1116,25 +1068,25 @@ heightBagVerify b@(HeightBag s c) = if
11161068heightBagVerify = id
11171069#endif
11181070
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)))
1071+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1072+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1073+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1074+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231075 }
11241076
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
1077+data FanSubscribed (x :: *) k
1078+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1079+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1080+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291081 , fanSubscribedParent :: !(EventSubscription x)
11301082#ifdef DEBUG_NODEIDS
11311083 , fanSubscribedNodeId :: Int
11321084#endif
11331085 }
11341086
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1087+data Fan x k
1088+ = Fan { fanParent :: !(Event x (DMap k Identity))
1089+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381090 }
11391091
11401092data SwitchSubscribed x a
@@ -1212,11 +1164,11 @@ data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12121164
12131165newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
12141166
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1167+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161168newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171169
12181170--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)
1171+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201172zipDynWith f da db =
12211173 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221174 ec = flip push eab $ \o -> do
@@ -1239,12 +1191,18 @@ buildDynamic readV0 v' = do
12391191 return d
12401192
12411193unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1194+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1195+ where x = (readV0, v')
12441196
12451197-- ResultM can read behaviors and events
12461198type ResultM = EventM
12471199
1200+{-# NOINLINE unsafeNewIORef #-}
1201+unsafeNewIORef :: a -> b -> IORef b
1202+unsafeNewIORef a b = unsafePerformIO $ do
1203+ touch a
1204+ newIORef b
1205+
12481206instance HasSpiderTimeline x => Functor (Event x) where
12491207 fmap f = push $ return . Just . f
12501208
@@ -1257,42 +1215,33 @@ push f e = cacheEvent (pushCheap f e)
12571215
12581216{-# INLINABLE pull #-}
12591217pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1218+pull a = behaviorPull $ Pull
1219+ { pullCompute = a
1220+ , pullValue = unsafeNewIORef a Nothing
12621221#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1222+ , pullNodeId = unsafeNodeId a
12641223#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1224+ }
12721225
12731226{-# INLINABLE switch #-}
12741227switch :: 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− }
1228+switch a = eventSwitch $ Switch
1229+ { switchParent = a
1230+ , switchSubscribed = unsafeNewIORef a Nothing
1231+ }
12811232
12821233coincidence :: 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− }
1234+coincidence a = eventCoincidence $ Coincidence
1235+ { coincidenceParent = a
1236+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1237+ }
12891238
12901239-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911240run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921241run roots after = do
12931242 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941243 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1244+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961245 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971246 occBefore <- liftIO $ do
12981247 occBefore <- readIORef occRef
@@ -1346,110 +1295,55 @@ mkWeakPtrWithDebug x debugNote = do
13461295 x' <- evaluate x
13471296 mkWeakPtr x' $
13481297 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1298+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501299 else Nothing
13511300
13521301type WeakList a = [Weak a]
13531302
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1355−
1356−
1357−
1358−
1359−#ifdef DEBUG
1360−
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1363−
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
1366− {
1367− subscriberPropagate = \m -> do
1368− tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1369− subscriberPropagate subscribed m
1370− , subscriberInvalidateHeight = \old -> do
1371− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1372− subscriberInvalidateHeight subscribed old
1373− traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1374− , subscriberRecalculateHeight = \new -> do
1375− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1376− subscriberRecalculateHeight subscribed new
1377− traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
1378− }
1379−
1380−
13811303{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1383−withIncreasedDepth _ a = do
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1304+#ifdef DEBUG
1305+withIncreasedDepth :: CanTrace x m => m a -> m a
1306+withIncreasedDepth a = do
1307+ spiderTimeline <- askSpiderTimelineEnv
1308+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851309 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1310+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871311 return result
1388−
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1392−
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1396−
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1400−
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
1404−
1405−{-# INLINE traceM #-}
1406−traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1407−traceM _ getMessage = do
1408− message <- getMessage
1409− d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1410− liftIO $ debugStrLn $ replicate d ' ' <> message
1411−
14121312#else
1313+withIncreasedDepth :: m a -> m a
1314+withIncreasedDepth = id
1315+#endif
14131316
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1317+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171318
14181319{-# INLINE tracePropagate #-}
14191320tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1321+tracePropagate p = traceWhen p debugPropagate
14211322
14221323{-# INLINE traceInvalidate #-}
14231324traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1325+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331326
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1327+{-# INLINE traceWhen #-}
1328+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1329+traceWhen p b message = traceMWhen p b $ return message
14471330
1331+{-# INLINE traceMWhen #-}
1332+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1333+traceMWhen _ b getMessage = when b $ do
1334+ message <- getMessage
1335+#ifdef DEBUG
1336+ spiderTimeline <- askSpiderTimelineEnv
1337+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1338+#else
1339+ let d = 0
14481340#endif
1341+ liftIO $ putStrLn $ replicate d ' ' <> message
14491342
14501343whoCreatedIORef :: IORef a -> IO [String]
14511344whoCreatedIORef (IORef a) = whoCreated $! a
14521345
1346+#ifdef DEBUG_CYCLES
14531347groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541348groupByHead = \case
14551349 [] -> []
@@ -1460,54 +1354,20 @@ groupByHead = \case
14601354 | otherwise -> (x, xs :| []) : l
14611355
14621356listsToForest :: 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
1357+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741358#endif
14751359
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−
14981360{-# INLINE propagateSubscriberHold #-}
14991361propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001362propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1363+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021364 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031365 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051366 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061367 case {-# SCC "apply" #-} apply a v of
15071368 Nothing -> return ()
15081369 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1370+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111371 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121372 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131373 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1375,25 @@ propagateSubscriberHold h a = do
15151375data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161376
15171377runBehaviorM :: 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)
1378+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191379
15201380askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211381askInvalidator = do
1522− (!m, _) <- ask
1382+ (!m, _) <- BehaviorM ask
15231383 case m of
15241384 Nothing -> return Nothing
15251385 Just (!wi, _) -> return $ Just wi
15261386
15271387askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281388askParentsRef = do
1529− (!m, _) <- ask
1389+ (!m, _) <- BehaviorM ask
15301390 case m of
15311391 Nothing -> return Nothing
15321392 Just (_, !p) -> return $ Just p
15331393
15341394askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351395askBehaviorHoldInits = do
1536− (_, !his) <- ask
1396+ (_, !his) <- BehaviorM ask
15371397 return his
15381398
15391399{-# INLINE getDynHold #-}
@@ -1561,7 +1421,7 @@ getDynHold d = do
15611421zeroRef :: IORef Height
15621422zeroRef = unsafePerformIO $ newIORef zeroHeight
15631423
1564−getRootSubscribed :: forall k x a. (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1424+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651425getRootSubscribed k r sub = do
15661426 mSubscribed <- readIORef $ rootSubscribed r
15671427 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1435,9 @@ getRootSubscribed k r sub = do
15751435 let !cached = rootSubscribed r
15761436 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771437 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1438+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811439 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821440 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861441 let !subscribed = RootSubscribed
15871442 { rootSubscribedKey = k
15881443 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1446,7 @@ getRootSubscribed k r sub = do
15911446 , rootSubscribedUninit = uninit
15921447 , rootSubscribedWeakSelf = weakSelf
15931448#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1449+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951450#endif
15961451 }
15971452 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1482,6 @@ data FanInt x a = FanInt
16271482 { _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
16281483 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291484 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331485 }
16341486
16351487newFanInt :: IO (FanInt x a)
@@ -1637,39 +1489,38 @@ newFanInt = do
16371489 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
16381490 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391491 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431492 return $ FanInt
16441493 { _fanInt_subscribers = subscribers
16451494 , _fanInt_subscriptionRef = subscriptionRef
16461495 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501496 }
16511497
1498+{-# NOINLINE unsafeNewFanInt #-}
1499+unsafeNewFanInt :: b -> FanInt x a
1500+unsafeNewFanInt b = unsafePerformIO $ do
1501+ touch b
1502+ newFanInt
1503+
16521504fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1505+fanInt p =
1506+ let self = unsafeNewFanInt p
1507+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561508 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571509 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
1510+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601511 { subscriberPropagate = \m -> do
16611512 liftIO $ writeIORef (_fanInt_occRef self) m
16621513 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 ->
1514+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1515+ FastWeakBag.traverse b $ \s -> do
16651516 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1517+ , subscriberInvalidateHeight = \old -> do
1518+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1519+ FastWeakBag.traverse b $ \s -> do
16691520 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1521+ , subscriberRecalculateHeight = \new -> do
1522+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1523+ FastWeakBag.traverse b $ \s -> do
16731524 subscriberRecalculateHeight s new
16741525 }
16751526 liftIO $ do
@@ -1683,28 +1534,13 @@ fanInt p = unsafePerformIO $ do
16831534 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841535 return b
16851536 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1537+ t <- liftIO $ FastWeakBag.insert sub b
16871538 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−
1539+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1540+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051541
17061542{-# 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))
1543+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081544getFanSubscribed k f sub = do
17091545 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101546 case mSubscribed of
@@ -1722,16 +1558,13 @@ getFanSubscribed k f sub = do
17221558 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231559 occRef <- liftIO $ newIORef parentOcc
17241560 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281561 let subscribed = FanSubscribed
17291562 { fanSubscribedCachedSubscribed = fanSubscribed f
17301563 , fanSubscribedOccurrence = occRef
17311564 , fanSubscribedParent = subscription
17321565 , fanSubscribedSubscribers = subscribersRef
17331566#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1567+ , fanSubscribedNodeId = unsafeNodeId f
17351568#endif
17361569 }
17371570 let !self = (k, subscribed)
@@ -1741,7 +1574,7 @@ getFanSubscribed k f sub = do
17411574 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421575 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431576
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1577+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451578cleanupFanSubscribed (k, subscribed) = do
17461579 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471580 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1586,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531586 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541587
17551588{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1589+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571590subscribeFanSubscribed k subscribed sub = do
17581591 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591592 case DMap.lookup k subscribers of
@@ -1791,9 +1624,6 @@ getSwitchSubscribed s sub = do
17911624 when (isJust parentOcc) $ scheduleClear occRef
17921625 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931626 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971627 let !subscribed = SwitchSubscribed
17981628 { switchSubscribedCachedSubscribed = switchSubscribed s
17991629 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1636,7 @@ getSwitchSubscribed s sub = do
18061636 , switchSubscribedCurrentParent = subscriptionRef
18071637 , switchSubscribedWeakSelf = weakSelf
18081638#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1639+ , switchSubscribedNodeId = unsafeNodeId s
18101640#endif
18111641 }
18121642 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1681,6 @@ getCoincidenceSubscribed c sub = do
18511681 scheduleClear innerSubdRef
18521682 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531683 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571684 let subscribed = CoincidenceSubscribed
18581685 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591686 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1691,7 @@ getCoincidenceSubscribed c sub = do
18641691 , coincidenceSubscribedInnerParent = innerSubdRef
18651692 , coincidenceSubscribedWeakSelf = weakSelf
18661693#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1694+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681695#endif
18691696 }
18701697 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1884,22 +1711,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
18841711{-# INLINE mergeG #-}
18851712mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
18861713 => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1714+ -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
18881715mergeG nt d = cacheEvent (mergeCheap nt d)
18891716
18901717{-# INLINE mergeWithMove #-}
18911718mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
18921719 => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1720+ -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
18941721mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
18951722
18961723{-# INLINE [1] mergeCheap #-}
18971724mergeCheap
18981725 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
18991726 => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1727+ -> Dynamic x (PatchDMap k q)
19011728 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1729+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031730 where
19041731 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051732 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1741,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141741 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151742 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161743 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1744+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201745 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211746 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221747 foldM f ([], oldParents) $ DMap.toList p
@@ -1939,9 +1764,9 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19391764{-# INLINE [1] mergeCheapWithMove #-}
19401765mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411766 => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1767+ -> Dynamic x (PatchDMapWithMove k q)
19431768 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1769+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451770 where
19461771 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471772 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1785,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601785 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611786 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621787 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1788+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661789 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671790 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681791 Just toKey -> do
19691792 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701793 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1794+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741795 return (toDelete, applyAlways p' oldParents)
19751796 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761797 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1816,6 @@ type MergeUpdateFunc k v x p s
19951816 -> p
19961817 -> EventM x ([EventSubscription x], DMap k s)
19971818
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001819type MergeInitFunc k v q x s
20011820 = DMap k q
20021821 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1839,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201839invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211840invalidateMergeHeight' heightRef sub = do
20221841 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
1842+ 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
20251843 writeIORef heightRef $! invalidHeight
20261844 subscriberInvalidateHeight sub oldHeight
20271845
20281846revalidateMergeHeight :: Merge x k v s -> IO ()
20291847revalidateMergeHeight m = do
20301848 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
1849+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341850 heights <- readIORef $ _merge_heightBagRef m
20351851 parents <- readIORef $ _merge_parentsRef m
20361852 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1854,7 @@ revalidateMergeHeight m = do
20381854 LT -> return ()
20391855 EQ -> do
20401856 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1857+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421858 writeIORef (_merge_heightRef m) $! height
20431859 subscriberRecalculateHeight (_merge_sub m) height
20441860 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1862,36 @@ revalidateMergeHeight m = do
20461862scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471863scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481864 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
1865+ 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
20521866 --TODO: Assert that m is not empty
20531867 subscriberPropagate (_merge_sub m) vals
20541868
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
1869+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1870+mergeSubscriber m getKey = Subscriber
20781871 { subscriberPropagate = \a -> do
20791872 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801873 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1874+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821875 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831876 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841877 when (DMap.null oldM) $ do -- Only schedule the firing once
20851878 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1879+ --TODO: assertions about height
1880+ currentHeight <- getCurrentHeight
1881+ when (height <= currentHeight) $ do
1882+ if height /= invalidHeight
1883+ then do
1884+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1885+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1886+ else liftIO $ do
1887+#ifdef DEBUG_CYCLES
1888+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1889+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1890+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1891+#else
1892+ let cycleInfo = ""
1893+#endif
1894+ error $ "Causality loop found" <> cycleInfo
20881895 scheduleMergeSelf m height
20891896 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901897 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1902,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951902 }
20961903
20971904--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)
1905+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1906+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001907 where updateMe = do
21011908 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1909+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031910 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041911 return subscriptionsToKill
21051912
21061913{-# INLINE mergeGCheap' #-}
21071914mergeGCheap' :: 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
1915+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
1916+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101917 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111918 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121919 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131920 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141921 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
1922+ let m = Merge
21301923 { _merge_parentsRef = parentsRef
21311924 , _merge_heightBagRef = heightBagRef
21321925 , _merge_heightRef = heightRef
21331926 , _merge_sub = sub
21341927 , _merge_accumRef = accumRef
21351928 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1929+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371930 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381931 myHeight = if invalidHeight `elem` heights
21391932 then invalidHeight
@@ -2142,57 +1935,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421935 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431936 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441937 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1938+ unless (DMap.null accum) $ do
1939+ scheduleMergeSelf m myHeight
21461940 liftIO $ writeIORef accumRef $! accum
21471941 liftIO $ writeIORef heightRef $! myHeight
21481942 liftIO $ writeIORef heightBagRef $! myHeightBag
1943+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491944 liftIO $ writeIORef parentsRef $! initialParentState
21501945 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1946+ let s = Subscriber
21521947 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1948+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1949+ defer $ updateMerge m updateFunc a
21551950 , subscriberInvalidateHeight = \_ -> return ()
21561951 , subscriberRecalculateHeight = \_ -> return ()
21571952 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1953+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1954+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601955 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611956 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621957 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1958+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641959 let unsubscribeAll = destroy =<< readIORef parentsRef
1960+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1961+ , occ
1962+ )
21651963
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)
1964+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701965mergeInt = cacheEvent . mergeIntCheap
21711966
21721967{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1968+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741969mergeIntCheap d = Event $ \sub -> do
21751970 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761971 accum <- liftIO $ FastMutableIntMap.newEmpty
21771972 heightRef <- liftIO $ newIORef zeroHeight
21781973 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791974 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− }
21901975 let scheduleSelf = do
21911976 height <- liftIO $ readIORef $ heightRef
21921977 scheduleMerge' height heightRef $ do
21931978 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941979 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1980+ invalidateMyHeight = do
1981+ invalidateMergeHeight' heightRef sub
21961982 recalculateMyHeight = do
21971983 currentHeight <- readIORef heightRef
21981984 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 +1988,12 @@ mergeIntCheap d = Event $ \sub -> do
22021988 LT -> return ()
22031989 EQ -> do
22041990 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1991+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061992 writeIORef heightRef $! height
22071993 subscriberRecalculateHeight sub height
22081994 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091995 mySubscriber k = Subscriber
22101996 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131997 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141998 liftIO $ FastMutableIntMap.insert accum k a
22151999 when wasEmpty scheduleSelf
@@ -2243,6 +2027,7 @@ mergeIntCheap d = Event $ \sub -> do
22432027 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442028 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452029 return Nothing
2030+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462031 defer $ SomeMergeInit $ do
22472032 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482033 where
@@ -2256,39 +2041,35 @@ mergeIntCheap d = Event $ \sub -> do
22562041 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572042 liftIO $ for_ oldParents $ \oldParent -> do
22582043 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612044 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622045 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2046+ let s = Subscriber
22642047 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652048 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662049 defer $ updateMe a
22672050 , subscriberInvalidateHeight = \_ -> return ()
22682051 , subscriberRecalculateHeight = \_ -> return ()
22692052 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2053+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712054 forM_ change $ \c -> defer $ updateMe c
22722055 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732056 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742057 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2058+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762059 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2060+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2061+ , occ
2062+ )
22802063
22812064newtype 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) }
22832065
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2066+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2067+fan e =
22872068 let f = Fan
22882069 { fanParent = e
2289− , fanSubscribed = ref
2070+ , fanSubscribed = unsafeNewIORef e Nothing
22902071 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2072+ in EventSelector $ \k -> eventFan k f
22922073
22932074runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942075runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2123,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422123-- | Run an event action outside of a frame
23432124runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442125runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2126+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462127 let go = do
23472128 result <- a
23482129 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
@@ -2359,19 +2140,19 @@ runFrame a = SpiderHost $ do
23592140 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602141 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612142 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2143+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632144 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642145 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652146 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2147+ when debugPropagate $ putStrLn "Updating merges"
23672148 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2149+ when debugPropagate $ putStrLn "Updating merges done"
23692150 toReconnect <- readIORef toReconnectRef
23702151 clearEventEnv env
23712152 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722153 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732154 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2155+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752156 finalize wi
23762157 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772158 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2166,7 @@ runFrame a = SpiderHost $ do
23852166 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
23862167 {-
23872168 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2169+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892170 EventRoot _ -> "EventRoot"
23902171 EventNever -> "EventNever"
23912172 _ -> "something else"
@@ -2400,7 +2181,7 @@ runFrame a = SpiderHost $ do
24002181 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012182 when (parentHeight /= myHeight) $ do
24022183 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2184+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042185 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
24052186 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062187 unsubscribe subscription
@@ -2441,7 +2222,7 @@ invalidateCoincidenceHeight subscribed = do
24412222 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422223 when (oldHeight /= invalidHeight) $ do
24432224 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2225+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452226
24462227updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472228updateSwitchHeight new subscribed = do
@@ -2449,7 +2230,7 @@ updateSwitchHeight new subscribed = do
24492230 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502231 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512232 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2233+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532234
24542235recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552236recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2239,7 @@ recalculateCoincidenceHeight subscribed = do
24582239 height <- calculateCoincidenceHeight subscribed
24592240 when (height /= invalidHeight) $ do
24602241 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2242+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622243
24632244calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642245calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2301,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202301 {-# INLINABLE headE #-}
25212302 headE = R.slowHeadE
25222303-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252304
25262305instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272306 {-# INLINABLE sample #-}
@@ -2543,9 +2322,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432322 {-# INLINABLE headE #-}
25442323 headE = R.slowHeadE
25452324-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492325
25502326instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512327 {-# INLINE return #-}
@@ -2554,13 +2330,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542330 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552331 {-# INLINE (>>) #-}
25562332 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582333 {-# INLINE fail #-}
25592334 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612335
25622336{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2337+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642338newJoinDyn d =
25652339 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662340 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2383,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092383 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102384 {-# INLINABLE headE #-}
26112385 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152386
26162387instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172388 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2399,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282399 {-# INLINABLE headE #-}
26292400 headE = R.slowHeadE
26302401-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332402
26342403instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352404 {-# INLINABLE sample #-}
@@ -2650,8 +2419,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502419 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512420 {-# INLINABLE headE #-}
26522421 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552422
26562423--------------------------------------------------------------------------------
26572424-- Deprecated items
@@ -2689,13 +2456,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892456 touch h
26902457 return result
26912458
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2459+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932460 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942461 newFanEventWithTrigger f = SpiderHost $ do
26952462 es <- newFanEventWithTriggerIO f
26962463 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972464
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2465+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992466 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002467 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012468 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2484,7 @@ unsafeNewSpiderTimelineEnv = do
27172484#ifdef DEBUG
27182485 depthRef <- newIORef 0
27192486#endif
2720− return $ STE $ SpiderTimelineEnv
2487+ return $ SpiderTimelineEnv
27212488 { _spiderTimeline_lock = lock
27222489 , _spiderTimeline_eventEnv = env
27232490#ifdef DEBUG
@@ -2733,13 +2500,13 @@ data LocalSpiderTimeline (x :: Type) s
27332500
27342501instance Reifies s (SpiderTimelineEnv x) =>
27352502 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2503+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372504
27382505localSpiderTimeline
2739− :: proxy s
2506+ :: Proxy s
27402507 -> SpiderTimelineEnv x
27412508 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2509+localSpiderTimeline _ = unsafeCoerce
27432510
27442511-- | Pass a new timeline to the given function.
27452512withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2757,8 +2524,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572524 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582525 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592526 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 }
2527+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2528+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622529 type PullM (SpiderTimeline x) = SpiderPullM x
27632530 type PushM (SpiderTimeline x) = SpiderPushM x
27642531 {-# INLINABLE never #-}
@@ -2771,15 +2538,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712538 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722539 {-# INLINABLE pull #-}
27732540 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762541 {-# INLINABLE mergeG #-}
27772542 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2543+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792544 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802545 -> DMap k q
27812546 -> R.Event (SpiderTimeline x) (DMap k v)
27822547 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2548+ {-# INLINABLE fan #-}
2549+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832550 {-# INLINABLE switch #-}
27842551 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852552 {-# INLINABLE coincidence #-}
@@ -2787,7 +2554,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872554 {-# INLINABLE current #-}
27882555 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892556 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2557+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912558 {-# INLINABLE unsafeBuildDynamic #-}
27922559 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932560 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2806,10 +2573,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062573 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072574 eventCoercion Coercion = Coercion
28082575 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2576+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112577 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2578+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132579 {-# INLINABLE fanInt #-}
28142580 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152581
@@ -2843,14 +2609,8 @@ instance Monad (SpiderHost x) where
28432609 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442610 {-# INLINABLE return #-}
28452611 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472612 {-# 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
2613+ fail s = SpiderHost $ fail s
28542614
28552615-- | Run an action affecting the global Spider timeline; this will be guarded by
28562616-- a mutex for that timeline
@@ -2872,21 +2632,19 @@ instance Monad (SpiderHostFrame x) where
28722632 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732633 {-# INLINABLE return #-}
28742634 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762635 {-# INLINABLE fail #-}
28772636 fail s = SpiderHostFrame $ fail s
2878−#endif
28792637
28802638instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812639 notReadyUntil _ = pure ()
28822640 notReady = pure ()
28832641
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2642+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852643newEventWithTriggerIO f = do
28862644 es <- newFanEventWithTriggerIO $ \Refl -> f
28872645 return $ select es Refl
28882646
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2647+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902648newFanEventWithTriggerIO f = do
28912649 occRef <- newIORef DMap.empty
28922650 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2678,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202678instance PrimMonad (SpiderHostFrame x) where
29212679 type PrimState (SpiderHostFrame x) = PrimState IO
29222680 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 ()