@@ -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,73 +49,54 @@ import Data.GADT.Compare
5949import Data.IntMap.Strict (IntMap)
6050import qualified Data.IntMap.Strict as IntMap
6151import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
52+import Data.Maybe
53+import Data.Monoid ((<>))
6554import Data.Proxy
6655import Data.These
6756import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
57+import GHC.Exts
7158import GHC.IORef (IORef (..))
7259import GHC.Stack
7360import Reflex.FastWeak
61+import Reflex.FunctorMaybe
7462import 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
100−import Data.Some (Some(Some))
77+import Data.Some (Some)
78+import qualified Data.Some as Some
10179import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10380import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10481import qualified Data.WeakBag as WeakBag
10582import qualified Reflex.Class
10683import qualified Reflex.Class as R
10784import qualified Reflex.Host.Class
10885import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
86+import Reflex.Patch
87+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11288
11389#ifdef DEBUG_TRACE_EVENTS
11490import qualified Data.ByteString.Char8 as BS8
11591import System.IO (stderr)
116−import Data.List (isPrefixOf)
11792#endif
11893
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12394#ifdef DEBUG_TRACE_EVENTS
95+
12496withStackOneLine :: (BS8.ByteString -> a) -> a
12597withStackOneLine expr = unsafePerformIO $ do
12698 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
99+ return (expr (BS8.pack (unwords (reverse stack))))
129100
130101#endif
131102
@@ -136,42 +107,28 @@ debugInvalidateHeight :: Bool
136107debugInvalidate :: Bool
137108
138109#ifdef DEBUG
110+
139111#define DEBUG_NODEIDS
140112
141−#ifdef DEBUG_TRACE_PROPAGATION
142113debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146114
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150115debugInvalidateHeight = False
151−#endif
152116
153−#ifdef DEBUG_TRACE_INVALIDATION
154117debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158118
159119class HasNodeId a where
160120 getNodeId :: a -> Int
161121
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
122+instance HasNodeId (Hold x p a) where
169123 getNodeId = holdNodeId
170124
125+instance HasNodeId (PushSubscribed x a b) where
126+ getNodeId = pushSubscribedNodeId
127+
171128instance HasNodeId (SwitchSubscribed x a) where
172129 getNodeId = switchSubscribedNodeId
173130
174−instance HasNodeId (FanSubscribed x v a) where
131+instance HasNodeId (FanSubscribed x a) where
175132 getNodeId = fanSubscribedNodeId
176133
177134instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +142,41 @@ instance HasNodeId (Pull x a) where
185142
186143{-# INLINE showNodeId #-}
187144showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
145+showNodeId = ("#"<>) . show . getNodeId
146+
147+showSubscriberType :: Subscriber x a -> String
148+showSubscriberType = \case
149+ SubscriberPush _ _ -> "SubscriberPush"
150+ SubscriberMerge _ _ -> "SubscriberMerge"
151+ SubscriberFan _ -> "SubscriberFan"
152+ SubscriberMergeChange _ -> "SubscriberMergeChange"
153+ SubscriberHold _ -> "SubscriberHold"
154+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
155+ SubscriberSwitch _ -> "SubscriberSwitch"
156+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
157+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
158+ SubscriberHandle -> "SubscriberHandle"
159+
160+showEventType :: Event x a -> String
161+showEventType = \case
162+ EventRoot _ _ -> "EventRoot"
163+ EventNever -> "EventNever"
164+ EventPush _ -> "EventPush"
165+ EventMerge _ -> "EventMerge"
166+ EventFan _ _ -> "EventFan"
167+ EventSwitch _ -> "EventSwitch"
168+ EventCoincidence _ -> "EventCoincidence"
169+ EventHold _ -> "EventHold"
170+ EventDyn _ -> "EventDyn"
171+ EventHoldIdentity _ -> "EventHoldIdentity"
172+ EventDynIdentity _ -> "EventDynIdentity"
193173
194174#else
195175
196176debugPropagate = False
177+
197178debugInvalidateHeight = False
179+
198180debugInvalidate = False
199181
200182-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +184,6 @@ debugInvalidate = False
202184showNodeId :: a -> String
203185showNodeId _ = ""
204186
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209187#endif
210188
211189#ifdef DEBUG_NODEIDS
@@ -215,6 +193,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215193
216194newNodeId :: IO Int
217195newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
196+
197+{-# NOINLINE unsafeNodeId #-}
198+unsafeNodeId :: a -> Int
199+unsafeNodeId a = unsafePerformIO $ do
200+ touch a
201+ newNodeId
218202#endif
219203
220204--------------------------------------------------------------------------------
@@ -251,9 +235,9 @@ subscribeAndRead = unEvent
251235-- caching; if the computation function is very cheap, this is (much) more
252236-- efficient than 'push'
253237{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
238+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255239pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
240+ (subscription, occ) <- subscribeAndRead e $ sub
257241 { subscriberPropagate = \a -> do
258242 mb <- f a
259243 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +256,10 @@ terminalSubscriber p = Subscriber
272256
273257-- | Subscribe to an Event only for the duration of one occurrence
274258{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
259+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276260subscribeAndReadHead e sub = do
277261 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
262+ (subscription, occ) <- subscribeAndRead e $ sub
279263 { subscriberPropagate = \a -> do
280264 liftIO $ unsubscribe =<< readIORef subscriptionRef
281265 subscriberPropagate sub a
@@ -286,42 +270,24 @@ subscribeAndReadHead e sub = do
286270 return (subscription, occ)
287271
288272--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)
273+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290274headE originalE = do
291275 parent <- liftIO $ newIORef $ Just originalE
292276 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293277 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
278+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295279 when (isJust occ) clearParent
296− return $ Event $ \sub ->
280+ return $ Event $ \sub -> do
297281 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
282+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299283 Just e -> subscribeAndReadHead e sub
300284
301285data CacheSubscribed x a
302286 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303287 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304288 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308289 }
309290
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−
325291-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326292-- repeatedly
327293--
@@ -336,33 +302,27 @@ cacheEvent e =
336302#else
337303 Event $
338304#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
305+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
306+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
307+ in \sub -> {-# SCC "cacheEvent" #-} do
343308#ifdef DEBUG_TRACE_EVENTS
344309 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345310#endif
346311 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347312 Just subscribedTicket -> return subscribedTicket
348313 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352314 subscribers <- liftIO FastWeakBag.empty
353315 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
357316 (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− }
317+ { subscriberPropagate = \a -> do
318+ liftIO $ writeIORef occRef $ Just a
319+ scheduleClear occRef
320+ propagateFast a subscribers
321+ , subscriberInvalidateHeight = \old -> do
322+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
323+ , subscriberRecalculateHeight = \new -> do
324+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
325+ }
366326 when (isJust occ) $ do
367327 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368328 scheduleClear occRef
@@ -370,45 +330,29 @@ cacheEvent e =
370330 { _cacheSubscribed_subscribers = subscribers
371331 , _cacheSubscribed_parent = parentSub
372332 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376333 }
377334 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378335 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379336 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−
337+ liftIO $ do
338+ subscribed <- getFastWeakTicketValue subscribedTicket
339+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
340+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
341+ let es = EventSubscription
342+ { _eventSubscription_unsubscribe = do
343+ FastWeakBag.remove ticket
344+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
345+ when isEmpty $ do
346+ writeIORef mSubscribedRef emptyFastWeak
347+ unsubscribe $ _cacheSubscribed_parent subscribed
348+ touch ticket
349+ touch subscribedTicket
350+ , _eventSubscription_subscribed = EventSubscribed
351+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
352+ , eventSubscribedRetained = toAny subscribedTicket
353+ }
354+ }
355+ return (es, occ)
412356
413357subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414358subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +364,13 @@ wrap tag getSpecificSubscribed sub = do
420364 let es = tag subd
421365 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422366
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
367+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424368eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425369
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429370eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
371+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431372
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
373+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433374eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434375
435376eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +405,16 @@ data Subscriber x a = Subscriber
464405 , subscriberRecalculateHeight :: !(Height -> IO ())
465406 }
466407
408+--TODO: Move this comment to WeakBag
409+-- These function are constructor functions that are marked NOINLINE so they are
410+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
411+-- so any weak references that are attached to the constructors will have their
412+-- finalizer run. Using the opaque constructor, does not see the
413+-- constructor application, so it behaves like an IORef and cannot be fused away.
414+--
415+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
416+-- the weak pointer to it in some cases.
417+
467418newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468419newSubscriberHold h = return $ Subscriber
469420 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +422,85 @@ newSubscriberHold h = return $ Subscriber
471422 , subscriberRecalculateHeight = \_ -> return ()
472423 }
473424
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
425+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
426+newSubscriberFan subscribed = return $ Subscriber
476427 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477428 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
429+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479430 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480431 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
432+ let f _ (Pair (Identity v) subsubs) = do
482433 propagate v $ _fanSubscribedChildren_list subsubs
483434 return $ Constant ()
484435 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485436 return ()
486437 , subscriberInvalidateHeight = \old -> do
438+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487439 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
441+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489442 , subscriberRecalculateHeight = \new -> do
443+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
445+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
446+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492447 }
493448
494449newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
450+newSubscriberSwitch subscribed = return $ Subscriber
496451 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
452+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497453 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498454 scheduleClear $ switchSubscribedOccurrence subscribed
499455 propagate a $ switchSubscribedSubscribers subscribed
500456 , subscriberInvalidateHeight = \_ -> do
457+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501458 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502459 when (oldHeight /= invalidHeight) $ do
503460 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
461+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
462+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
463+ , subscriberRecalculateHeight = \new -> do
464+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
465+ updateSwitchHeight new subscribed
466+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
467+ }
507468
508469newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
470+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510471 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
472+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511473 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512474 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513475 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514476 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515477 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517478 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518479 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519480 case occ of
520− Nothing ->
481+ Nothing -> do
521482 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522483 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
484+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
485+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525486 Just o -> do -- Since it's already firing, no need to adjust height
526487 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527488 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528489 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
490+ , subscriberInvalidateHeight = \_ -> do
491+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
492+ invalidateCoincidenceHeight subscribed
493+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
494+ , subscriberRecalculateHeight = \_ -> do
495+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
496+ recalculateCoincidenceHeight subscribed
497+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531498 }
532499
533500newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
501+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535502 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
503+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536504 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537505 case occ of
538506 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +508,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540508 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541509 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542510 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
511+ , subscriberInvalidateHeight = \_ -> do
512+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
513+ invalidateCoincidenceHeight subscribed
514+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
515+ , subscriberRecalculateHeight = \_ -> do
516+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
517+ recalculateCoincidenceHeight subscribed
518+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545519 }
546520
547521invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +525,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551525recalculateSubscriberHeight = flip subscriberRecalculateHeight
552526
553527-- | 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) $
528+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
529+propagate a subscribers = withIncreasedDepth $ do
556530 -- 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
557531 --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
532+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559533
560534-- | 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) $
535+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
536+propagateFast a subscribers = withIncreasedDepth $ do
563537 -- 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
564538 --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
539+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566540
567541--------------------------------------------------------------------------------
568542-- EventSubscribed
@@ -571,16 +545,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571545toAny :: a -> Any
572546toAny = unsafeCoerce
573547
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.
579548data EventSubscribed x = EventSubscribed
580549 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581550 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582551#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
552+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584553 , eventSubscribedHasOwnHeightRef :: !Bool
585554 , eventSubscribedWhoCreated :: !(IO [String])
586555#endif
@@ -607,23 +576,13 @@ eventSubscribedNever = EventSubscribed
607576 , eventSubscribedWhoCreated = return ["never"]
608577#endif
609578 }
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− }
620579
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
580+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622581eventSubscribedFan !subscribed = EventSubscribed
623582 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624583 , eventSubscribedRetained = toAny subscribed
625584#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
585+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627586 , eventSubscribedHasOwnHeightRef = False
628587 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629588#endif
@@ -636,7 +595,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636595#ifdef DEBUG_CYCLES
637596 , eventSubscribedGetParents = do
638597 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
598+ return [Some.This $ _eventSubscription_subscribed s]
640599 , eventSubscribedHasOwnHeightRef = True
641600 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642601#endif
@@ -649,8 +608,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649608#ifdef DEBUG_CYCLES
650609 , eventSubscribedGetParents = do
651610 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
611+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
612+ innerParents = maybeToList $ fmap Some.This innerSubscription
654613 return $ outerParent : innerParents
655614 , eventSubscribedHasOwnHeightRef = True
656615 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +623,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664623whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665624whoCreatedEventSubscribed = eventSubscribedWhoCreated
666625
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
626+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668627walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
628+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670629 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671630 when (h == invalidHeight) $ do
672631 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
632+ modify (Some.This s :)
674633 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
634+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676635 return subscribers
677636#endif
678637
@@ -700,7 +659,7 @@ behaviorPull !p = Behavior $ do
700659 val <- liftIO $ readIORef $ pullValue p
701660 case val of
702661 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
662+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704663 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705664 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706665 return $ pullSubscribedValue subscribed
@@ -709,7 +668,7 @@ behaviorPull !p = Behavior $ do
709668 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710669 parentsRef <- liftIO $ newIORef []
711670 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
671+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713672 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714673 parents <- liftIO $ readIORef parentsRef
715674 let subscribed = PullSubscribed
@@ -719,7 +678,7 @@ behaviorPull !p = Behavior $ do
719678 , pullSubscribedParents = parents
720679 }
721680 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
681+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723682 return a
724683
725684behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,7 +689,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730689readHoldTracked h = do
731690 result <- liftIO $ readIORef $ holdValue h
732691 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
692+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734693 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735694 return result
736695
@@ -744,46 +703,42 @@ readBehaviorUntracked b = do
744703-- Dynamic
745704--------------------------------------------------------------------------------
746705
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
751− , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
706+data Dynamic x p = Dynamic
707+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
708+ , dynamicUpdated :: !(Event x p)
752709 }
753710
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
711+dynamicHold :: Hold x p -> Dynamic x p
760712dynamicHold !h = Dynamic
761713 { dynamicCurrent = behaviorHold h
762714 , dynamicUpdated = eventHold h
763715 }
764716
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
717+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766718dynamicHoldIdentity = dynamicHold
767719
768−dynamicConst :: PatchTarget p -> DynamicS x p
720+dynamicConst :: PatchTarget p -> Dynamic x p
769721dynamicConst !a = Dynamic
770722 { dynamicCurrent = behaviorConst a
771723 , dynamicUpdated = eventNever
772724 }
773725
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
726+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775727dynamicDyn !d = Dynamic
776728 { dynamicCurrent = behaviorDyn d
777729 , dynamicUpdated = eventDyn d
778730 }
779731
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
732+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781733dynamicDynIdentity = dynamicDyn
782734
783735--------------------------------------------------------------------------------
784736-- Combinators
785737--------------------------------------------------------------------------------
786738
739+--TODO: Figure out why certain things are not 'representational', then make them
740+--representational so we can use coerce
741+
787742--type role Hold representational
788743data Hold x p
789744 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +759,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804759
805760-- | Stores all global data relevant to a particular Spider timeline; only one
806761-- 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
762+data SpiderTimelineEnv x = SpiderTimelineEnv
813763 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814764 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815765#ifdef DEBUG
816766 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817767#endif
818768 }
819−type role SpiderTimelineEnv' phantom
769+type role SpiderTimelineEnv nominal
820770
821771instance Eq (SpiderTimelineEnv x) where
822772 _ == _ = True -- Since only one exists of each type
823773
824774instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
775+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826776 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827777 else Nothing
828778
@@ -832,9 +782,9 @@ data EventEnv x
832782 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833783 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834784 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
785+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
786+ , eventEnvIntClears :: !(IORef [SomeIntClear])
787+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838788 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839789 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840790 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +795,7 @@ runEventM :: EventM x a -> IO a
845795runEventM = unEventM
846796
847797asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
798+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849799
850800class MonadIO m => Defer a m where
851801 getDeferralQueue :: m (IORef [a])
@@ -906,29 +856,29 @@ putCurrentHeight h = do
906856 heightRef <- asksEventEnv eventEnvCurrentHeight
907857 liftIO $ writeIORef heightRef $! h
908858
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
859+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910860 {-# INLINE getDeferralQueue #-}
911861 getDeferralQueue = asksEventEnv eventEnvClears
912862
913863{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
864+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
865+scheduleClear r = defer $ SomeClear r
916866
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
867+instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
918868 {-# INLINE getDeferralQueue #-}
919869 getDeferralQueue = asksEventEnv eventEnvIntClears
920870
921871{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
872+scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
873+scheduleIntClear r = defer $ SomeIntClear r
924874
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
875+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926876 {-# INLINE getDeferralQueue #-}
927877 getDeferralQueue = asksEventEnv eventEnvRootClears
928878
929879{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
880+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
881+scheduleRootClear r = defer $ SomeRootClear r
932882
933883instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934884 {-# INLINE getDeferralQueue #-}
@@ -983,9 +933,9 @@ getHoldEventSubscription h = do
983933
984934type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985935
936+--type role BehaviorM representational
986937-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
938+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989939
990940instance Monad (BehaviorM x) where
991941 {-# INLINE (>>=) #-}
@@ -994,16 +944,14 @@ instance Monad (BehaviorM x) where
994944 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995945 {-# INLINE return #-}
996946 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998947 {-# INLINE fail #-}
999948 fail s = BehaviorM $ fail s
1000−#endif
1001949
1002950data BehaviorSubscribed x a
1003951 = forall p. BehaviorSubscribedHold (Hold x p)
1004952 | BehaviorSubscribedPull (PullSubscribed x a)
1005953
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
954+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007955
1008956--type role PullSubscribed representational
1009957data PullSubscribed x a
@@ -1038,7 +986,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038986#endif
1039987 }
1040988
1041−data Root x k
989+data Root x (k :: * -> *)
1042990 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043991 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044992 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1005,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571005newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581006
10591007-- 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)
1008+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
10611009
10621010newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631011
@@ -1082,8 +1030,7 @@ heightBagFromList :: [Height] -> HeightBag
10821030heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831031
10841032heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1033+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871034
10881035heightBagRemove :: Height -> HeightBag -> HeightBag
10891036heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1039,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921039 0 -> IntMap.delete h c
10931040 _ -> IntMap.insert h (pred old) c
10941041
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−
11021042heightBagMax :: HeightBag -> Height
11031043heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041044 Just ((h, _), _) -> Height h
@@ -1116,25 +1056,25 @@ heightBagVerify b@(HeightBag s c) = if
11161056heightBagVerify = id
11171057#endif
11181058
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)))
1059+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1060+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1061+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1062+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231063 }
11241064
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
1065+data FanSubscribed (x :: *) k
1066+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1067+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1068+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291069 , fanSubscribedParent :: !(EventSubscription x)
11301070#ifdef DEBUG_NODEIDS
11311071 , fanSubscribedNodeId :: Int
11321072#endif
11331073 }
11341074
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1075+data Fan x k
1076+ = Fan { fanParent :: !(Event x (DMap k Identity))
1077+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381078 }
11391079
11401080data SwitchSubscribed x a
@@ -1188,35 +1128,24 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881128newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891129newInvalidatorPull p = return $! InvalidatorPull p
11901130
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1131+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1132+ fmapMaybe f = push $ return . f
11931133
11941134instance HasSpiderTimeline x => Align (Event x) where
11951135 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1198−#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
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
1136+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12081137
12091138data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101139 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111140 | HoldDyn !(Hold x p)
12121141
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1142+newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
12141143
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1144+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161145newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171146
12181147--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)
1148+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201149zipDynWith f da db =
12211150 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221151 ec = flip push eab $ \o -> do
@@ -1239,12 +1168,18 @@ buildDynamic readV0 v' = do
12391168 return d
12401169
12411170unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1171+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1172+ where x = (readV0, v')
12441173
12451174-- ResultM can read behaviors and events
12461175type ResultM = EventM
12471176
1177+{-# NOINLINE unsafeNewIORef #-}
1178+unsafeNewIORef :: a -> b -> IORef b
1179+unsafeNewIORef a b = unsafePerformIO $ do
1180+ touch a
1181+ newIORef b
1182+
12481183instance HasSpiderTimeline x => Functor (Event x) where
12491184 fmap f = push $ return . Just . f
12501185
@@ -1257,42 +1192,33 @@ push f e = cacheEvent (pushCheap f e)
12571192
12581193{-# INLINABLE pull #-}
12591194pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1195+pull a = behaviorPull $ Pull
1196+ { pullCompute = a
1197+ , pullValue = unsafeNewIORef a Nothing
12621198#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1199+ , pullNodeId = unsafeNodeId a
12641200#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1201+ }
12721202
12731203{-# INLINABLE switch #-}
12741204switch :: 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− }
1205+switch a = eventSwitch $ Switch
1206+ { switchParent = a
1207+ , switchSubscribed = unsafeNewIORef a Nothing
1208+ }
12811209
12821210coincidence :: 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− }
1211+coincidence a = eventCoincidence $ Coincidence
1212+ { coincidenceParent = a
1213+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1214+ }
12891215
12901216-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911217run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921218run roots after = do
12931219 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941220 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1221+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961222 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971223 occBefore <- liftIO $ do
12981224 occBefore <- readIORef occRef
@@ -1330,11 +1256,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301256 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311257 EQ -> a
13321258
1333−newtype Clear a = Clear (IORef (Maybe a))
1259+data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
13341260
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1261+data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
13361262
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1263+data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
13381264
13391265data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401266
@@ -1346,110 +1272,55 @@ mkWeakPtrWithDebug x debugNote = do
13461272 x' <- evaluate x
13471273 mkWeakPtr x' $
13481274 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1275+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501276 else Nothing
13511277
13521278type WeakList a = [Weak a]
13531279
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−
13811280{-# 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
1281+#ifdef DEBUG
1282+withIncreasedDepth :: CanTrace x m => m a -> m a
1283+withIncreasedDepth a = do
1284+ spiderTimeline <- askSpiderTimelineEnv
1285+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851286 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1287+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871288 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−
14121289#else
1290+withIncreasedDepth :: m a -> m a
1291+withIncreasedDepth = id
1292+#endif
14131293
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1294+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171295
14181296{-# INLINE tracePropagate #-}
14191297tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1298+tracePropagate p = traceWhen p debugPropagate
14211299
14221300{-# INLINE traceInvalidate #-}
14231301traceInvalidate :: 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
1302+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14331303
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 ()
1304+{-# INLINE traceWhen #-}
1305+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1306+traceWhen p b message = traceMWhen p b $ return message
14471307
1308+{-# INLINE traceMWhen #-}
1309+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1310+traceMWhen _ b getMessage = when b $ do
1311+ message <- getMessage
1312+#ifdef DEBUG
1313+ spiderTimeline <- askSpiderTimelineEnv
1314+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1315+#else
1316+ let d = 0
14481317#endif
1318+ liftIO $ putStrLn $ replicate d ' ' <> message
14491319
14501320whoCreatedIORef :: IORef a -> IO [String]
14511321whoCreatedIORef (IORef a) = whoCreated $! a
14521322
1323+#ifdef DEBUG_CYCLES
14531324groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541325groupByHead = \case
14551326 [] -> []
@@ -1460,54 +1331,20 @@ groupByHead = \case
14601331 | otherwise -> (x, xs :| []) : l
14611332
14621333listsToForest :: 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−
1334+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951335#endif
14961336
1497−
14981337{-# INLINE propagateSubscriberHold #-}
14991338propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001339propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1340+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021341 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031342 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051343 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061344 case {-# SCC "apply" #-} apply a v of
15071345 Nothing -> return ()
15081346 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1347+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111348 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121349 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131350 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1352,25 @@ propagateSubscriberHold h a = do
15151352data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161353
15171354runBehaviorM :: 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)
1355+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191356
15201357askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211358askInvalidator = do
1522− (!m, _) <- ask
1359+ (!m, _) <- BehaviorM ask
15231360 case m of
15241361 Nothing -> return Nothing
15251362 Just (!wi, _) -> return $ Just wi
15261363
15271364askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281365askParentsRef = do
1529− (!m, _) <- ask
1366+ (!m, _) <- BehaviorM ask
15301367 case m of
15311368 Nothing -> return Nothing
15321369 Just (_, !p) -> return $ Just p
15331370
15341371askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351372askBehaviorHoldInits = do
1536− (_, !his) <- ask
1373+ (_, !his) <- BehaviorM ask
15371374 return his
15381375
15391376{-# INLINE getDynHold #-}
@@ -1561,7 +1398,7 @@ getDynHold d = do
15611398zeroRef :: IORef Height
15621399zeroRef = unsafePerformIO $ newIORef zeroHeight
15631400
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)
1401+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651402getRootSubscribed k r sub = do
15661403 mSubscribed <- readIORef $ rootSubscribed r
15671404 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1412,9 @@ getRootSubscribed k r sub = do
15751412 let !cached = rootSubscribed r
15761413 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771414 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1415+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811416 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821417 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861418 let !subscribed = RootSubscribed
15871419 { rootSubscribedKey = k
15881420 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1423,7 @@ getRootSubscribed k r sub = do
15911423 , rootSubscribedUninit = uninit
15921424 , rootSubscribedWeakSelf = weakSelf
15931425#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1426+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951427#endif
15961428 }
15971429 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1459,6 @@ data FanInt x a = FanInt
16271459 { _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
16281460 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291461 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331462 }
16341463
16351464newFanInt :: IO (FanInt x a)
@@ -1637,39 +1466,38 @@ newFanInt = do
16371466 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
16381467 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391468 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431469 return $ FanInt
16441470 { _fanInt_subscribers = subscribers
16451471 , _fanInt_subscriptionRef = subscriptionRef
16461472 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501473 }
16511474
1475+{-# NOINLINE unsafeNewFanInt #-}
1476+unsafeNewFanInt :: b -> FanInt x a
1477+unsafeNewFanInt b = unsafePerformIO $ do
1478+ touch b
1479+ newFanInt
1480+
16521481fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1482+fanInt p =
1483+ let self = unsafeNewFanInt p
1484+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561485 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571486 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
1487+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601488 { subscriberPropagate = \m -> do
16611489 liftIO $ writeIORef (_fanInt_occRef self) m
16621490 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 ->
1491+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1492+ FastWeakBag.traverse b $ \s -> do
16651493 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1494+ , subscriberInvalidateHeight = \old -> do
1495+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1496+ FastWeakBag.traverse b $ \s -> do
16691497 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1498+ , subscriberRecalculateHeight = \new -> do
1499+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1500+ FastWeakBag.traverse b $ \s -> do
16731501 subscriberRecalculateHeight s new
16741502 }
16751503 liftIO $ do
@@ -1683,28 +1511,13 @@ fanInt p = unsafePerformIO $ do
16831511 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841512 return b
16851513 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1514+ t <- liftIO $ FastWeakBag.insert sub b
16871515 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−
1516+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1517+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051518
17061519{-# 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))
1520+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081521getFanSubscribed k f sub = do
17091522 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101523 case mSubscribed of
@@ -1722,16 +1535,13 @@ getFanSubscribed k f sub = do
17221535 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231536 occRef <- liftIO $ newIORef parentOcc
17241537 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281538 let subscribed = FanSubscribed
17291539 { fanSubscribedCachedSubscribed = fanSubscribed f
17301540 , fanSubscribedOccurrence = occRef
17311541 , fanSubscribedParent = subscription
17321542 , fanSubscribedSubscribers = subscribersRef
17331543#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1544+ , fanSubscribedNodeId = unsafeNodeId f
17351545#endif
17361546 }
17371547 let !self = (k, subscribed)
@@ -1741,7 +1551,7 @@ getFanSubscribed k f sub = do
17411551 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421552 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431553
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1554+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451555cleanupFanSubscribed (k, subscribed) = do
17461556 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471557 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1563,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531563 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541564
17551565{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1566+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571567subscribeFanSubscribed k subscribed sub = do
17581568 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591569 case DMap.lookup k subscribers of
@@ -1791,9 +1601,6 @@ getSwitchSubscribed s sub = do
17911601 when (isJust parentOcc) $ scheduleClear occRef
17921602 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931603 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971604 let !subscribed = SwitchSubscribed
17981605 { switchSubscribedCachedSubscribed = switchSubscribed s
17991606 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1613,7 @@ getSwitchSubscribed s sub = do
18061613 , switchSubscribedCurrentParent = subscriptionRef
18071614 , switchSubscribedWeakSelf = weakSelf
18081615#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1616+ , switchSubscribedNodeId = unsafeNodeId s
18101617#endif
18111618 }
18121619 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1658,6 @@ getCoincidenceSubscribed c sub = do
18511658 scheduleClear innerSubdRef
18521659 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531660 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571661 let subscribed = CoincidenceSubscribed
18581662 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591663 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1668,7 @@ getCoincidenceSubscribed c sub = do
18641668 , coincidenceSubscribedInnerParent = innerSubdRef
18651669 , coincidenceSubscribedWeakSelf = weakSelf
18661670#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1671+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681672#endif
18691673 }
18701674 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1685,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811685subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821686subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831687
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)
1688+{-# INLINE merge #-}
1689+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1690+merge d = cacheEvent (mergeCheap d)
18891691
18901692{-# 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)
1693+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1694+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951695
18961696{-# 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
1697+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1698+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031699 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1700+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051701 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061702 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071703 (mOldSubd, newPs) <- case me of
19081704 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091705 Just e -> do
19101706 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1707+ subscription@(EventSubscription _ subd) <- subscribe e s
19121708 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131709 let newParent = MergeSubscribedParent subscription
19141710 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151711 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161712 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1713+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201714 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211715 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221716 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1717+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251718 getInitialSubscribers initialParents subscriber = do
19261719 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271720 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1721+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291722 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1723+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311724 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321725 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331726 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341727 )
1935−
19361728 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371729 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381730
19391731{-# 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
1732+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1733+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451734 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1735+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471736 updateMe subscriber heightBagRef oldParents p = do
19481737 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1738+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501739 subscribeParent k e = do
19511740 keyRef <- liftIO $ newIORef k
19521741 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1744,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551744 newParentHeight <- getEventSubscribedHeight subd
19561745 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571746 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1747+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591748 -- 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
1749+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611750 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621751 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1752+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661753 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671754 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681755 Just toKey -> do
19691756 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701757 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1758+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741759 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1760+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761761 getInitialSubscribers initialParents subscriber = do
19771762 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781763 keyRef <- liftIO $ newIORef k
19791764 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1765+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811766 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1767+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831768 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841769 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851770 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861771 )
1987−
19881772 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891773 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901774
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1775+type MergeUpdateFunc k x p s
1776+ = (forall a. EventM x (k a) -> Subscriber x a)
19931777 -> IORef HeightBag
19941778 -> DMap k s
19951779 -> p
19961780 -> EventM x ([EventSubscription x], DMap k s)
19971781
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)
1782+type MergeInitFunc k x s
1783+ = DMap k (Event x)
1784+ -> (forall a. EventM x (k a) -> Subscriber x a)
1785+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041786
20051787type MergeDestroyFunc k s
20061788 = DMap k s
20071789 -> IO ()
20081790
2009−data Merge x k v s = Merge
1791+data Merge x k s = Merge
20101792 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111793 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121794 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1795+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1796+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151797 }
20161798
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1799+invalidateMergeHeight :: Merge x k s -> IO ()
20181800invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191801
20201802invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211803invalidateMergeHeight' heightRef sub = do
20221804 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
1805+ 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
20251806 writeIORef heightRef $! invalidHeight
20261807 subscriberInvalidateHeight sub oldHeight
20271808
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1809+
1810+revalidateMergeHeight :: Merge x k s -> IO ()
20291811revalidateMergeHeight m = do
20301812 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
1813+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341814 heights <- readIORef $ _merge_heightBagRef m
20351815 parents <- readIORef $ _merge_parentsRef m
20361816 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1818,44 @@ revalidateMergeHeight m = do
20381818 LT -> return ()
20391819 EQ -> do
20401820 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1821+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421822 writeIORef (_merge_heightRef m) $! height
20431823 subscriberRecalculateHeight (_merge_sub m) height
20441824 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451825
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1826+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471827scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481828 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
1829+ 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
20521830 --TODO: Assert that m is not empty
20531831 subscriberPropagate (_merge_sub m) vals
20541832
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
1833+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1834+mergeSubscriber m getKey = Subscriber
20781835 { subscriberPropagate = \a -> do
20791836 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801837 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1838+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821839 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831840 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841841 when (DMap.null oldM) $ do -- Only schedule the firing once
20851842 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1843+ --TODO: assertions about height
1844+ currentHeight <- getCurrentHeight
1845+ when (height <= currentHeight) $ do
1846+ if height /= invalidHeight
1847+ then do
1848+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1849+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1850+ else liftIO $ do
1851+#ifdef DEBUG_CYCLES
1852+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1853+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1854+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1855+#else
1856+ let cycleInfo = ""
1857+#endif
1858+ error $ "Causality loop found" <> cycleInfo
20881859 scheduleMergeSelf m height
20891860 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901861 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1866,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951866 }
20961867
20971868--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)
1869+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1870+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001871 where updateMe = do
21011872 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1873+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031874 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041875 return subscriptionsToKill
21051876
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
1877+{-# INLINE mergeCheap' #-}
1878+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)
1879+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101880 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111881 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121882 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131883 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141884 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
1885+ let m = Merge
21301886 { _merge_parentsRef = parentsRef
21311887 , _merge_heightBagRef = heightBagRef
21321888 , _merge_heightRef = heightRef
21331889 , _merge_sub = sub
21341890 , _merge_accumRef = accumRef
21351891 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1892+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371893 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381894 myHeight = if invalidHeight `elem` heights
21391895 then invalidHeight
@@ -2142,57 +1898,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421898 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431899 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441900 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1901+ unless (DMap.null accum) $ do
1902+ scheduleMergeSelf m myHeight
21461903 liftIO $ writeIORef accumRef $! accum
21471904 liftIO $ writeIORef heightRef $! myHeight
21481905 liftIO $ writeIORef heightBagRef $! myHeightBag
1906+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491907 liftIO $ writeIORef parentsRef $! initialParentState
21501908 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1909+ let s = Subscriber
21521910 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1911+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1912+ defer $ updateMerge m updateFunc a
21551913 , subscriberInvalidateHeight = \_ -> return ()
21561914 , subscriberRecalculateHeight = \_ -> return ()
21571915 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1916+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1917+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601918 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611919 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621920 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1921+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641922 let unsubscribeAll = destroy =<< readIORef parentsRef
1923+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1924+ , occ
1925+ )
21651926
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)
1927+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701928mergeInt = cacheEvent . mergeIntCheap
21711929
21721930{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1931+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741932mergeIntCheap d = Event $ \sub -> do
21751933 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761934 accum <- liftIO $ FastMutableIntMap.newEmpty
21771935 heightRef <- liftIO $ newIORef zeroHeight
21781936 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791937 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− }
21901938 let scheduleSelf = do
21911939 height <- liftIO $ readIORef $ heightRef
21921940 scheduleMerge' height heightRef $ do
21931941 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941942 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1943+ invalidateMyHeight = do
1944+ invalidateMergeHeight' heightRef sub
21961945 recalculateMyHeight = do
21971946 currentHeight <- readIORef heightRef
21981947 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 +1951,12 @@ mergeIntCheap d = Event $ \sub -> do
22021951 LT -> return ()
22031952 EQ -> do
22041953 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1954+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061955 writeIORef heightRef $! height
22071956 subscriberRecalculateHeight sub height
22081957 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091958 mySubscriber k = Subscriber
22101959 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131960 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141961 liftIO $ FastMutableIntMap.insert accum k a
22151962 when wasEmpty scheduleSelf
@@ -2243,6 +1990,7 @@ mergeIntCheap d = Event $ \sub -> do
22431990 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22441991 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22451992 return Nothing
1993+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22461994 defer $ SomeMergeInit $ do
22471995 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22481996 where
@@ -2256,39 +2004,35 @@ mergeIntCheap d = Event $ \sub -> do
22562004 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572005 liftIO $ for_ oldParents $ \oldParent -> do
22582006 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612007 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622008 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2009+ let s = Subscriber
22642010 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652011 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662012 defer $ updateMe a
22672013 , subscriberInvalidateHeight = \_ -> return ()
22682014 , subscriberRecalculateHeight = \_ -> return ()
22692015 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2016+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712017 forM_ change $ \c -> defer $ updateMe c
22722018 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732019 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742020 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2021+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762022 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2023+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2024+ , occ
2025+ )
22802026
22812027newtype 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) }
22832028
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2029+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2030+fan e =
22872031 let f = Fan
22882032 { fanParent = e
2289− , fanSubscribed = ref
2033+ , fanSubscribed = unsafeNewIORef e Nothing
22902034 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2035+ in EventSelector $ \k -> eventFan k f
22922036
22932037runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942038runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,36 +2086,36 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422086-- | Run an event action outside of a frame
23432087runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442088runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2089+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462090 let go = do
23472091 result <- a
23482092 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
23492093 return result
23502094 result <- runEventM go
23512095 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2096+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23532097 toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2098+ forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
23552099 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2100+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23572101 toAssign <- readIORef $ eventEnvAssignments env
23582102 toReconnectRef <- newIORef []
23592103 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602104 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612105 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2106+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632107 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642108 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652109 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2110+ when debugPropagate $ putStrLn "Updating merges"
23672111 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2112+ when debugPropagate $ putStrLn "Updating merges done"
23692113 toReconnect <- readIORef toReconnectRef
23702114 clearEventEnv env
23712115 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722116 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732117 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2118+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752119 finalize wi
23762120 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772121 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2129,7 @@ runFrame a = SpiderHost $ do
23852129 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
23862130 {-
23872131 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2132+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892133 EventRoot _ -> "EventRoot"
23902134 EventNever -> "EventNever"
23912135 _ -> "something else"
@@ -2400,7 +2144,7 @@ runFrame a = SpiderHost $ do
24002144 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012145 when (parentHeight /= myHeight) $ do
24022146 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2147+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042148 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
24052149 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062150 unsubscribe subscription
@@ -2441,7 +2185,7 @@ invalidateCoincidenceHeight subscribed = do
24412185 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422186 when (oldHeight /= invalidHeight) $ do
24432187 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2188+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452189
24462190updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472191updateSwitchHeight new subscribed = do
@@ -2449,7 +2193,7 @@ updateSwitchHeight new subscribed = do
24492193 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502194 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512195 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2196+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532197
24542198recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552199recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2202,7 @@ recalculateCoincidenceHeight subscribed = do
24582202 height <- calculateCoincidenceHeight subscribed
24592203 when (height /= invalidHeight) $ do
24602204 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2205+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622206
24632207calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642208calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2264,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202264 {-# INLINABLE headE #-}
25212265 headE = R.slowHeadE
25222266-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252267
25262268instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272269 {-# INLINABLE sample #-}
@@ -2543,9 +2285,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432285 {-# INLINABLE headE #-}
25442286 headE = R.slowHeadE
25452287-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492288
25502289instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512290 {-# INLINE return #-}
@@ -2554,13 +2293,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542293 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552294 {-# INLINE (>>) #-}
25562295 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582296 {-# INLINE fail #-}
25592297 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612298
25622299{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2300+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642301newJoinDyn d =
25652302 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662303 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2570,13 +2307,9 @@ newJoinDyn d =
25702307 in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
25712308
25722309instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2310+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
25742311 x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
25752312
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2579−
25802313instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
25812314 pure = SpiderDynamic . dynamicConst
25822315#if MIN_VERSION_base(4,10,0)
@@ -2609,9 +2342,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092342 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102343 {-# INLINABLE headE #-}
26112344 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152345
26162346instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172347 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2358,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282358 {-# INLINABLE headE #-}
26292359 headE = R.slowHeadE
26302360-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332361
26342362instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352363 {-# INLINABLE sample #-}
@@ -2650,8 +2378,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502378 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512379 {-# INLINABLE headE #-}
26522380 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552381
26562382--------------------------------------------------------------------------------
26572383-- Deprecated items
@@ -2689,13 +2415,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892415 touch h
26902416 return result
26912417
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2418+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932419 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942420 newFanEventWithTrigger f = SpiderHost $ do
26952421 es <- newFanEventWithTriggerIO f
26962422 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972423
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2424+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992425 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002426 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012427 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2443,7 @@ unsafeNewSpiderTimelineEnv = do
27172443#ifdef DEBUG
27182444 depthRef <- newIORef 0
27192445#endif
2720− return $ STE $ SpiderTimelineEnv
2446+ return $ SpiderTimelineEnv
27212447 { _spiderTimeline_lock = lock
27222448 , _spiderTimeline_eventEnv = env
27232449#ifdef DEBUG
@@ -2727,19 +2453,19 @@ unsafeNewSpiderTimelineEnv = do
27272453
27282454-- | Create a new SpiderTimelineEnv
27292455newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2456+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312457
2732−data LocalSpiderTimeline (x :: Type) s
2458+data LocalSpiderTimeline x s
27332459
27342460instance Reifies s (SpiderTimelineEnv x) =>
27352461 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2462+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372463
27382464localSpiderTimeline
2739− :: proxy s
2465+ :: Proxy s
27402466 -> SpiderTimelineEnv x
27412467 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2468+localSpiderTimeline _ = unsafeCoerce
27432469
27442470-- | Pass a new timeline to the given function.
27452471withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2473,18 @@ withSpiderTimeline k = do
27472473 env <- unsafeNewSpiderTimelineEnv
27482474 reify env $ \s -> k $ localSpiderTimeline s env
27492475
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2476+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512477
27522478type ComputeM = EventM
27532479
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2480+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552481
27562482instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572483 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582484 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592485 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 }
2486+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2487+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622488 type PullM (SpiderTimeline x) = SpiderPullM x
27632489 type PushM (SpiderTimeline x) = SpiderPushM x
27642490 {-# INLINABLE never #-}
@@ -2771,15 +2497,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712497 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722498 {-# INLINABLE pull #-}
27732499 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
2500+ {-# INLINABLE merge #-}
2501+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2502+ {-# INLINABLE fan #-}
2503+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832504 {-# INLINABLE switch #-}
27842505 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852506 {-# INLINABLE coincidence #-}
@@ -2787,15 +2508,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872508 {-# INLINABLE current #-}
27882509 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892510 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2511+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912512 {-# INLINABLE unsafeBuildDynamic #-}
27922513 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932514 {-# INLINABLE unsafeBuildIncremental #-}
27942515 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
2516+ {-# INLINABLE mergeIncremental #-}
2517+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2518+ {-# INLINABLE mergeIncrementalWithMove #-}
2519+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992520 {-# INLINABLE currentIncremental #-}
28002521 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012522 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2527,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062527 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072528 eventCoercion Coercion = Coercion
28082529 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2530+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112531 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2532+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132533 {-# INLINABLE fanInt #-}
28142534 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152535
@@ -2834,7 +2554,7 @@ instance MonadAtomicRef (EventM x) where
28342554 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352555
28362556-- | 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)
2557+newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382558
28392559instance Monad (SpiderHost x) where
28402560 {-# INLINABLE (>>=) #-}
@@ -2843,14 +2563,8 @@ instance Monad (SpiderHost x) where
28432563 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442564 {-# INLINABLE return #-}
28452565 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472566 {-# 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
2567+ fail s = SpiderHost $ fail s
28542568
28552569-- | Run an action affecting the global Spider timeline; this will be guarded by
28562570-- a mutex for that timeline
@@ -2862,7 +2576,7 @@ runSpiderHost (SpiderHost a) = a
28622576runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
28632577runSpiderHostForTimeline (SpiderHost a) _ = a
28642578
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2579+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
28662580 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672581
28682582instance Monad (SpiderHostFrame x) where
@@ -2872,21 +2586,19 @@ instance Monad (SpiderHostFrame x) where
28722586 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732587 {-# INLINABLE return #-}
28742588 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762589 {-# INLINABLE fail #-}
28772590 fail s = SpiderHostFrame $ fail s
2878−#endif
28792591
28802592instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812593 notReadyUntil _ = pure ()
28822594 notReady = pure ()
28832595
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2596+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852597newEventWithTriggerIO f = do
28862598 es <- newFanEventWithTriggerIO $ \Refl -> f
28872599 return $ select es Refl
28882600
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2601+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902602newFanEventWithTriggerIO f = do
28912603 occRef <- newIORef DMap.empty
28922604 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2632,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202632instance PrimMonad (SpiderHostFrame x) where
29212633 type PrimState (SpiderHostFrame x) = PrimState IO
29222634 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 ()