@@ -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,10 +17,7 @@
1617{-# LANGUAGE TypeOperators #-}
1718{-# LANGUAGE UndecidableInstances #-}
1819{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
2120{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
2321
2422#ifdef USE_REFLEX_OPTIMIZER
2523{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +36,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3836import Control.Monad.Exception
3937import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4038import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
39+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4440import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4741import Data.Align
4842import Data.Coerce
49−import Data.Dependent.Map (DMap)
43+import Data.Dependent.Map (DMap, DSum (..))
5044import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5245import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5346import qualified Data.FastMutableIntMap as FastMutableIntMap
5447import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +54,12 @@ import qualified Data.IntMap.Strict as IntMap
6154import Data.IORef
6255import Data.Kind (Type)
6356import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
57+import Data.Monoid ((<>))
6558import Data.Proxy
6659import Data.These
6760import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6961import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
62+import GHC.Exts
7163import GHC.IORef (IORef (..))
7264import GHC.Stack
7365import Reflex.FastWeak
@@ -75,27 +67,22 @@ import System.IO.Unsafe
7567import System.Mem.Weak
7668import Unsafe.Coerce
7769
78−#ifdef MIN_VERSION_semialign
70+#if defined(MIN_VERSION_semialign)
7971#if MIN_VERSION_these(0,8,0)
8072import Data.These.Combinators (justThese)
8173#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
8574#endif
8675
8776#ifdef DEBUG_CYCLES
8877import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9178import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9279import qualified Data.List.NonEmpty as NonEmpty
80+import Data.Monoid (mempty)
9381import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
82+#endif
9583
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
84+import Data.FastWeakBag (FastWeakBag)
9785import qualified Data.FastWeakBag as FastWeakBag
98−
9986import Data.Reflection
10087import Data.Some (Some(Some))
10188import Data.Type.Coercion
@@ -106,26 +93,20 @@ import qualified Reflex.Class
10693import qualified Reflex.Class as R
10794import qualified Reflex.Host.Class
10895import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
96+import Reflex.Patch
97+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11298
11399#ifdef DEBUG_TRACE_EVENTS
114100import qualified Data.ByteString.Char8 as BS8
115101import System.IO (stderr)
116−import Data.List (isPrefixOf)
117102#endif
118103
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123104#ifdef DEBUG_TRACE_EVENTS
105+
124106withStackOneLine :: (BS8.ByteString -> a) -> a
125107withStackOneLine expr = unsafePerformIO $ do
126108 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
109+ return (expr (BS8.pack (unwords (reverse stack))))
129110
130111#endif
131112
@@ -136,42 +117,28 @@ debugInvalidateHeight :: Bool
136117debugInvalidate :: Bool
137118
138119#ifdef DEBUG
120+
139121#define DEBUG_NODEIDS
140122
141−#ifdef DEBUG_TRACE_PROPAGATION
142123debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146124
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150125debugInvalidateHeight = False
151−#endif
152126
153−#ifdef DEBUG_TRACE_INVALIDATION
154127debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158128
159129class HasNodeId a where
160130 getNodeId :: a -> Int
161131
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
132+instance HasNodeId (Hold x p a) where
169133 getNodeId = holdNodeId
170134
135+instance HasNodeId (PushSubscribed x a b) where
136+ getNodeId = pushSubscribedNodeId
137+
171138instance HasNodeId (SwitchSubscribed x a) where
172139 getNodeId = switchSubscribedNodeId
173140
174−instance HasNodeId (FanSubscribed x v a) where
141+instance HasNodeId (FanSubscribed x a) where
175142 getNodeId = fanSubscribedNodeId
176143
177144instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +152,41 @@ instance HasNodeId (Pull x a) where
185152
186153{-# INLINE showNodeId #-}
187154showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
155+showNodeId = ("#"<>) . show . getNodeId
156+
157+showSubscriberType :: Subscriber x a -> String
158+showSubscriberType = \case
159+ SubscriberPush _ _ -> "SubscriberPush"
160+ SubscriberMerge _ _ -> "SubscriberMerge"
161+ SubscriberFan _ -> "SubscriberFan"
162+ SubscriberMergeChange _ -> "SubscriberMergeChange"
163+ SubscriberHold _ -> "SubscriberHold"
164+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
165+ SubscriberSwitch _ -> "SubscriberSwitch"
166+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
167+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
168+ SubscriberHandle -> "SubscriberHandle"
169+
170+showEventType :: Event x a -> String
171+showEventType = \case
172+ EventRoot _ _ -> "EventRoot"
173+ EventNever -> "EventNever"
174+ EventPush _ -> "EventPush"
175+ EventMerge _ -> "EventMerge"
176+ EventFan _ _ -> "EventFan"
177+ EventSwitch _ -> "EventSwitch"
178+ EventCoincidence _ -> "EventCoincidence"
179+ EventHold _ -> "EventHold"
180+ EventDyn _ -> "EventDyn"
181+ EventHoldIdentity _ -> "EventHoldIdentity"
182+ EventDynIdentity _ -> "EventDynIdentity"
193183
194184#else
195185
196186debugPropagate = False
187+
197188debugInvalidateHeight = False
189+
198190debugInvalidate = False
199191
200192-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +194,6 @@ debugInvalidate = False
202194showNodeId :: a -> String
203195showNodeId _ = ""
204196
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209197#endif
210198
211199#ifdef DEBUG_NODEIDS
@@ -251,9 +239,9 @@ subscribeAndRead = unEvent
251239-- caching; if the computation function is very cheap, this is (much) more
252240-- efficient than 'push'
253241{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
242+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255243pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
244+ (subscription, occ) <- subscribeAndRead e $ sub
257245 { subscriberPropagate = \a -> do
258246 mb <- f a
259247 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +260,10 @@ terminalSubscriber p = Subscriber
272260
273261-- | Subscribe to an Event only for the duration of one occurrence
274262{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
263+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276264subscribeAndReadHead e sub = do
277265 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
266+ (subscription, occ) <- subscribeAndRead e $ sub
279267 { subscriberPropagate = \a -> do
280268 liftIO $ unsubscribe =<< readIORef subscriptionRef
281269 subscriberPropagate sub a
@@ -286,42 +274,24 @@ subscribeAndReadHead e sub = do
286274 return (subscription, occ)
287275
288276--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)
277+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290278headE originalE = do
291279 parent <- liftIO $ newIORef $ Just originalE
292280 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293281 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
282+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295283 when (isJust occ) clearParent
296− return $ Event $ \sub ->
284+ return $ Event $ \sub -> do
297285 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
286+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299287 Just e -> subscribeAndReadHead e sub
300288
301289data CacheSubscribed x a
302290 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303291 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304292 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308293 }
309294
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−
325295-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326296-- repeatedly
327297--
@@ -346,23 +316,18 @@ cacheEvent e =
346316 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347317 Just subscribedTicket -> return subscribedTicket
348318 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352319 subscribers <- liftIO FastWeakBag.empty
353320 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
357321 (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− }
322+ { subscriberPropagate = \a -> do
323+ liftIO $ writeIORef occRef $ Just a
324+ scheduleClear occRef
325+ propagateFast a subscribers
326+ , subscriberInvalidateHeight = \old -> do
327+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
328+ , subscriberRecalculateHeight = \new -> do
329+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
330+ }
366331 when (isJust occ) $ do
367332 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368333 scheduleClear occRef
@@ -370,45 +335,29 @@ cacheEvent e =
370335 { _cacheSubscribed_subscribers = subscribers
371336 , _cacheSubscribed_parent = parentSub
372337 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376338 }
377339 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378340 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379341 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−
342+ liftIO $ do
343+ subscribed <- getFastWeakTicketValue subscribedTicket
344+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
345+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
346+ let es = EventSubscription
347+ { _eventSubscription_unsubscribe = do
348+ FastWeakBag.remove ticket
349+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
350+ when isEmpty $ do
351+ writeIORef mSubscribedRef emptyFastWeak
352+ unsubscribe $ _cacheSubscribed_parent subscribed
353+ touch ticket
354+ touch subscribedTicket
355+ , _eventSubscription_subscribed = EventSubscribed
356+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
357+ , eventSubscribedRetained = toAny subscribedTicket
358+ }
359+ }
360+ return (es, occ)
412361
413362subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414363subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +369,11 @@ wrap tag getSpecificSubscribed sub = do
420369 let es = tag subd
421370 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422371
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
372+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424373eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425374
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429375eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
376+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431377
432378eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433379eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +410,16 @@ data Subscriber x a = Subscriber
464410 , subscriberRecalculateHeight :: !(Height -> IO ())
465411 }
466412
413+--TODO: Move this comment to WeakBag
414+-- These function are constructor functions that are marked NOINLINE so they are
415+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
416+-- so any weak references that are attached to the constructors will have their
417+-- finalizer run. Using the opaque constructor, does not see the
418+-- constructor application, so it behaves like an IORef and cannot be fused away.
419+--
420+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
421+-- the weak pointer to it in some cases.
422+
467423newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468424newSubscriberHold h = return $ Subscriber
469425 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +428,10 @@ newSubscriberHold h = return $ Subscriber
472428 }
473429
474430newSubscriberFan :: 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
431+newSubscriberFan subscribed = return $ Subscriber
476432 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477433 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
434+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479435 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480436 scheduleClear $ fanSubscribedOccurrence subscribed
481437 let f _ (Pair v subsubs) = do
@@ -484,55 +440,72 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484440 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485441 return ()
486442 , subscriberInvalidateHeight = \old -> do
443+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
445+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489447 , subscriberRecalculateHeight = \new -> do
448+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490449 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
450+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492452 }
493453
494454newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
455+newSubscriberSwitch subscribed = return $ Subscriber
496456 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
457+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497458 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498459 scheduleClear $ switchSubscribedOccurrence subscribed
499460 propagate a $ switchSubscribedSubscribers subscribed
500461 , subscriberInvalidateHeight = \_ -> do
462+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501463 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502464 when (oldHeight /= invalidHeight) $ do
503465 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
466+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
467+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
468+ , subscriberRecalculateHeight = \new -> do
469+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
470+ updateSwitchHeight new subscribed
471+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
472+ }
507473
508474newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
475+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510476 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
477+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511478 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512479 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513480 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514481 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515482 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517483 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518484 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519485 case occ of
520− Nothing ->
486+ Nothing -> do
521487 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522488 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
489+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
490+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525491 Just o -> do -- Since it's already firing, no need to adjust height
526492 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527493 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528494 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
495+ , subscriberInvalidateHeight = \_ -> do
496+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
497+ invalidateCoincidenceHeight subscribed
498+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
499+ , subscriberRecalculateHeight = \_ -> do
500+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
501+ recalculateCoincidenceHeight subscribed
502+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531503 }
532504
533505newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
506+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535507 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
508+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536509 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537510 case occ of
538511 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +513,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540513 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541514 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542515 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
516+ , subscriberInvalidateHeight = \_ -> do
517+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
518+ invalidateCoincidenceHeight subscribed
519+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
520+ , subscriberRecalculateHeight = \_ -> do
521+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
522+ recalculateCoincidenceHeight subscribed
523+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545524 }
546525
547526invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +530,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551530recalculateSubscriberHeight = flip subscriberRecalculateHeight
552531
553532-- | 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) $
533+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
534+propagate a subscribers = withIncreasedDepth $ do
556535 -- 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
557536 --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
537+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559538
560539-- | 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) $
540+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
541+propagateFast a subscribers = withIncreasedDepth $ do
563542 -- 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
564543 --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
544+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566545
567546--------------------------------------------------------------------------------
568547-- EventSubscribed
@@ -571,16 +550,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571550toAny :: a -> Any
572551toAny = unsafeCoerce
573552
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.
579553data EventSubscribed x = EventSubscribed
580554 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581555 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582556#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
557+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584558 , eventSubscribedHasOwnHeightRef :: !Bool
585559 , eventSubscribedWhoCreated :: !(IO [String])
586560#endif
@@ -607,23 +581,13 @@ eventSubscribedNever = EventSubscribed
607581 , eventSubscribedWhoCreated = return ["never"]
608582#endif
609583 }
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− }
620584
621585eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622586eventSubscribedFan !subscribed = EventSubscribed
623587 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624588 , eventSubscribedRetained = toAny subscribed
625589#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
590+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627591 , eventSubscribedHasOwnHeightRef = False
628592 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629593#endif
@@ -636,7 +600,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636600#ifdef DEBUG_CYCLES
637601 , eventSubscribedGetParents = do
638602 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
603+ return [Some $ _eventSubscription_subscribed s]
640604 , eventSubscribedHasOwnHeightRef = True
641605 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642606#endif
@@ -649,8 +613,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649613#ifdef DEBUG_CYCLES
650614 , eventSubscribedGetParents = do
651615 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
616+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
617+ innerParents = maybeToList $ fmap Some innerSubscription
654618 return $ outerParent : innerParents
655619 , eventSubscribedHasOwnHeightRef = True
656620 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +628,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664628whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665629whoCreatedEventSubscribed = eventSubscribedWhoCreated
666630
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
631+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668632walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
633+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670634 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671635 when (h == invalidHeight) $ do
672636 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
637+ modify (Some s :)
674638 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
639+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676640 return subscribers
677641#endif
678642
@@ -709,7 +673,7 @@ behaviorPull !p = Behavior $ do
709673 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710674 parentsRef <- liftIO $ newIORef []
711675 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
676+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713677 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714678 parents <- liftIO $ readIORef parentsRef
715679 let subscribed = PullSubscribed
@@ -744,46 +708,42 @@ readBehaviorUntracked b = do
744708-- Dynamic
745709--------------------------------------------------------------------------------
746710
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
711+data Dynamic x p = Dynamic
712+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751713 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752714 }
753715
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
716+dynamicHold :: Hold x p -> Dynamic x p
760717dynamicHold !h = Dynamic
761718 { dynamicCurrent = behaviorHold h
762719 , dynamicUpdated = eventHold h
763720 }
764721
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
722+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766723dynamicHoldIdentity = dynamicHold
767724
768−dynamicConst :: PatchTarget p -> DynamicS x p
725+dynamicConst :: PatchTarget p -> Dynamic x p
769726dynamicConst !a = Dynamic
770727 { dynamicCurrent = behaviorConst a
771728 , dynamicUpdated = eventNever
772729 }
773730
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
731+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775732dynamicDyn !d = Dynamic
776733 { dynamicCurrent = behaviorDyn d
777734 , dynamicUpdated = eventDyn d
778735 }
779736
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
737+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781738dynamicDynIdentity = dynamicDyn
782739
783740--------------------------------------------------------------------------------
784741-- Combinators
785742--------------------------------------------------------------------------------
786743
744+--TODO: Figure out why certain things are not 'representational', then make them
745+--representational so we can use coerce
746+
787747--type role Hold representational
788748data Hold x p
789749 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +764,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804764
805765-- | Stores all global data relevant to a particular Spider timeline; only one
806766-- 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
767+data SpiderTimelineEnv x = SpiderTimelineEnv
813768 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814769 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815770#ifdef DEBUG
816771 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817772#endif
818773 }
819−type role SpiderTimelineEnv' phantom
774+type role SpiderTimelineEnv nominal
820775
821776instance Eq (SpiderTimelineEnv x) where
822777 _ == _ = True -- Since only one exists of each type
823778
824779instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
780+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826781 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827782 else Nothing
828783
@@ -845,7 +800,7 @@ runEventM :: EventM x a -> IO a
845800runEventM = unEventM
846801
847802asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
803+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849804
850805class MonadIO m => Defer a m where
851806 getDeferralQueue :: m (IORef [a])
@@ -983,9 +938,9 @@ getHoldEventSubscription h = do
983938
984939type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985940
941+--type role BehaviorM representational
986942-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
943+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989944
990945instance Monad (BehaviorM x) where
991946 {-# INLINE (>>=) #-}
@@ -994,10 +949,8 @@ instance Monad (BehaviorM x) where
994949 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995950 {-# INLINE return #-}
996951 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998952 {-# INLINE fail #-}
999953 fail s = BehaviorM $ fail s
1000−#endif
1001954
1002955data BehaviorSubscribed x a
1003956 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +1010,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571010newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581011
10591012-- 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)
1013+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
10611014
10621015newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631016
@@ -1082,8 +1035,7 @@ heightBagFromList :: [Height] -> HeightBag
10821035heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831036
10841037heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1038+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871039
10881040heightBagRemove :: Height -> HeightBag -> HeightBag
10891041heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1044,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921044 0 -> IntMap.delete h c
10931045 _ -> IntMap.insert h (pred old) c
10941046
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−
11021047heightBagMax :: HeightBag -> Height
11031048heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041049 Just ((h, _), _) -> Height h
@@ -1199,10 +1144,7 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991144 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001145 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011146
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1147+#if defined(MIN_VERSION_semialign)
12061148 zip x y = mapMaybe justThese $ align x y
12071149#endif
12081150
@@ -1212,11 +1154,11 @@ data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12121154
12131155newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
12141156
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1157+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161158newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171159
12181160--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)
1161+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201162zipDynWith f da db =
12211163 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221164 ec = flip push eab $ \o -> do
@@ -1292,7 +1234,7 @@ run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> Res
12921234run roots after = do
12931235 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941236 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1237+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961238 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971239 occBefore <- liftIO $ do
12981240 occBefore <- readIORef occRef
@@ -1346,110 +1288,55 @@ mkWeakPtrWithDebug x debugNote = do
13461288 x' <- evaluate x
13471289 mkWeakPtr x' $
13481290 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1291+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501292 else Nothing
13511293
13521294type WeakList a = [Weak a]
13531295
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−
13811296{-# 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
1297+#ifdef DEBUG
1298+withIncreasedDepth :: CanTrace x m => m a -> m a
1299+withIncreasedDepth a = do
1300+ spiderTimeline <- askSpiderTimelineEnv
1301+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851302 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1303+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871304 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−
14121305#else
1306+withIncreasedDepth :: m a -> m a
1307+withIncreasedDepth = id
1308+#endif
14131309
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1310+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171311
14181312{-# INLINE tracePropagate #-}
14191313tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1314+tracePropagate p = traceWhen p debugPropagate
14211315
14221316{-# INLINE traceInvalidate #-}
14231317traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1318+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14291319
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1320+{-# INLINE traceWhen #-}
1321+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1322+traceWhen p b message = traceMWhen p b $ return message
14471323
1324+{-# INLINE traceMWhen #-}
1325+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1326+traceMWhen _ b getMessage = when b $ do
1327+ message <- getMessage
1328+#ifdef DEBUG
1329+ spiderTimeline <- askSpiderTimelineEnv
1330+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1331+#else
1332+ let d = 0
14481333#endif
1334+ liftIO $ putStrLn $ replicate d ' ' <> message
14491335
14501336whoCreatedIORef :: IORef a -> IO [String]
14511337whoCreatedIORef (IORef a) = whoCreated $! a
14521338
1339+#ifdef DEBUG_CYCLES
14531340groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541341groupByHead = \case
14551342 [] -> []
@@ -1460,54 +1347,20 @@ groupByHead = \case
14601347 | otherwise -> (x, xs :| []) : l
14611348
14621349listsToForest :: 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
1350+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741351#endif
14751352
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−
14981353{-# INLINE propagateSubscriberHold #-}
14991354propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001355propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1356+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021357 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031358 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051359 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061360 case {-# SCC "apply" #-} apply a v of
15071361 Nothing -> return ()
15081362 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1363+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111364 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121365 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131366 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1368,25 @@ propagateSubscriberHold h a = do
15151368data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161369
15171370runBehaviorM :: 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)
1371+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191372
15201373askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211374askInvalidator = do
1522− (!m, _) <- ask
1375+ (!m, _) <- BehaviorM ask
15231376 case m of
15241377 Nothing -> return Nothing
15251378 Just (!wi, _) -> return $ Just wi
15261379
15271380askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281381askParentsRef = do
1529− (!m, _) <- ask
1382+ (!m, _) <- BehaviorM ask
15301383 case m of
15311384 Nothing -> return Nothing
15321385 Just (_, !p) -> return $ Just p
15331386
15341387askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351388askBehaviorHoldInits = do
1536− (_, !his) <- ask
1389+ (_, !his) <- BehaviorM ask
15371390 return his
15381391
15391392{-# INLINE getDynHold #-}
@@ -1561,7 +1414,7 @@ getDynHold d = do
15611414zeroRef :: IORef Height
15621415zeroRef = unsafePerformIO $ newIORef zeroHeight
15631416
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)
1417+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651418getRootSubscribed k r sub = do
15661419 mSubscribed <- readIORef $ rootSubscribed r
15671420 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1428,7 @@ getRootSubscribed k r sub = do
15751428 let !cached = rootSubscribed r
15761429 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771430 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1431+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811432 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821433 writeIORef uninitRef $! uninit
15831434#ifdef DEBUG_NODEIDS
@@ -1627,9 +1478,6 @@ data FanInt x a = FanInt
16271478 { _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
16281479 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291480 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331481 }
16341482
16351483newFanInt :: IO (FanInt x a)
@@ -1637,16 +1485,10 @@ newFanInt = do
16371485 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
16381486 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391487 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431488 return $ FanInt
16441489 { _fanInt_subscribers = subscribers
16451490 , _fanInt_subscriptionRef = subscriptionRef
16461491 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501492 }
16511493
16521494fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1497,20 @@ fanInt p = unsafePerformIO $ do
16551497 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
16561498 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571499 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
1500+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601501 { subscriberPropagate = \m -> do
16611502 liftIO $ writeIORef (_fanInt_occRef self) m
16621503 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 ->
1504+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1505+ FastWeakBag.traverse b $ \s -> do
16651506 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1507+ , subscriberInvalidateHeight = \old -> do
1508+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1509+ FastWeakBag.traverse b $ \s -> do
16691510 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1511+ , subscriberRecalculateHeight = \new -> do
1512+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1513+ FastWeakBag.traverse b $ \s -> do
16731514 subscriberRecalculateHeight s new
16741515 }
16751516 liftIO $ do
@@ -1683,25 +1524,10 @@ fanInt p = unsafePerformIO $ do
16831524 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841525 return b
16851526 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1527+ t <- liftIO $ FastWeakBag.insert sub b
16871528 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−
1529+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1530+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051531
17061532{-# INLINABLE getFanSubscribed #-}
17071533getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1884,22 +1710,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
18841710{-# INLINE mergeG #-}
18851711mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
18861712 => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1713+ -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
18881714mergeG nt d = cacheEvent (mergeCheap nt d)
18891715
18901716{-# INLINE mergeWithMove #-}
18911717mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
18921718 => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1719+ -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
18941720mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
18951721
18961722{-# INLINE [1] mergeCheap #-}
18971723mergeCheap
18981724 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
18991725 => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1726+ -> Dynamic x (PatchDMap k q)
19011727 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1728+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031729 where
19041730 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051731 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1740,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141740 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151741 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161742 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1743+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201744 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211745 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221746 foldM f ([], oldParents) $ DMap.toList p
@@ -1939,9 +1763,9 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19391763{-# INLINE [1] mergeCheapWithMove #-}
19401764mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411765 => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1766+ -> Dynamic x (PatchDMapWithMove k q)
19431767 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1768+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451769 where
19461770 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471771 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1784,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601784 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611785 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621786 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1787+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661788 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671789 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681790 Just toKey -> do
19691791 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701792 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1793+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741794 return (toDelete, applyAlways p' oldParents)
19751795 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761796 getInitialSubscribers initialParents subscriber = do
@@ -1995,8 +1815,6 @@ type MergeUpdateFunc k v x p s
19951815 -> p
19961816 -> EventM x ([EventSubscription x], DMap k s)
19971817
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001818type MergeInitFunc k v q x s
20011819 = DMap k q
20021820 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1838,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201838invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211839invalidateMergeHeight' heightRef sub = do
20221840 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
1841+ 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
20251842 writeIORef heightRef $! invalidHeight
20261843 subscriberInvalidateHeight sub oldHeight
20271844
20281845revalidateMergeHeight :: Merge x k v s -> IO ()
20291846revalidateMergeHeight m = do
20301847 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
1848+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341849 heights <- readIORef $ _merge_heightBagRef m
20351850 parents <- readIORef $ _merge_parentsRef m
20361851 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1853,7 @@ revalidateMergeHeight m = do
20381853 LT -> return ()
20391854 EQ -> do
20401855 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1856+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421857 writeIORef (_merge_heightRef m) $! height
20431858 subscriberRecalculateHeight (_merge_sub m) height
20441859 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1861,36 @@ revalidateMergeHeight m = do
20461861scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471862scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481863 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
1864+ 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
20521865 --TODO: Assert that m is not empty
20531866 subscriberPropagate (_merge_sub m) vals
20541867
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
1868+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1869+mergeSubscriber m getKey = Subscriber
20781870 { subscriberPropagate = \a -> do
20791871 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801872 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1873+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821874 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831875 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841876 when (DMap.null oldM) $ do -- Only schedule the firing once
20851877 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1878+ --TODO: assertions about height
1879+ currentHeight <- getCurrentHeight
1880+ when (height <= currentHeight) $ do
1881+ if height /= invalidHeight
1882+ then do
1883+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1884+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1885+ else liftIO $ do
1886+#ifdef DEBUG_CYCLES
1887+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1888+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1889+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1890+#else
1891+ let cycleInfo = ""
1892+#endif
1893+ error $ "Causality loop found" <> cycleInfo
20881894 scheduleMergeSelf m height
20891895 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901896 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1901,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951901 }
20961902
20971903--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)
1904+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1905+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001906 where updateMe = do
21011907 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1908+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031909 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041910 return subscriptionsToKill
21051911
21061912{-# INLINE mergeGCheap' #-}
21071913mergeGCheap' :: 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
1914+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
1915+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101916 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111917 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121918 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131919 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141920 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
1921+ let m = Merge
21301922 { _merge_parentsRef = parentsRef
21311923 , _merge_heightBagRef = heightBagRef
21321924 , _merge_heightRef = heightRef
21331925 , _merge_sub = sub
21341926 , _merge_accumRef = accumRef
21351927 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1928+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371929 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381930 myHeight = if invalidHeight `elem` heights
21391931 then invalidHeight
@@ -2142,57 +1934,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421934 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431935 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441936 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1937+ unless (DMap.null accum) $ do
1938+ scheduleMergeSelf m myHeight
21461939 liftIO $ writeIORef accumRef $! accum
21471940 liftIO $ writeIORef heightRef $! myHeight
21481941 liftIO $ writeIORef heightBagRef $! myHeightBag
1942+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491943 liftIO $ writeIORef parentsRef $! initialParentState
21501944 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1945+ let s = Subscriber
21521946 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1947+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1948+ defer $ updateMerge m updateFunc a
21551949 , subscriberInvalidateHeight = \_ -> return ()
21561950 , subscriberRecalculateHeight = \_ -> return ()
21571951 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1952+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1953+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601954 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611955 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621956 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1957+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641958 let unsubscribeAll = destroy =<< readIORef parentsRef
1959+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1960+ , occ
1961+ )
21651962
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)
1963+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701964mergeInt = cacheEvent . mergeIntCheap
21711965
21721966{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1967+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741968mergeIntCheap d = Event $ \sub -> do
21751969 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761970 accum <- liftIO $ FastMutableIntMap.newEmpty
21771971 heightRef <- liftIO $ newIORef zeroHeight
21781972 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791973 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− }
21901974 let scheduleSelf = do
21911975 height <- liftIO $ readIORef $ heightRef
21921976 scheduleMerge' height heightRef $ do
21931977 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941978 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1979+ invalidateMyHeight = do
1980+ invalidateMergeHeight' heightRef sub
21961981 recalculateMyHeight = do
21971982 currentHeight <- readIORef heightRef
21981983 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 +1987,12 @@ mergeIntCheap d = Event $ \sub -> do
22021987 LT -> return ()
22031988 EQ -> do
22041989 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1990+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061991 writeIORef heightRef $! height
22071992 subscriberRecalculateHeight sub height
22081993 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091994 mySubscriber k = Subscriber
22101995 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131996 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141997 liftIO $ FastMutableIntMap.insert accum k a
22151998 when wasEmpty scheduleSelf
@@ -2243,6 +2026,7 @@ mergeIntCheap d = Event $ \sub -> do
22432026 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442027 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452028 return Nothing
2029+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462030 defer $ SomeMergeInit $ do
22472031 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482032 where
@@ -2256,27 +2040,25 @@ mergeIntCheap d = Event $ \sub -> do
22562040 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572041 liftIO $ for_ oldParents $ \oldParent -> do
22582042 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612043 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622044 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2045+ let s = Subscriber
22642046 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652047 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662048 defer $ updateMe a
22672049 , subscriberInvalidateHeight = \_ -> return ()
22682050 , subscriberRecalculateHeight = \_ -> return ()
22692051 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2052+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712053 forM_ change $ \c -> defer $ updateMe c
22722054 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732055 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742056 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2057+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762058 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2059+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2060+ , occ
2061+ )
22802062
22812063newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
22822064newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2342,7 +2124,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422124-- | Run an event action outside of a frame
23432125runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442126runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2127+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462128 let go = do
23472129 result <- a
23482130 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 +2141,19 @@ runFrame a = SpiderHost $ do
23592141 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602142 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612143 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2144+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632145 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642146 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652147 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2148+ when debugPropagate $ putStrLn "Updating merges"
23672149 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2150+ when debugPropagate $ putStrLn "Updating merges done"
23692151 toReconnect <- readIORef toReconnectRef
23702152 clearEventEnv env
23712153 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722154 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732155 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2156+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752157 finalize wi
23762158 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772159 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2167,7 @@ runFrame a = SpiderHost $ do
23852167 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
23862168 {-
23872169 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2170+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892171 EventRoot _ -> "EventRoot"
23902172 EventNever -> "EventNever"
23912173 _ -> "something else"
@@ -2400,7 +2182,7 @@ runFrame a = SpiderHost $ do
24002182 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012183 when (parentHeight /= myHeight) $ do
24022184 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2185+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042186 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
24052187 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062188 unsubscribe subscription
@@ -2441,7 +2223,7 @@ invalidateCoincidenceHeight subscribed = do
24412223 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422224 when (oldHeight /= invalidHeight) $ do
24432225 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2226+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452227
24462228updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472229updateSwitchHeight new subscribed = do
@@ -2449,7 +2231,7 @@ updateSwitchHeight new subscribed = do
24492231 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502232 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512233 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2234+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532235
24542236recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552237recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2240,7 @@ recalculateCoincidenceHeight subscribed = do
24582240 height <- calculateCoincidenceHeight subscribed
24592241 when (height /= invalidHeight) $ do
24602242 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2243+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622244
24632245calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642246calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2302,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202302 {-# INLINABLE headE #-}
25212303 headE = R.slowHeadE
25222304-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252305
25262306instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272307 {-# INLINABLE sample #-}
@@ -2543,9 +2323,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432323 {-# INLINABLE headE #-}
25442324 headE = R.slowHeadE
25452325-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492326
25502327instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512328 {-# INLINE return #-}
@@ -2554,13 +2331,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542331 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552332 {-# INLINE (>>) #-}
25562333 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582334 {-# INLINE fail #-}
25592335 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612336
25622337{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2338+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642339newJoinDyn d =
25652340 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662341 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2384,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092384 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102385 {-# INLINABLE headE #-}
26112386 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152387
26162388instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172389 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2400,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282400 {-# INLINABLE headE #-}
26292401 headE = R.slowHeadE
26302402-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332403
26342404instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352405 {-# INLINABLE sample #-}
@@ -2650,8 +2420,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502420 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512421 {-# INLINABLE headE #-}
26522422 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552423
26562424--------------------------------------------------------------------------------
26572425-- Deprecated items
@@ -2689,13 +2457,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892457 touch h
26902458 return result
26912459
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2460+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932461 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942462 newFanEventWithTrigger f = SpiderHost $ do
26952463 es <- newFanEventWithTriggerIO f
26962464 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972465
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2466+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992467 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002468 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012469 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2485,7 @@ unsafeNewSpiderTimelineEnv = do
27172485#ifdef DEBUG
27182486 depthRef <- newIORef 0
27192487#endif
2720− return $ STE $ SpiderTimelineEnv
2488+ return $ SpiderTimelineEnv
27212489 { _spiderTimeline_lock = lock
27222490 , _spiderTimeline_eventEnv = env
27232491#ifdef DEBUG
@@ -2733,13 +2501,13 @@ data LocalSpiderTimeline (x :: Type) s
27332501
27342502instance Reifies s (SpiderTimelineEnv x) =>
27352503 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2504+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372505
27382506localSpiderTimeline
2739− :: proxy s
2507+ :: Proxy s
27402508 -> SpiderTimelineEnv x
27412509 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2510+localSpiderTimeline _ = unsafeCoerce
27432511
27442512-- | Pass a new timeline to the given function.
27452513withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2757,8 +2525,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572525 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582526 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592527 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 }
2528+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2529+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622530 type PullM (SpiderTimeline x) = SpiderPullM x
27632531 type PushM (SpiderTimeline x) = SpiderPushM x
27642532 {-# INLINABLE never #-}
@@ -2775,7 +2543,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27752543 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762544 {-# INLINABLE mergeG #-}
27772545 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2546+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792547 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802548 -> DMap k q
27812549 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2787,7 +2555,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872555 {-# INLINABLE current #-}
27882556 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892557 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2558+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912559 {-# INLINABLE unsafeBuildDynamic #-}
27922560 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932561 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2806,10 +2574,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062574 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072575 eventCoercion Coercion = Coercion
28082576 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2577+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112578 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2579+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132580 {-# INLINABLE fanInt #-}
28142581 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152582
@@ -2843,14 +2610,8 @@ instance Monad (SpiderHost x) where
28432610 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442611 {-# INLINABLE return #-}
28452612 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472613 {-# 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
2614+ fail s = SpiderHost $ fail s
28542615
28552616-- | Run an action affecting the global Spider timeline; this will be guarded by
28562617-- a mutex for that timeline
@@ -2872,21 +2633,19 @@ instance Monad (SpiderHostFrame x) where
28722633 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732634 {-# INLINABLE return #-}
28742635 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762636 {-# INLINABLE fail #-}
28772637 fail s = SpiderHostFrame $ fail s
2878−#endif
28792638
28802639instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812640 notReadyUntil _ = pure ()
28822641 notReady = pure ()
28832642
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2643+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852644newEventWithTriggerIO f = do
28862645 es <- newFanEventWithTriggerIO $ \Refl -> f
28872646 return $ select es Refl
28882647
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2648+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902649newFanEventWithTriggerIO f = do
28912650 occRef <- newIORef DMap.empty
28922651 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2679,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202679instance PrimMonad (SpiderHostFrame x) where
29212680 type PrimState (SpiderHostFrame x) = PrimState IO
29222681 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 ()