@@ -9,22 +9,17 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
1214{-# LANGUAGE RankNTypes #-}
1315{-# LANGUAGE RoleAnnotations #-}
1416{-# LANGUAGE ScopedTypeVariables #-}
1517{-# LANGUAGE TypeFamilies #-}
1618{-# LANGUAGE TypeOperators #-}
1719{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2420#ifdef USE_REFLEX_OPTIMIZER
2521{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2622#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2823-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2924-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3025module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -38,17 +33,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3833import Control.Monad.Exception
3934import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4035import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
36+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4437import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4738import Data.Align
4839import Data.Coerce
49−import Data.Dependent.Map (DMap)
40+import Data.Dependent.Map (DMap, DSum (..))
5041import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5242import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5343import qualified Data.FastMutableIntMap as FastMutableIntMap
5444import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,15 +49,13 @@ import Data.GADT.Compare
5949import Data.IntMap.Strict (IntMap)
6050import qualified Data.IntMap.Strict as IntMap
6151import Data.IORef
62−import Data.Kind (Type)
6352import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
53+import Data.Monoid ((<>))
6554import Data.Proxy
6655import Data.These
6756import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6957import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
58+import GHC.Exts
7159import GHC.IORef (IORef (..))
7260import GHC.Stack
7361import Reflex.FastWeak
@@ -75,57 +63,39 @@ import System.IO.Unsafe
7563import System.Mem.Weak
7664import Unsafe.Coerce
7765
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
81−#endif
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
84−#endif
85−#endif
86−
8766#ifdef DEBUG_CYCLES
8867import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9168import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9269import qualified Data.List.NonEmpty as NonEmpty
70+import Data.Monoid (mempty)
9371import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
72+#endif
9573
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
74+import Data.FastWeakBag (FastWeakBag)
9775import qualified Data.FastWeakBag as FastWeakBag
98−
9976import Data.Reflection
10077import Data.Some (Some(Some))
10178import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10379import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10480import qualified Data.WeakBag as WeakBag
10581import qualified Reflex.Class
10682import qualified Reflex.Class as R
10783import qualified Reflex.Host.Class
10884import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
85+import Reflex.Patch
86+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11287
11388#ifdef DEBUG_TRACE_EVENTS
11489import qualified Data.ByteString.Char8 as BS8
11590import System.IO (stderr)
116−import Data.List (isPrefixOf)
11791#endif
11892
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12393#ifdef DEBUG_TRACE_EVENTS
94+
12495withStackOneLine :: (BS8.ByteString -> a) -> a
12596withStackOneLine expr = unsafePerformIO $ do
12697 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
98+ return (expr (BS8.pack (unwords (reverse stack))))
12999
130100#endif
131101
@@ -136,42 +106,28 @@ debugInvalidateHeight :: Bool
136106debugInvalidate :: Bool
137107
138108#ifdef DEBUG
109+
139110#define DEBUG_NODEIDS
140111
141−#ifdef DEBUG_TRACE_PROPAGATION
142112debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146113
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150114debugInvalidateHeight = False
151−#endif
152115
153−#ifdef DEBUG_TRACE_INVALIDATION
154116debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158117
159118class HasNodeId a where
160119 getNodeId :: a -> Int
161120
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
121+instance HasNodeId (Hold x p a) where
169122 getNodeId = holdNodeId
170123
124+instance HasNodeId (PushSubscribed x a b) where
125+ getNodeId = pushSubscribedNodeId
126+
171127instance HasNodeId (SwitchSubscribed x a) where
172128 getNodeId = switchSubscribedNodeId
173129
174−instance HasNodeId (FanSubscribed x v a) where
130+instance HasNodeId (FanSubscribed x a) where
175131 getNodeId = fanSubscribedNodeId
176132
177133instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +141,41 @@ instance HasNodeId (Pull x a) where
185141
186142{-# INLINE showNodeId #-}
187143showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
144+showNodeId = ("#"<>) . show . getNodeId
145+
146+showSubscriberType :: Subscriber x a -> String
147+showSubscriberType = \case
148+ SubscriberPush _ _ -> "SubscriberPush"
149+ SubscriberMerge _ _ -> "SubscriberMerge"
150+ SubscriberFan _ -> "SubscriberFan"
151+ SubscriberMergeChange _ -> "SubscriberMergeChange"
152+ SubscriberHold _ -> "SubscriberHold"
153+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
154+ SubscriberSwitch _ -> "SubscriberSwitch"
155+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
156+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
157+ SubscriberHandle -> "SubscriberHandle"
158+
159+showEventType :: Event x a -> String
160+showEventType = \case
161+ EventRoot _ _ -> "EventRoot"
162+ EventNever -> "EventNever"
163+ EventPush _ -> "EventPush"
164+ EventMerge _ -> "EventMerge"
165+ EventFan _ _ -> "EventFan"
166+ EventSwitch _ -> "EventSwitch"
167+ EventCoincidence _ -> "EventCoincidence"
168+ EventHold _ -> "EventHold"
169+ EventDyn _ -> "EventDyn"
170+ EventHoldIdentity _ -> "EventHoldIdentity"
171+ EventDynIdentity _ -> "EventDynIdentity"
193172
194173#else
195174
196175debugPropagate = False
176+
197177debugInvalidateHeight = False
178+
198179debugInvalidate = False
199180
200181-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +183,6 @@ debugInvalidate = False
202183showNodeId :: a -> String
203184showNodeId _ = ""
204185
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209186#endif
210187
211188#ifdef DEBUG_NODEIDS
@@ -215,6 +192,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215192
216193newNodeId :: IO Int
217194newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
195+
196+{-# NOINLINE unsafeNodeId #-}
197+unsafeNodeId :: a -> Int
198+unsafeNodeId a = unsafePerformIO $ do
199+ touch a
200+ newNodeId
218201#endif
219202
220203--------------------------------------------------------------------------------
@@ -251,9 +234,9 @@ subscribeAndRead = unEvent
251234-- caching; if the computation function is very cheap, this is (much) more
252235-- efficient than 'push'
253236{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
237+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255238pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
239+ (subscription, occ) <- subscribeAndRead e $ sub
257240 { subscriberPropagate = \a -> do
258241 mb <- f a
259242 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +255,10 @@ terminalSubscriber p = Subscriber
272255
273256-- | Subscribe to an Event only for the duration of one occurrence
274257{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
258+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276259subscribeAndReadHead e sub = do
277260 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
261+ (subscription, occ) <- subscribeAndRead e $ sub
279262 { subscriberPropagate = \a -> do
280263 liftIO $ unsubscribe =<< readIORef subscriptionRef
281264 subscriberPropagate sub a
@@ -286,42 +269,24 @@ subscribeAndReadHead e sub = do
286269 return (subscription, occ)
287270
288271--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)
272+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290273headE originalE = do
291274 parent <- liftIO $ newIORef $ Just originalE
292275 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293276 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
277+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295278 when (isJust occ) clearParent
296− return $ Event $ \sub ->
279+ return $ Event $ \sub -> do
297280 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
281+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299282 Just e -> subscribeAndReadHead e sub
300283
301284data CacheSubscribed x a
302285 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303286 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304287 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308288 }
309289
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−
325290-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326291-- repeatedly
327292--
@@ -336,33 +301,27 @@ cacheEvent e =
336301#else
337302 Event $
338303#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
304+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
305+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
306+ in \sub -> {-# SCC "cacheEvent" #-} do
343307#ifdef DEBUG_TRACE_EVENTS
344308 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345309#endif
346310 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347311 Just subscribedTicket -> return subscribedTicket
348312 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352313 subscribers <- liftIO FastWeakBag.empty
353314 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
357315 (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− }
316+ { subscriberPropagate = \a -> do
317+ liftIO $ writeIORef occRef $ Just a
318+ scheduleClear occRef
319+ propagateFast a subscribers
320+ , subscriberInvalidateHeight = \old -> do
321+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
322+ , subscriberRecalculateHeight = \new -> do
323+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
324+ }
366325 when (isJust occ) $ do
367326 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368327 scheduleClear occRef
@@ -370,45 +329,29 @@ cacheEvent e =
370329 { _cacheSubscribed_subscribers = subscribers
371330 , _cacheSubscribed_parent = parentSub
372331 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376332 }
377333 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378334 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379335 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−
336+ liftIO $ do
337+ subscribed <- getFastWeakTicketValue subscribedTicket
338+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
339+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
340+ let es = EventSubscription
341+ { _eventSubscription_unsubscribe = do
342+ FastWeakBag.remove ticket
343+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
344+ when isEmpty $ do
345+ writeIORef mSubscribedRef emptyFastWeak
346+ unsubscribe $ _cacheSubscribed_parent subscribed
347+ touch ticket
348+ touch subscribedTicket
349+ , _eventSubscription_subscribed = EventSubscribed
350+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
351+ , eventSubscribedRetained = toAny subscribedTicket
352+ }
353+ }
354+ return (es, occ)
412355
413356subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414357subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +363,13 @@ wrap tag getSpecificSubscribed sub = do
420363 let es = tag subd
421364 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422365
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
366+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424367eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425368
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429369eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
370+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431371
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
372+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433373eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434374
435375eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +404,16 @@ data Subscriber x a = Subscriber
464404 , subscriberRecalculateHeight :: !(Height -> IO ())
465405 }
466406
407+--TODO: Move this comment to WeakBag
408+-- These function are constructor functions that are marked NOINLINE so they are
409+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
410+-- so any weak references that are attached to the constructors will have their
411+-- finalizer run. Using the opaque constructor, does not see the
412+-- constructor application, so it behaves like an IORef and cannot be fused away.
413+--
414+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
415+-- the weak pointer to it in some cases.
416+
467417newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468418newSubscriberHold h = return $ Subscriber
469419 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +421,85 @@ newSubscriberHold h = return $ Subscriber
471421 , subscriberRecalculateHeight = \_ -> return ()
472422 }
473423
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
424+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
425+newSubscriberFan subscribed = return $ Subscriber
476426 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477427 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
428+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479429 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480430 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
431+ let f _ (Pair (Identity v) subsubs) = do
482432 propagate v $ _fanSubscribedChildren_list subsubs
483433 return $ Constant ()
484434 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485435 return ()
486436 , subscriberInvalidateHeight = \old -> do
437+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487438 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
439+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489441 , subscriberRecalculateHeight = \new -> do
442+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490443 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
444+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
445+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492446 }
493447
494448newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
449+newSubscriberSwitch subscribed = return $ Subscriber
496450 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
451+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497452 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498453 scheduleClear $ switchSubscribedOccurrence subscribed
499454 propagate a $ switchSubscribedSubscribers subscribed
500455 , subscriberInvalidateHeight = \_ -> do
456+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501457 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502458 when (oldHeight /= invalidHeight) $ do
503459 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
460+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
461+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
462+ , subscriberRecalculateHeight = \new -> do
463+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
464+ updateSwitchHeight new subscribed
465+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
466+ }
507467
508468newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
469+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510470 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
471+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511472 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512473 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513474 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514475 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515476 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517477 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518478 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519479 case occ of
520− Nothing ->
480+ Nothing -> do
521481 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522482 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
483+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
484+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525485 Just o -> do -- Since it's already firing, no need to adjust height
526486 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527487 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528488 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
489+ , subscriberInvalidateHeight = \_ -> do
490+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
491+ invalidateCoincidenceHeight subscribed
492+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
493+ , subscriberRecalculateHeight = \_ -> do
494+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
495+ recalculateCoincidenceHeight subscribed
496+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531497 }
532498
533499newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
500+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535501 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
502+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536503 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537504 case occ of
538505 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +507,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540507 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541508 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542509 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
510+ , subscriberInvalidateHeight = \_ -> do
511+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
512+ invalidateCoincidenceHeight subscribed
513+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
514+ , subscriberRecalculateHeight = \_ -> do
515+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
516+ recalculateCoincidenceHeight subscribed
517+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545518 }
546519
547520invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +524,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551524recalculateSubscriberHeight = flip subscriberRecalculateHeight
552525
553526-- | 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) $
527+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
528+propagate a subscribers = withIncreasedDepth $ do
556529 -- 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
557530 --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
531+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559532
560533-- | 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) $
534+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
535+propagateFast a subscribers = withIncreasedDepth $ do
563536 -- 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
564537 --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
538+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566539
567540--------------------------------------------------------------------------------
568541-- EventSubscribed
@@ -571,16 +544,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571544toAny :: a -> Any
572545toAny = unsafeCoerce
573546
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.
579547data EventSubscribed x = EventSubscribed
580548 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581549 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582550#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
551+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584552 , eventSubscribedHasOwnHeightRef :: !Bool
585553 , eventSubscribedWhoCreated :: !(IO [String])
586554#endif
@@ -607,23 +575,13 @@ eventSubscribedNever = EventSubscribed
607575 , eventSubscribedWhoCreated = return ["never"]
608576#endif
609577 }
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− }
620578
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
579+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622580eventSubscribedFan !subscribed = EventSubscribed
623581 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624582 , eventSubscribedRetained = toAny subscribed
625583#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
584+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627585 , eventSubscribedHasOwnHeightRef = False
628586 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629587#endif
@@ -636,7 +594,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636594#ifdef DEBUG_CYCLES
637595 , eventSubscribedGetParents = do
638596 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
597+ return [Some $ _eventSubscription_subscribed s]
640598 , eventSubscribedHasOwnHeightRef = True
641599 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642600#endif
@@ -649,8 +607,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649607#ifdef DEBUG_CYCLES
650608 , eventSubscribedGetParents = do
651609 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
610+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
611+ innerParents = maybeToList $ fmap Some innerSubscription
654612 return $ outerParent : innerParents
655613 , eventSubscribedHasOwnHeightRef = True
656614 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +622,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664622whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665623whoCreatedEventSubscribed = eventSubscribedWhoCreated
666624
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
625+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668626walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
627+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670628 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671629 when (h == invalidHeight) $ do
672630 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
631+ modify (Some s :)
674632 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
633+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676634 return subscribers
677635#endif
678636
@@ -709,7 +667,7 @@ behaviorPull !p = Behavior $ do
709667 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710668 parentsRef <- liftIO $ newIORef []
711669 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
670+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713671 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714672 parents <- liftIO $ readIORef parentsRef
715673 let subscribed = PullSubscribed
@@ -744,46 +702,42 @@ readBehaviorUntracked b = do
744702-- Dynamic
745703--------------------------------------------------------------------------------
746704
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
705+data Dynamic x p = Dynamic
706+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751707 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752708 }
753709
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
710+dynamicHold :: Hold x p -> Dynamic x p
760711dynamicHold !h = Dynamic
761712 { dynamicCurrent = behaviorHold h
762713 , dynamicUpdated = eventHold h
763714 }
764715
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
716+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766717dynamicHoldIdentity = dynamicHold
767718
768−dynamicConst :: PatchTarget p -> DynamicS x p
719+dynamicConst :: PatchTarget p -> Dynamic x p
769720dynamicConst !a = Dynamic
770721 { dynamicCurrent = behaviorConst a
771722 , dynamicUpdated = eventNever
772723 }
773724
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
725+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775726dynamicDyn !d = Dynamic
776727 { dynamicCurrent = behaviorDyn d
777728 , dynamicUpdated = eventDyn d
778729 }
779730
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
731+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781732dynamicDynIdentity = dynamicDyn
782733
783734--------------------------------------------------------------------------------
784735-- Combinators
785736--------------------------------------------------------------------------------
786737
738+--TODO: Figure out why certain things are not 'representational', then make them
739+--representational so we can use coerce
740+
787741--type role Hold representational
788742data Hold x p
789743 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +758,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804758
805759-- | Stores all global data relevant to a particular Spider timeline; only one
806760-- 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
761+data SpiderTimelineEnv x = SpiderTimelineEnv
813762 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814763 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815764#ifdef DEBUG
816765 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817766#endif
818767 }
819−type role SpiderTimelineEnv' phantom
768+type role SpiderTimelineEnv nominal
820769
821770instance Eq (SpiderTimelineEnv x) where
822771 _ == _ = True -- Since only one exists of each type
823772
824773instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
774+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826775 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827776 else Nothing
828777
@@ -845,7 +794,7 @@ runEventM :: EventM x a -> IO a
845794runEventM = unEventM
846795
847796asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
797+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849798
850799class MonadIO m => Defer a m where
851800 getDeferralQueue :: m (IORef [a])
@@ -983,9 +932,9 @@ getHoldEventSubscription h = do
983932
984933type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985934
935+--type role BehaviorM representational
986936-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
937+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989938
990939instance Monad (BehaviorM x) where
991940 {-# INLINE (>>=) #-}
@@ -994,10 +943,8 @@ instance Monad (BehaviorM x) where
994943 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995944 {-# INLINE return #-}
996945 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998946 {-# INLINE fail #-}
999947 fail s = BehaviorM $ fail s
1000−#endif
1001948
1002949data BehaviorSubscribed x a
1003950 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +985,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038985#endif
1039986 }
1040987
1041−data Root x k
988+data Root x (k :: * -> *)
1042989 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043990 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044991 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1004,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571004newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581005
10591006-- 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)
1007+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
10611008
10621009newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631010
@@ -1082,8 +1029,7 @@ heightBagFromList :: [Height] -> HeightBag
10821029heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831030
10841031heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1032+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871033
10881034heightBagRemove :: Height -> HeightBag -> HeightBag
10891035heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1038,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921038 0 -> IntMap.delete h c
10931039 _ -> IntMap.insert h (pred old) c
10941040
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−
11021041heightBagMax :: HeightBag -> Height
11031042heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041043 Just ((h, _), _) -> Height h
@@ -1116,25 +1055,25 @@ heightBagVerify b@(HeightBag s c) = if
11161055heightBagVerify = id
11171056#endif
11181057
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1058+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1059+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1060+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1061+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231062 }
11241063
1125−data FanSubscribed x k v
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1064+data FanSubscribed (x :: *) k
1065+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1066+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1067+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291068 , fanSubscribedParent :: !(EventSubscription x)
11301069#ifdef DEBUG_NODEIDS
11311070 , fanSubscribedNodeId :: Int
11321071#endif
11331072 }
11341073
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1074+data Fan x k
1075+ = Fan { fanParent :: !(Event x (DMap k Identity))
1076+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381077 }
11391078
11401079data SwitchSubscribed x a
@@ -1196,27 +1135,19 @@ instance HasSpiderTimeline x => Align (Event x) where
11961135#if MIN_VERSION_these(0, 8, 0)
11971136instance HasSpiderTimeline x => Semialign (Event x) where
11981137#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201−
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1206− zip x y = mapMaybe justThese $ align x y
1207−#endif
1138+ align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12081139
12091140data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101141 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111142 | HoldDyn !(Hold x p)
12121143
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1144+newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
12141145
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1146+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161147newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171148
12181149--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)
1150+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201151zipDynWith f da db =
12211152 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221153 ec = flip push eab $ \o -> do
@@ -1239,12 +1170,18 @@ buildDynamic readV0 v' = do
12391170 return d
12401171
12411172unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1173+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1174+ where x = (readV0, v')
12441175
12451176-- ResultM can read behaviors and events
12461177type ResultM = EventM
12471178
1179+{-# NOINLINE unsafeNewIORef #-}
1180+unsafeNewIORef :: a -> b -> IORef b
1181+unsafeNewIORef a b = unsafePerformIO $ do
1182+ touch a
1183+ newIORef b
1184+
12481185instance HasSpiderTimeline x => Functor (Event x) where
12491186 fmap f = push $ return . Just . f
12501187
@@ -1257,42 +1194,33 @@ push f e = cacheEvent (pushCheap f e)
12571194
12581195{-# INLINABLE pull #-}
12591196pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1197+pull a = behaviorPull $ Pull
1198+ { pullCompute = a
1199+ , pullValue = unsafeNewIORef a Nothing
12621200#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1201+ , pullNodeId = unsafeNodeId a
12641202#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1203+ }
12721204
12731205{-# INLINABLE switch #-}
12741206switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1278− { switchParent = a
1279− , switchSubscribed = ref
1280− }
1207+switch a = eventSwitch $ Switch
1208+ { switchParent = a
1209+ , switchSubscribed = unsafeNewIORef a Nothing
1210+ }
12811211
12821212coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1288− }
1213+coincidence a = eventCoincidence $ Coincidence
1214+ { coincidenceParent = a
1215+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1216+ }
12891217
12901218-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911219run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921220run roots after = do
12931221 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941222 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1223+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961224 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971225 occBefore <- liftIO $ do
12981226 occBefore <- readIORef occRef
@@ -1346,110 +1274,55 @@ mkWeakPtrWithDebug x debugNote = do
13461274 x' <- evaluate x
13471275 mkWeakPtr x' $
13481276 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1277+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501278 else Nothing
13511279
13521280type WeakList a = [Weak a]
13531281
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−
13811282{-# 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
1283+#ifdef DEBUG
1284+withIncreasedDepth :: CanTrace x m => m a -> m a
1285+withIncreasedDepth a = do
1286+ spiderTimeline <- askSpiderTimelineEnv
1287+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851288 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1289+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871290 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−
14121291#else
1292+withIncreasedDepth :: m a -> m a
1293+withIncreasedDepth = id
1294+#endif
14131295
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1296+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171297
14181298{-# INLINE tracePropagate #-}
14191299tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1300+tracePropagate p = traceWhen p debugPropagate
14211301
14221302{-# INLINE traceInvalidate #-}
14231303traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1304+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331305
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 ()
1306+{-# INLINE traceWhen #-}
1307+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1308+traceWhen p b message = traceMWhen p b $ return message
14471309
1310+{-# INLINE traceMWhen #-}
1311+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1312+traceMWhen _ b getMessage = when b $ do
1313+ message <- getMessage
1314+#ifdef DEBUG
1315+ spiderTimeline <- askSpiderTimelineEnv
1316+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1317+#else
1318+ let d = 0
14481319#endif
1320+ liftIO $ putStrLn $ replicate d ' ' <> message
14491321
14501322whoCreatedIORef :: IORef a -> IO [String]
14511323whoCreatedIORef (IORef a) = whoCreated $! a
14521324
1325+#ifdef DEBUG_CYCLES
14531326groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541327groupByHead = \case
14551328 [] -> []
@@ -1460,54 +1333,20 @@ groupByHead = \case
14601333 | otherwise -> (x, xs :| []) : l
14611334
14621335listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1336+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951337#endif
14961338
1497−
14981339{-# INLINE propagateSubscriberHold #-}
14991340propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001341propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1342+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021343 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031344 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051345 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061346 case {-# SCC "apply" #-} apply a v of
15071347 Nothing -> return ()
15081348 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1349+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111350 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121351 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131352 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1354,25 @@ propagateSubscriberHold h a = do
15151354data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161355
15171356runBehaviorM :: 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)
1357+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191358
15201359askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211360askInvalidator = do
1522− (!m, _) <- ask
1361+ (!m, _) <- BehaviorM ask
15231362 case m of
15241363 Nothing -> return Nothing
15251364 Just (!wi, _) -> return $ Just wi
15261365
15271366askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281367askParentsRef = do
1529− (!m, _) <- ask
1368+ (!m, _) <- BehaviorM ask
15301369 case m of
15311370 Nothing -> return Nothing
15321371 Just (_, !p) -> return $ Just p
15331372
15341373askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351374askBehaviorHoldInits = do
1536− (_, !his) <- ask
1375+ (_, !his) <- BehaviorM ask
15371376 return his
15381377
15391378{-# INLINE getDynHold #-}
@@ -1561,7 +1400,7 @@ getDynHold d = do
15611400zeroRef :: IORef Height
15621401zeroRef = unsafePerformIO $ newIORef zeroHeight
15631402
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)
1403+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651404getRootSubscribed k r sub = do
15661405 mSubscribed <- readIORef $ rootSubscribed r
15671406 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1414,9 @@ getRootSubscribed k r sub = do
15751414 let !cached = rootSubscribed r
15761415 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771416 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1417+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811418 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821419 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861420 let !subscribed = RootSubscribed
15871421 { rootSubscribedKey = k
15881422 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1425,7 @@ getRootSubscribed k r sub = do
15911425 , rootSubscribedUninit = uninit
15921426 , rootSubscribedWeakSelf = weakSelf
15931427#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1428+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951429#endif
15961430 }
15971431 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1461,6 @@ data FanInt x a = FanInt
16271461 { _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
16281462 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291463 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331464 }
16341465
16351466newFanInt :: IO (FanInt x a)
@@ -1637,39 +1468,38 @@ newFanInt = do
16371468 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
16381469 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391470 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431471 return $ FanInt
16441472 { _fanInt_subscribers = subscribers
16451473 , _fanInt_subscriptionRef = subscriptionRef
16461474 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501475 }
16511476
1477+{-# NOINLINE unsafeNewFanInt #-}
1478+unsafeNewFanInt :: b -> FanInt x a
1479+unsafeNewFanInt b = unsafePerformIO $ do
1480+ touch b
1481+ newFanInt
1482+
16521483fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1484+fanInt p =
1485+ let self = unsafeNewFanInt p
1486+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561487 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571488 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
1489+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601490 { subscriberPropagate = \m -> do
16611491 liftIO $ writeIORef (_fanInt_occRef self) m
16621492 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 ->
1493+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1494+ FastWeakBag.traverse b $ \s -> do
16651495 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1496+ , subscriberInvalidateHeight = \old -> do
1497+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1498+ FastWeakBag.traverse b $ \s -> do
16691499 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1500+ , subscriberRecalculateHeight = \new -> do
1501+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1502+ FastWeakBag.traverse b $ \s -> do
16731503 subscriberRecalculateHeight s new
16741504 }
16751505 liftIO $ do
@@ -1683,28 +1513,13 @@ fanInt p = unsafePerformIO $ do
16831513 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841514 return b
16851515 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1516+ t <- liftIO $ FastWeakBag.insert sub b
16871517 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−
1518+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1519+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051520
17061521{-# INLINABLE getFanSubscribed #-}
1707−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1522+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081523getFanSubscribed k f sub = do
17091524 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101525 case mSubscribed of
@@ -1722,16 +1537,13 @@ getFanSubscribed k f sub = do
17221537 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231538 occRef <- liftIO $ newIORef parentOcc
17241539 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281540 let subscribed = FanSubscribed
17291541 { fanSubscribedCachedSubscribed = fanSubscribed f
17301542 , fanSubscribedOccurrence = occRef
17311543 , fanSubscribedParent = subscription
17321544 , fanSubscribedSubscribers = subscribersRef
17331545#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1546+ , fanSubscribedNodeId = unsafeNodeId f
17351547#endif
17361548 }
17371549 let !self = (k, subscribed)
@@ -1741,7 +1553,7 @@ getFanSubscribed k f sub = do
17411553 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421554 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431555
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1556+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451557cleanupFanSubscribed (k, subscribed) = do
17461558 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471559 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1565,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531565 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541566
17551567{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1568+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571569subscribeFanSubscribed k subscribed sub = do
17581570 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591571 case DMap.lookup k subscribers of
@@ -1791,9 +1603,6 @@ getSwitchSubscribed s sub = do
17911603 when (isJust parentOcc) $ scheduleClear occRef
17921604 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931605 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971606 let !subscribed = SwitchSubscribed
17981607 { switchSubscribedCachedSubscribed = switchSubscribed s
17991608 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1615,7 @@ getSwitchSubscribed s sub = do
18061615 , switchSubscribedCurrentParent = subscriptionRef
18071616 , switchSubscribedWeakSelf = weakSelf
18081617#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1618+ , switchSubscribedNodeId = unsafeNodeId s
18101619#endif
18111620 }
18121621 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1660,6 @@ getCoincidenceSubscribed c sub = do
18511660 scheduleClear innerSubdRef
18521661 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531662 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571663 let subscribed = CoincidenceSubscribed
18581664 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591665 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1670,7 @@ getCoincidenceSubscribed c sub = do
18641670 , coincidenceSubscribedInnerParent = innerSubdRef
18651671 , coincidenceSubscribedWeakSelf = weakSelf
18661672#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1673+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681674#endif
18691675 }
18701676 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1687,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811687subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821688subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831689
1884−{-# INLINE mergeG #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886− => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1690+{-# INLINE merge #-}
1691+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1692+merge d = cacheEvent (mergeCheap d)
18891693
18901694{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1695+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1696+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951697
18961698{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1699+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1700+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031701 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1702+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051703 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061704 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071705 (mOldSubd, newPs) <- case me of
19081706 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091707 Just e -> do
19101708 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1709+ subscription@(EventSubscription _ subd) <- subscribe e s
19121710 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131711 let newParent = MergeSubscribedParent subscription
19141712 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151713 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161714 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1715+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201716 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211717 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221718 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1719+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251720 getInitialSubscribers initialParents subscriber = do
19261721 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271722 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1723+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291724 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1725+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311726 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321727 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331728 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341729 )
1935−
19361730 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371731 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381732
19391733{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1734+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1735+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451736 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1737+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471738 updateMe subscriber heightBagRef oldParents p = do
19481739 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1740+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501741 subscribeParent k e = do
19511742 keyRef <- liftIO $ newIORef k
19521743 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1746,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551746 newParentHeight <- getEventSubscribedHeight subd
19561747 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571748 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1749+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591750 -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1751+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611752 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621753 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1754+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661755 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671756 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681757 Just toKey -> do
19691758 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701759 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1760+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741761 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1762+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761763 getInitialSubscribers initialParents subscriber = do
19771764 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781765 keyRef <- liftIO $ newIORef k
19791766 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1767+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811768 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1769+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831770 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841771 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851772 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861773 )
1987−
19881774 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891775 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901776
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1777+type MergeUpdateFunc k x p s
1778+ = (forall a. EventM x (k a) -> Subscriber x a)
19931779 -> IORef HeightBag
19941780 -> DMap k s
19951781 -> p
19961782 -> EventM x ([EventSubscription x], DMap k s)
19971783
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
2000−type MergeInitFunc k v q x s
2001− = DMap k q
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
1784+type MergeInitFunc k x s
1785+ = DMap k (Event x)
1786+ -> (forall a. EventM x (k a) -> Subscriber x a)
1787+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041788
20051789type MergeDestroyFunc k s
20061790 = DMap k s
20071791 -> IO ()
20081792
2009−data Merge x k v s = Merge
1793+data Merge x k s = Merge
20101794 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111795 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121796 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1797+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1798+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151799 }
20161800
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1801+invalidateMergeHeight :: Merge x k s -> IO ()
20181802invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191803
20201804invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211805invalidateMergeHeight' heightRef sub = do
20221806 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
1807+ 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
20251808 writeIORef heightRef $! invalidHeight
20261809 subscriberInvalidateHeight sub oldHeight
20271810
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1811+
1812+revalidateMergeHeight :: Merge x k s -> IO ()
20291813revalidateMergeHeight m = do
20301814 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
1815+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341816 heights <- readIORef $ _merge_heightBagRef m
20351817 parents <- readIORef $ _merge_parentsRef m
20361818 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1820,44 @@ revalidateMergeHeight m = do
20381820 LT -> return ()
20391821 EQ -> do
20401822 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1823+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421824 writeIORef (_merge_heightRef m) $! height
20431825 subscriberRecalculateHeight (_merge_sub m) height
20441826 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451827
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1828+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471829scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481830 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
1831+ 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
20521832 --TODO: Assert that m is not empty
20531833 subscriberPropagate (_merge_sub m) vals
20541834
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
1835+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1836+mergeSubscriber m getKey = Subscriber
20781837 { subscriberPropagate = \a -> do
20791838 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801839 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1840+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821841 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831842 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841843 when (DMap.null oldM) $ do -- Only schedule the firing once
20851844 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1845+ --TODO: assertions about height
1846+ currentHeight <- getCurrentHeight
1847+ when (height <= currentHeight) $ do
1848+ if height /= invalidHeight
1849+ then do
1850+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1851+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1852+ else liftIO $ do
1853+#ifdef DEBUG_CYCLES
1854+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1855+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1856+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1857+#else
1858+ let cycleInfo = ""
1859+#endif
1860+ error $ "Causality loop found" <> cycleInfo
20881861 scheduleMergeSelf m height
20891862 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901863 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1868,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951868 }
20961869
20971870--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)
1871+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1872+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001873 where updateMe = do
21011874 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1875+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031876 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041877 return subscriptionsToKill
21051878
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1879+{-# INLINE mergeCheap' #-}
1880+mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k Identity)
1881+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101882 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111883 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121884 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131885 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141886 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
1887+ let m = Merge
21301888 { _merge_parentsRef = parentsRef
21311889 , _merge_heightBagRef = heightBagRef
21321890 , _merge_heightRef = heightRef
21331891 , _merge_sub = sub
21341892 , _merge_accumRef = accumRef
21351893 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1894+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371895 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381896 myHeight = if invalidHeight `elem` heights
21391897 then invalidHeight
@@ -2142,57 +1900,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421900 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431901 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441902 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1903+ unless (DMap.null accum) $ do
1904+ scheduleMergeSelf m myHeight
21461905 liftIO $ writeIORef accumRef $! accum
21471906 liftIO $ writeIORef heightRef $! myHeight
21481907 liftIO $ writeIORef heightBagRef $! myHeightBag
1908+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491909 liftIO $ writeIORef parentsRef $! initialParentState
21501910 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1911+ let s = Subscriber
21521912 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1913+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1914+ defer $ updateMerge m updateFunc a
21551915 , subscriberInvalidateHeight = \_ -> return ()
21561916 , subscriberRecalculateHeight = \_ -> return ()
21571917 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1918+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1919+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601920 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611921 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621922 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1923+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641924 let unsubscribeAll = destroy =<< readIORef parentsRef
1925+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1926+ , occ
1927+ )
21651928
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)
1929+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701930mergeInt = cacheEvent . mergeIntCheap
21711931
21721932{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1933+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741934mergeIntCheap d = Event $ \sub -> do
21751935 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761936 accum <- liftIO $ FastMutableIntMap.newEmpty
21771937 heightRef <- liftIO $ newIORef zeroHeight
21781938 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791939 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− }
21901940 let scheduleSelf = do
21911941 height <- liftIO $ readIORef $ heightRef
21921942 scheduleMerge' height heightRef $ do
21931943 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941944 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1945+ invalidateMyHeight = do
1946+ invalidateMergeHeight' heightRef sub
21961947 recalculateMyHeight = do
21971948 currentHeight <- readIORef heightRef
21981949 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 +1953,12 @@ mergeIntCheap d = Event $ \sub -> do
22021953 LT -> return ()
22031954 EQ -> do
22041955 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1956+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061957 writeIORef heightRef $! height
22071958 subscriberRecalculateHeight sub height
22081959 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091960 mySubscriber k = Subscriber
22101961 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131962 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141963 liftIO $ FastMutableIntMap.insert accum k a
22151964 when wasEmpty scheduleSelf
@@ -2243,6 +1992,7 @@ mergeIntCheap d = Event $ \sub -> do
22431992 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22441993 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22451994 return Nothing
1995+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22461996 defer $ SomeMergeInit $ do
22471997 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22481998 where
@@ -2256,39 +2006,35 @@ mergeIntCheap d = Event $ \sub -> do
22562006 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572007 liftIO $ for_ oldParents $ \oldParent -> do
22582008 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612009 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622010 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2011+ let s = Subscriber
22642012 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652013 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662014 defer $ updateMe a
22672015 , subscriberInvalidateHeight = \_ -> return ()
22682016 , subscriberRecalculateHeight = \_ -> return ()
22692017 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2018+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712019 forM_ change $ \c -> defer $ updateMe c
22722020 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732021 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742022 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2023+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762024 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2025+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2026+ , occ
2027+ )
22802028
22812029newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282−newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
22832030
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2031+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2032+fan e =
22872033 let f = Fan
22882034 { fanParent = e
2289− , fanSubscribed = ref
2035+ , fanSubscribed = unsafeNewIORef e Nothing
22902036 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2037+ in EventSelector $ \k -> eventFan k f
22922038
22932039runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942040runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2088,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422088-- | Run an event action outside of a frame
23432089runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442090runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2091+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462092 let go = do
23472093 result <- a
23482094 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 +2105,19 @@ runFrame a = SpiderHost $ do
23592105 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602106 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612107 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2108+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632109 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642110 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652111 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2112+ when debugPropagate $ putStrLn "Updating merges"
23672113 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2114+ when debugPropagate $ putStrLn "Updating merges done"
23692115 toReconnect <- readIORef toReconnectRef
23702116 clearEventEnv env
23712117 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722118 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732119 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2120+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752121 finalize wi
23762122 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772123 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2131,7 @@ runFrame a = SpiderHost $ do
23852131 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
23862132 {-
23872133 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2134+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892135 EventRoot _ -> "EventRoot"
23902136 EventNever -> "EventNever"
23912137 _ -> "something else"
@@ -2400,7 +2146,7 @@ runFrame a = SpiderHost $ do
24002146 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012147 when (parentHeight /= myHeight) $ do
24022148 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2149+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042150 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
24052151 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062152 unsubscribe subscription
@@ -2441,7 +2187,7 @@ invalidateCoincidenceHeight subscribed = do
24412187 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422188 when (oldHeight /= invalidHeight) $ do
24432189 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2190+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452191
24462192updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472193updateSwitchHeight new subscribed = do
@@ -2449,7 +2195,7 @@ updateSwitchHeight new subscribed = do
24492195 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502196 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512197 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2198+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532199
24542200recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552201recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2204,7 @@ recalculateCoincidenceHeight subscribed = do
24582204 height <- calculateCoincidenceHeight subscribed
24592205 when (height /= invalidHeight) $ do
24602206 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2207+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622208
24632209calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642210calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2266,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202266 {-# INLINABLE headE #-}
25212267 headE = R.slowHeadE
25222268-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252269
25262270instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272271 {-# INLINABLE sample #-}
@@ -2543,9 +2287,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432287 {-# INLINABLE headE #-}
25442288 headE = R.slowHeadE
25452289-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492290
25502291instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512292 {-# INLINE return #-}
@@ -2554,13 +2295,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542295 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552296 {-# INLINE (>>) #-}
25562297 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582298 {-# INLINE fail #-}
25592299 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612300
25622301{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2302+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642303newJoinDyn d =
25652304 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662305 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2348,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092348 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102349 {-# INLINABLE headE #-}
26112350 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152351
26162352instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172353 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2364,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282364 {-# INLINABLE headE #-}
26292365 headE = R.slowHeadE
26302366-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332367
26342368instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352369 {-# INLINABLE sample #-}
@@ -2650,8 +2384,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502384 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512385 {-# INLINABLE headE #-}
26522386 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552387
26562388--------------------------------------------------------------------------------
26572389-- Deprecated items
@@ -2689,13 +2421,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892421 touch h
26902422 return result
26912423
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2424+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932425 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942426 newFanEventWithTrigger f = SpiderHost $ do
26952427 es <- newFanEventWithTriggerIO f
26962428 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972429
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2430+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992431 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002432 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012433 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2449,7 @@ unsafeNewSpiderTimelineEnv = do
27172449#ifdef DEBUG
27182450 depthRef <- newIORef 0
27192451#endif
2720− return $ STE $ SpiderTimelineEnv
2452+ return $ SpiderTimelineEnv
27212453 { _spiderTimeline_lock = lock
27222454 , _spiderTimeline_eventEnv = env
27232455#ifdef DEBUG
@@ -2729,17 +2461,17 @@ unsafeNewSpiderTimelineEnv = do
27292461newSpiderTimeline :: IO (Some SpiderTimelineEnv)
27302462newSpiderTimeline = withSpiderTimeline (pure . Some)
27312463
2732−data LocalSpiderTimeline (x :: Type) s
2464+data LocalSpiderTimeline x s
27332465
27342466instance Reifies s (SpiderTimelineEnv x) =>
27352467 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2468+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372469
27382470localSpiderTimeline
2739− :: proxy s
2471+ :: Proxy s
27402472 -> SpiderTimelineEnv x
27412473 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2474+localSpiderTimeline _ = unsafeCoerce
27432475
27442476-- | Pass a new timeline to the given function.
27452477withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2479,18 @@ withSpiderTimeline k = do
27472479 env <- unsafeNewSpiderTimelineEnv
27482480 reify env $ \s -> k $ localSpiderTimeline s env
27492481
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2482+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512483
27522484type ComputeM = EventM
27532485
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2486+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552487
27562488instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572489 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582490 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592491 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 }
2492+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2493+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622494 type PullM (SpiderTimeline x) = SpiderPullM x
27632495 type PushM (SpiderTimeline x) = SpiderPushM x
27642496 {-# INLINABLE never #-}
@@ -2771,15 +2503,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712503 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722504 {-# INLINABLE pull #-}
27732505 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2777− mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780− -> DMap k q
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2506+ {-# INLINABLE merge #-}
2507+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2508+ {-# INLINABLE fan #-}
2509+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832510 {-# INLINABLE switch #-}
27842511 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852512 {-# INLINABLE coincidence #-}
@@ -2787,15 +2514,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872514 {-# INLINABLE current #-}
27882515 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892516 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2517+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912518 {-# INLINABLE unsafeBuildDynamic #-}
27922519 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932520 {-# INLINABLE unsafeBuildIncremental #-}
27942521 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2522+ {-# INLINABLE mergeIncremental #-}
2523+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2524+ {-# INLINABLE mergeIncrementalWithMove #-}
2525+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992526 {-# INLINABLE currentIncremental #-}
28002527 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012528 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2533,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062533 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072534 eventCoercion Coercion = Coercion
28082535 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2536+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112537 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2538+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132539 {-# INLINABLE fanInt #-}
28142540 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152541
@@ -2834,7 +2560,7 @@ instance MonadAtomicRef (EventM x) where
28342560 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352561
28362562-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2563+newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382564
28392565instance Monad (SpiderHost x) where
28402566 {-# INLINABLE (>>=) #-}
@@ -2843,14 +2569,8 @@ instance Monad (SpiderHost x) where
28432569 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442570 {-# INLINABLE return #-}
28452571 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472572 {-# 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
2573+ fail s = SpiderHost $ fail s
28542574
28552575-- | Run an action affecting the global Spider timeline; this will be guarded by
28562576-- a mutex for that timeline
@@ -2862,7 +2582,7 @@ runSpiderHost (SpiderHost a) = a
28622582runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
28632583runSpiderHostForTimeline (SpiderHost a) _ = a
28642584
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2585+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
28662586 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672587
28682588instance Monad (SpiderHostFrame x) where
@@ -2872,21 +2592,19 @@ instance Monad (SpiderHostFrame x) where
28722592 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732593 {-# INLINABLE return #-}
28742594 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762595 {-# INLINABLE fail #-}
28772596 fail s = SpiderHostFrame $ fail s
2878−#endif
28792597
28802598instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812599 notReadyUntil _ = pure ()
28822600 notReady = pure ()
28832601
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2602+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852603newEventWithTriggerIO f = do
28862604 es <- newFanEventWithTriggerIO $ \Refl -> f
28872605 return $ select es Refl
28882606
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2607+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902608newFanEventWithTriggerIO f = do
28912609 occRef <- newIORef DMap.empty
28922610 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2638,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202638instance PrimMonad (SpiderHostFrame x) where
29212639 type PrimState (SpiderHostFrame x) = PrimState IO
29222640 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 ()