@@ -9,6 +9,8 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
1214{-# LANGUAGE RankNTypes #-}
1315{-# LANGUAGE RoleAnnotations #-}
1416{-# LANGUAGE ScopedTypeVariables #-}
@@ -16,11 +18,7 @@
1618{-# LANGUAGE TypeOperators #-}
1719{-# LANGUAGE UndecidableInstances #-}
1820{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
2121{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2422#ifdef USE_REFLEX_OPTIMIZER
2523{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2624#endif
@@ -38,17 +36,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
3836import Control.Monad.Exception
3937import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
4038import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
39+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
4440import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4741import Data.Align
4842import Data.Coerce
49−import Data.Dependent.Map (DMap)
43+import Data.Dependent.Map (DMap, DSum (..))
5044import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5245import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5346import qualified Data.FastMutableIntMap as FastMutableIntMap
5447import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +54,12 @@ import qualified Data.IntMap.Strict as IntMap
6154import Data.IORef
6255import Data.Kind (Type)
6356import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
57+import Data.Monoid ((<>))
6558import Data.Proxy
6659import Data.These
6760import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
6961import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
62+import GHC.Exts
7163import GHC.IORef (IORef (..))
7264import GHC.Stack
7365import Reflex.FastWeak
@@ -75,27 +67,16 @@ import System.IO.Unsafe
7567import System.Mem.Weak
7668import Unsafe.Coerce
7769
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−
8770#ifdef DEBUG_CYCLES
8871import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9172import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9273import qualified Data.List.NonEmpty as NonEmpty
74+import Data.Monoid (mempty)
9375import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
76+#endif
9577
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
78+import Data.FastWeakBag (FastWeakBag)
9779import qualified Data.FastWeakBag as FastWeakBag
98−
9980import Data.Reflection
10081import Data.Some (Some(Some))
10182import Data.Type.Coercion
@@ -106,26 +87,20 @@ import qualified Reflex.Class
10687import qualified Reflex.Class as R
10788import qualified Reflex.Host.Class
10889import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
90+import Reflex.Patch
91+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
11292
11393#ifdef DEBUG_TRACE_EVENTS
11494import qualified Data.ByteString.Char8 as BS8
11595import System.IO (stderr)
116−import Data.List (isPrefixOf)
11796#endif
11897
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12398#ifdef DEBUG_TRACE_EVENTS
99+
124100withStackOneLine :: (BS8.ByteString -> a) -> a
125101withStackOneLine expr = unsafePerformIO $ do
126102 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
103+ return (expr (BS8.pack (unwords (reverse stack))))
129104
130105#endif
131106
@@ -136,42 +111,28 @@ debugInvalidateHeight :: Bool
136111debugInvalidate :: Bool
137112
138113#ifdef DEBUG
114+
139115#define DEBUG_NODEIDS
140116
141−#ifdef DEBUG_TRACE_PROPAGATION
142117debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146118
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150119debugInvalidateHeight = False
151−#endif
152120
153−#ifdef DEBUG_TRACE_INVALIDATION
154121debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158122
159123class HasNodeId a where
160124 getNodeId :: a -> Int
161125
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
126+instance HasNodeId (Hold x p a) where
169127 getNodeId = holdNodeId
170128
129+instance HasNodeId (PushSubscribed x a b) where
130+ getNodeId = pushSubscribedNodeId
131+
171132instance HasNodeId (SwitchSubscribed x a) where
172133 getNodeId = switchSubscribedNodeId
173134
174−instance HasNodeId (FanSubscribed x v a) where
135+instance HasNodeId (FanSubscribed x a) where
175136 getNodeId = fanSubscribedNodeId
176137
177138instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +146,41 @@ instance HasNodeId (Pull x a) where
185146
186147{-# INLINE showNodeId #-}
187148showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
149+showNodeId = ("#"<>) . show . getNodeId
150+
151+showSubscriberType :: Subscriber x a -> String
152+showSubscriberType = \case
153+ SubscriberPush _ _ -> "SubscriberPush"
154+ SubscriberMerge _ _ -> "SubscriberMerge"
155+ SubscriberFan _ -> "SubscriberFan"
156+ SubscriberMergeChange _ -> "SubscriberMergeChange"
157+ SubscriberHold _ -> "SubscriberHold"
158+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
159+ SubscriberSwitch _ -> "SubscriberSwitch"
160+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
161+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
162+ SubscriberHandle -> "SubscriberHandle"
163+
164+showEventType :: Event x a -> String
165+showEventType = \case
166+ EventRoot _ _ -> "EventRoot"
167+ EventNever -> "EventNever"
168+ EventPush _ -> "EventPush"
169+ EventMerge _ -> "EventMerge"
170+ EventFan _ _ -> "EventFan"
171+ EventSwitch _ -> "EventSwitch"
172+ EventCoincidence _ -> "EventCoincidence"
173+ EventHold _ -> "EventHold"
174+ EventDyn _ -> "EventDyn"
175+ EventHoldIdentity _ -> "EventHoldIdentity"
176+ EventDynIdentity _ -> "EventDynIdentity"
193177
194178#else
195179
196180debugPropagate = False
181+
197182debugInvalidateHeight = False
183+
198184debugInvalidate = False
199185
200186-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +188,6 @@ debugInvalidate = False
202188showNodeId :: a -> String
203189showNodeId _ = ""
204190
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209191#endif
210192
211193#ifdef DEBUG_NODEIDS
@@ -215,6 +197,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215197
216198newNodeId :: IO Int
217199newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
200+
201+{-# NOINLINE unsafeNodeId #-}
202+unsafeNodeId :: a -> Int
203+unsafeNodeId a = unsafePerformIO $ do
204+ touch a
205+ newNodeId
218206#endif
219207
220208--------------------------------------------------------------------------------
@@ -251,9 +239,9 @@ subscribeAndRead = unEvent
251239-- caching; if the computation function is very cheap, this is (much) more
252240-- efficient than 'push'
253241{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
242+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255243pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
244+ (subscription, occ) <- subscribeAndRead e $ sub
257245 { subscriberPropagate = \a -> do
258246 mb <- f a
259247 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +260,10 @@ terminalSubscriber p = Subscriber
272260
273261-- | Subscribe to an Event only for the duration of one occurrence
274262{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
263+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276264subscribeAndReadHead e sub = do
277265 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
266+ (subscription, occ) <- subscribeAndRead e $ sub
279267 { subscriberPropagate = \a -> do
280268 liftIO $ unsubscribe =<< readIORef subscriptionRef
281269 subscriberPropagate sub a
@@ -286,42 +274,24 @@ subscribeAndReadHead e sub = do
286274 return (subscription, occ)
287275
288276--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
277+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290278headE originalE = do
291279 parent <- liftIO $ newIORef $ Just originalE
292280 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293281 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
282+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295283 when (isJust occ) clearParent
296− return $ Event $ \sub ->
284+ return $ Event $ \sub -> do
297285 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
286+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299287 Just e -> subscribeAndReadHead e sub
300288
301289data CacheSubscribed x a
302290 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303291 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304292 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308293 }
309294
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
311−nowSpiderEventM =
312− SpiderEvent <$> now
313−
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
315− ) => m (Event x ())
316−now = do
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
322− , occ
323− )
324−
325295-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326296-- repeatedly
327297--
@@ -336,33 +306,27 @@ cacheEvent e =
336306#else
337307 Event $
338308#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
309+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
310+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
311+ in \sub -> {-# SCC "cacheEvent" #-} do
343312#ifdef DEBUG_TRACE_EVENTS
344313 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345314#endif
346315 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347316 Just subscribedTicket -> return subscribedTicket
348317 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352318 subscribers <- liftIO FastWeakBag.empty
353319 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
357320 (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− }
321+ { subscriberPropagate = \a -> do
322+ liftIO $ writeIORef occRef $ Just a
323+ scheduleClear occRef
324+ propagateFast a subscribers
325+ , subscriberInvalidateHeight = \old -> do
326+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
327+ , subscriberRecalculateHeight = \new -> do
328+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
329+ }
366330 when (isJust occ) $ do
367331 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368332 scheduleClear occRef
@@ -370,45 +334,29 @@ cacheEvent e =
370334 { _cacheSubscribed_subscribers = subscribers
371335 , _cacheSubscribed_parent = parentSub
372336 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376337 }
377338 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378339 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379340 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−
341+ liftIO $ do
342+ subscribed <- getFastWeakTicketValue subscribedTicket
343+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
344+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
345+ let es = EventSubscription
346+ { _eventSubscription_unsubscribe = do
347+ FastWeakBag.remove ticket
348+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
349+ when isEmpty $ do
350+ writeIORef mSubscribedRef emptyFastWeak
351+ unsubscribe $ _cacheSubscribed_parent subscribed
352+ touch ticket
353+ touch subscribedTicket
354+ , _eventSubscription_subscribed = EventSubscribed
355+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
356+ , eventSubscribedRetained = toAny subscribedTicket
357+ }
358+ }
359+ return (es, occ)
412360
413361subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414362subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +368,13 @@ wrap tag getSpecificSubscribed sub = do
420368 let es = tag subd
421369 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422370
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
371+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424372eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425373
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429374eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
375+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431376
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
377+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433378eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434379
435380eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +409,16 @@ data Subscriber x a = Subscriber
464409 , subscriberRecalculateHeight :: !(Height -> IO ())
465410 }
466411
412+--TODO: Move this comment to WeakBag
413+-- These function are constructor functions that are marked NOINLINE so they are
414+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
415+-- so any weak references that are attached to the constructors will have their
416+-- finalizer run. Using the opaque constructor, does not see the
417+-- constructor application, so it behaves like an IORef and cannot be fused away.
418+--
419+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
420+-- the weak pointer to it in some cases.
421+
467422newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468423newSubscriberHold h = return $ Subscriber
469424 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +426,85 @@ newSubscriberHold h = return $ Subscriber
471426 , subscriberRecalculateHeight = \_ -> return ()
472427 }
473428
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
429+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
430+newSubscriberFan subscribed = return $ Subscriber
476431 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477432 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
433+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479434 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480435 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
436+ let f _ (Pair (Identity v) subsubs) = do
482437 propagate v $ _fanSubscribedChildren_list subsubs
483438 return $ Constant ()
484439 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485440 return ()
486441 , subscriberInvalidateHeight = \old -> do
442+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487443 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
444+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
445+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489446 , subscriberRecalculateHeight = \new -> do
447+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490448 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
449+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
450+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492451 }
493452
494453newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
454+newSubscriberSwitch subscribed = return $ Subscriber
496455 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
456+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497457 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498458 scheduleClear $ switchSubscribedOccurrence subscribed
499459 propagate a $ switchSubscribedSubscribers subscribed
500460 , subscriberInvalidateHeight = \_ -> do
461+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501462 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502463 when (oldHeight /= invalidHeight) $ do
503464 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
465+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
466+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
467+ , subscriberRecalculateHeight = \new -> do
468+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
469+ updateSwitchHeight new subscribed
470+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
471+ }
507472
508473newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
474+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510475 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
476+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511477 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512478 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513479 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514480 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515481 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517482 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518483 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519484 case occ of
520− Nothing ->
485+ Nothing -> do
521486 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522487 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
488+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
489+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525490 Just o -> do -- Since it's already firing, no need to adjust height
526491 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527492 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528493 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
494+ , subscriberInvalidateHeight = \_ -> do
495+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
496+ invalidateCoincidenceHeight subscribed
497+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
498+ , subscriberRecalculateHeight = \_ -> do
499+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
500+ recalculateCoincidenceHeight subscribed
501+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531502 }
532503
533504newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
505+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535506 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
507+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536508 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537509 case occ of
538510 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +512,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540512 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541513 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542514 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
515+ , subscriberInvalidateHeight = \_ -> do
516+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
517+ invalidateCoincidenceHeight subscribed
518+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
519+ , subscriberRecalculateHeight = \_ -> do
520+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
521+ recalculateCoincidenceHeight subscribed
522+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545523 }
546524
547525invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +529,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551529recalculateSubscriberHeight = flip subscriberRecalculateHeight
552530
553531-- | 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) $
532+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
533+propagate a subscribers = withIncreasedDepth $ do
556534 -- 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
557535 --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
536+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559537
560538-- | 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) $
539+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
540+propagateFast a subscribers = withIncreasedDepth $ do
563541 -- 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
564542 --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
543+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566544
567545--------------------------------------------------------------------------------
568546-- EventSubscribed
@@ -571,16 +549,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571549toAny :: a -> Any
572550toAny = unsafeCoerce
573551
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.
579552data EventSubscribed x = EventSubscribed
580553 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581554 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582555#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
556+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584557 , eventSubscribedHasOwnHeightRef :: !Bool
585558 , eventSubscribedWhoCreated :: !(IO [String])
586559#endif
@@ -607,23 +580,13 @@ eventSubscribedNever = EventSubscribed
607580 , eventSubscribedWhoCreated = return ["never"]
608581#endif
609582 }
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− }
620583
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
584+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622585eventSubscribedFan !subscribed = EventSubscribed
623586 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624587 , eventSubscribedRetained = toAny subscribed
625588#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
589+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627590 , eventSubscribedHasOwnHeightRef = False
628591 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629592#endif
@@ -636,7 +599,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636599#ifdef DEBUG_CYCLES
637600 , eventSubscribedGetParents = do
638601 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
602+ return [Some $ _eventSubscription_subscribed s]
640603 , eventSubscribedHasOwnHeightRef = True
641604 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642605#endif
@@ -649,8 +612,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649612#ifdef DEBUG_CYCLES
650613 , eventSubscribedGetParents = do
651614 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
615+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
616+ innerParents = maybeToList $ fmap Some innerSubscription
654617 return $ outerParent : innerParents
655618 , eventSubscribedHasOwnHeightRef = True
656619 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +627,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664627whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665628whoCreatedEventSubscribed = eventSubscribedWhoCreated
666629
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
630+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668631walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
632+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670633 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671634 when (h == invalidHeight) $ do
672635 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
636+ modify (Some s :)
674637 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
638+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676639 return subscribers
677640#endif
678641
@@ -709,7 +672,7 @@ behaviorPull !p = Behavior $ do
709672 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710673 parentsRef <- liftIO $ newIORef []
711674 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
675+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713676 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714677 parents <- liftIO $ readIORef parentsRef
715678 let subscribed = PullSubscribed
@@ -744,46 +707,42 @@ readBehaviorUntracked b = do
744707-- Dynamic
745708--------------------------------------------------------------------------------
746709
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
710+data Dynamic x p = Dynamic
711+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751712 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
752713 }
753714
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
715+dynamicHold :: Hold x p -> Dynamic x p
760716dynamicHold !h = Dynamic
761717 { dynamicCurrent = behaviorHold h
762718 , dynamicUpdated = eventHold h
763719 }
764720
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
721+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766722dynamicHoldIdentity = dynamicHold
767723
768−dynamicConst :: PatchTarget p -> DynamicS x p
724+dynamicConst :: PatchTarget p -> Dynamic x p
769725dynamicConst !a = Dynamic
770726 { dynamicCurrent = behaviorConst a
771727 , dynamicUpdated = eventNever
772728 }
773729
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
730+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775731dynamicDyn !d = Dynamic
776732 { dynamicCurrent = behaviorDyn d
777733 , dynamicUpdated = eventDyn d
778734 }
779735
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
736+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781737dynamicDynIdentity = dynamicDyn
782738
783739--------------------------------------------------------------------------------
784740-- Combinators
785741--------------------------------------------------------------------------------
786742
743+--TODO: Figure out why certain things are not 'representational', then make them
744+--representational so we can use coerce
745+
787746--type role Hold representational
788747data Hold x p
789748 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +763,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804763
805764-- | Stores all global data relevant to a particular Spider timeline; only one
806765-- 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
766+data SpiderTimelineEnv x = SpiderTimelineEnv
813767 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814768 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815769#ifdef DEBUG
816770 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817771#endif
818772 }
819−type role SpiderTimelineEnv' phantom
773+type role SpiderTimelineEnv nominal
820774
821775instance Eq (SpiderTimelineEnv x) where
822776 _ == _ = True -- Since only one exists of each type
823777
824778instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
779+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826780 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827781 else Nothing
828782
@@ -845,7 +799,7 @@ runEventM :: EventM x a -> IO a
845799runEventM = unEventM
846800
847801asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
802+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849803
850804class MonadIO m => Defer a m where
851805 getDeferralQueue :: m (IORef [a])
@@ -983,9 +937,9 @@ getHoldEventSubscription h = do
983937
984938type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985939
940+--type role BehaviorM representational
986941-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
942+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989943
990944instance Monad (BehaviorM x) where
991945 {-# INLINE (>>=) #-}
@@ -994,10 +948,8 @@ instance Monad (BehaviorM x) where
994948 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995949 {-# INLINE return #-}
996950 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998951 {-# INLINE fail #-}
999952 fail s = BehaviorM $ fail s
1000−#endif
1001953
1002954data BehaviorSubscribed x a
1003955 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +990,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038990#endif
1039991 }
1040992
1041−data Root x k
993+data Root x (k :: * -> *)
1042994 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043995 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044996 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1009,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571009newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581010
10591011-- 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)
1012+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
10611013
10621014newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631015
@@ -1082,8 +1034,7 @@ heightBagFromList :: [Height] -> HeightBag
10821034heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831035
10841036heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1037+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871038
10881039heightBagRemove :: Height -> HeightBag -> HeightBag
10891040heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1043,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921043 0 -> IntMap.delete h c
10931044 _ -> IntMap.insert h (pred old) c
10941045
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−
11021046heightBagMax :: HeightBag -> Height
11031047heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041048 Just ((h, _), _) -> Height h
@@ -1116,25 +1060,25 @@ heightBagVerify b@(HeightBag s c) = if
11161060heightBagVerify = id
11171061#endif
11181062
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)))
1063+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1064+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1065+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1066+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231067 }
11241068
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
1069+data FanSubscribed (x :: *) k
1070+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1071+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1072+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291073 , fanSubscribedParent :: !(EventSubscription x)
11301074#ifdef DEBUG_NODEIDS
11311075 , fanSubscribedNodeId :: Int
11321076#endif
11331077 }
11341078
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1079+data Fan x k
1080+ = Fan { fanParent :: !(Event x (DMap k Identity))
1081+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381082 }
11391083
11401084data SwitchSubscribed x a
@@ -1199,24 +1143,17 @@ instance HasSpiderTimeline x => Semialign (Event x) where
11991143 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
12001144 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011145
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
1208−
12091146data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
12101147 | BuildDyn !(EventM x (PatchTarget p), Event x p)
12111148 | HoldDyn !(Hold x p)
12121149
12131150newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
12141151
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1152+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161153newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171154
12181155--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)
1156+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201157zipDynWith f da db =
12211158 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221159 ec = flip push eab $ \o -> do
@@ -1239,12 +1176,18 @@ buildDynamic readV0 v' = do
12391176 return d
12401177
12411178unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1179+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1180+ where x = (readV0, v')
12441181
12451182-- ResultM can read behaviors and events
12461183type ResultM = EventM
12471184
1185+{-# NOINLINE unsafeNewIORef #-}
1186+unsafeNewIORef :: a -> b -> IORef b
1187+unsafeNewIORef a b = unsafePerformIO $ do
1188+ touch a
1189+ newIORef b
1190+
12481191instance HasSpiderTimeline x => Functor (Event x) where
12491192 fmap f = push $ return . Just . f
12501193
@@ -1257,42 +1200,33 @@ push f e = cacheEvent (pushCheap f e)
12571200
12581201{-# INLINABLE pull #-}
12591202pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1203+pull a = behaviorPull $ Pull
1204+ { pullCompute = a
1205+ , pullValue = unsafeNewIORef a Nothing
12621206#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1207+ , pullNodeId = unsafeNodeId a
12641208#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1268−#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1270−#endif
1271− }
1209+ }
12721210
12731211{-# INLINABLE switch #-}
12741212switch :: 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− }
1213+switch a = eventSwitch $ Switch
1214+ { switchParent = a
1215+ , switchSubscribed = unsafeNewIORef a Nothing
1216+ }
12811217
12821218coincidence :: 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− }
1219+coincidence a = eventCoincidence $ Coincidence
1220+ { coincidenceParent = a
1221+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1222+ }
12891223
12901224-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911225run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921226run roots after = do
12931227 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
12941228 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1229+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
12961230 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971231 occBefore <- liftIO $ do
12981232 occBefore <- readIORef occRef
@@ -1346,110 +1280,55 @@ mkWeakPtrWithDebug x debugNote = do
13461280 x' <- evaluate x
13471281 mkWeakPtr x' $
13481282 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1283+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501284 else Nothing
13511285
13521286type WeakList a = [Weak a]
13531287
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−
13811288{-# 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
1289+#ifdef DEBUG
1290+withIncreasedDepth :: CanTrace x m => m a -> m a
1291+withIncreasedDepth a = do
1292+ spiderTimeline <- askSpiderTimelineEnv
1293+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851294 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1295+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871296 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−
14121297#else
1298+withIncreasedDepth :: m a -> m a
1299+withIncreasedDepth = id
1300+#endif
14131301
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1302+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171303
14181304{-# INLINE tracePropagate #-}
14191305tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1306+tracePropagate p = traceWhen p debugPropagate
14211307
14221308{-# INLINE traceInvalidate #-}
14231309traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1310+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14251311
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
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1312+{-# INLINE traceWhen #-}
1313+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1314+traceWhen p b message = traceMWhen p b $ return message
14471315
1316+{-# INLINE traceMWhen #-}
1317+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1318+traceMWhen _ b getMessage = when b $ do
1319+ message <- getMessage
1320+#ifdef DEBUG
1321+ spiderTimeline <- askSpiderTimelineEnv
1322+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1323+#else
1324+ let d = 0
14481325#endif
1326+ liftIO $ putStrLn $ replicate d ' ' <> message
14491327
14501328whoCreatedIORef :: IORef a -> IO [String]
14511329whoCreatedIORef (IORef a) = whoCreated $! a
14521330
1331+#ifdef DEBUG_CYCLES
14531332groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541333groupByHead = \case
14551334 [] -> []
@@ -1460,54 +1339,20 @@ groupByHead = \case
14601339 | otherwise -> (x, xs :| []) : l
14611340
14621341listsToForest :: 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
1342+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14741343#endif
14751344
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1495−#endif
1496−
1497−
14981345{-# INLINE propagateSubscriberHold #-}
14991346propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001347propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1348+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021349 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031350 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051351 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061352 case {-# SCC "apply" #-} apply a v of
15071353 Nothing -> return ()
15081354 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1355+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111356 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121357 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131358 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1360,25 @@ propagateSubscriberHold h a = do
15151360data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161361
15171362runBehaviorM :: 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)
1363+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191364
15201365askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211366askInvalidator = do
1522− (!m, _) <- ask
1367+ (!m, _) <- BehaviorM ask
15231368 case m of
15241369 Nothing -> return Nothing
15251370 Just (!wi, _) -> return $ Just wi
15261371
15271372askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281373askParentsRef = do
1529− (!m, _) <- ask
1374+ (!m, _) <- BehaviorM ask
15301375 case m of
15311376 Nothing -> return Nothing
15321377 Just (_, !p) -> return $ Just p
15331378
15341379askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351380askBehaviorHoldInits = do
1536− (_, !his) <- ask
1381+ (_, !his) <- BehaviorM ask
15371382 return his
15381383
15391384{-# INLINE getDynHold #-}
@@ -1561,7 +1406,7 @@ getDynHold d = do
15611406zeroRef :: IORef Height
15621407zeroRef = unsafePerformIO $ newIORef zeroHeight
15631408
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)
1409+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651410getRootSubscribed k r sub = do
15661411 mSubscribed <- readIORef $ rootSubscribed r
15671412 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1420,9 @@ getRootSubscribed k r sub = do
15751420 let !cached = rootSubscribed r
15761421 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771422 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1423+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811424 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821425 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861426 let !subscribed = RootSubscribed
15871427 { rootSubscribedKey = k
15881428 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1431,7 @@ getRootSubscribed k r sub = do
15911431 , rootSubscribedUninit = uninit
15921432 , rootSubscribedWeakSelf = weakSelf
15931433#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1434+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951435#endif
15961436 }
15971437 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1467,6 @@ data FanInt x a = FanInt
16271467 { _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
16281468 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291469 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331470 }
16341471
16351472newFanInt :: IO (FanInt x a)
@@ -1637,39 +1474,38 @@ newFanInt = do
16371474 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
16381475 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391476 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431477 return $ FanInt
16441478 { _fanInt_subscribers = subscribers
16451479 , _fanInt_subscriptionRef = subscriptionRef
16461480 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501481 }
16511482
1483+{-# NOINLINE unsafeNewFanInt #-}
1484+unsafeNewFanInt :: b -> FanInt x a
1485+unsafeNewFanInt b = unsafePerformIO $ do
1486+ touch b
1487+ newFanInt
1488+
16521489fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1490+fanInt p =
1491+ let self = unsafeNewFanInt p
1492+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561493 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571494 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
1495+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601496 { subscriberPropagate = \m -> do
16611497 liftIO $ writeIORef (_fanInt_occRef self) m
16621498 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 ->
1499+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1500+ FastWeakBag.traverse b $ \s -> do
16651501 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1502+ , subscriberInvalidateHeight = \old -> do
1503+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1504+ FastWeakBag.traverse b $ \s -> do
16691505 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1506+ , subscriberRecalculateHeight = \new -> do
1507+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1508+ FastWeakBag.traverse b $ \s -> do
16731509 subscriberRecalculateHeight s new
16741510 }
16751511 liftIO $ do
@@ -1683,28 +1519,13 @@ fanInt p = unsafePerformIO $ do
16831519 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841520 return b
16851521 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1522+ t <- liftIO $ FastWeakBag.insert sub b
16871523 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−
1524+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1525+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051526
17061527{-# 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))
1528+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081529getFanSubscribed k f sub = do
17091530 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101531 case mSubscribed of
@@ -1722,16 +1543,13 @@ getFanSubscribed k f sub = do
17221543 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231544 occRef <- liftIO $ newIORef parentOcc
17241545 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281546 let subscribed = FanSubscribed
17291547 { fanSubscribedCachedSubscribed = fanSubscribed f
17301548 , fanSubscribedOccurrence = occRef
17311549 , fanSubscribedParent = subscription
17321550 , fanSubscribedSubscribers = subscribersRef
17331551#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1552+ , fanSubscribedNodeId = unsafeNodeId f
17351553#endif
17361554 }
17371555 let !self = (k, subscribed)
@@ -1741,7 +1559,7 @@ getFanSubscribed k f sub = do
17411559 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421560 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431561
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1562+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451563cleanupFanSubscribed (k, subscribed) = do
17461564 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471565 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1571,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531571 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541572
17551573{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1574+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571575subscribeFanSubscribed k subscribed sub = do
17581576 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591577 case DMap.lookup k subscribers of
@@ -1791,9 +1609,6 @@ getSwitchSubscribed s sub = do
17911609 when (isJust parentOcc) $ scheduleClear occRef
17921610 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931611 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971612 let !subscribed = SwitchSubscribed
17981613 { switchSubscribedCachedSubscribed = switchSubscribed s
17991614 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1621,7 @@ getSwitchSubscribed s sub = do
18061621 , switchSubscribedCurrentParent = subscriptionRef
18071622 , switchSubscribedWeakSelf = weakSelf
18081623#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1624+ , switchSubscribedNodeId = unsafeNodeId s
18101625#endif
18111626 }
18121627 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1666,6 @@ getCoincidenceSubscribed c sub = do
18511666 scheduleClear innerSubdRef
18521667 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531668 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571669 let subscribed = CoincidenceSubscribed
18581670 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591671 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1676,7 @@ getCoincidenceSubscribed c sub = do
18641676 , coincidenceSubscribedInnerParent = innerSubdRef
18651677 , coincidenceSubscribedWeakSelf = weakSelf
18661678#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1679+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681680#endif
18691681 }
18701682 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1884,22 +1696,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
18841696{-# INLINE mergeG #-}
18851697mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
18861698 => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1699+ -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
18881700mergeG nt d = cacheEvent (mergeCheap nt d)
18891701
18901702{-# INLINE mergeWithMove #-}
18911703mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
18921704 => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1705+ -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
18941706mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
18951707
18961708{-# INLINE [1] mergeCheap #-}
18971709mergeCheap
18981710 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
18991711 => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1712+ -> Dynamic x (PatchDMap k q)
19011713 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1714+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
19031715 where
19041716 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
19051717 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1726,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19141726 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151727 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161728 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1729+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201730 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211731 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221732 foldM f ([], oldParents) $ DMap.toList p
@@ -1927,7 +1737,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19271737 let s = subscriber $ return k
19281738 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19291739 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1740+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311741 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321742 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331743 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1939,9 +1749,9 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
19391749{-# INLINE [1] mergeCheapWithMove #-}
19401750mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
19411751 => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1752+ -> Dynamic x (PatchDMapWithMove k q)
19431753 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1754+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
19451755 where
19461756 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
19471757 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1770,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19601770 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611771 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621772 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1773+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661774 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671775 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681776 Just toKey -> do
19691777 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701778 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1779+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741780 return (toDelete, applyAlways p' oldParents)
19751781 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
19761782 getInitialSubscribers initialParents subscriber = do
@@ -1979,7 +1785,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19791785 let s = subscriber $ liftIO $ readIORef keyRef
19801786 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
19811787 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1788+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831789 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841790 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851791 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1995,8 +1801,6 @@ type MergeUpdateFunc k v x p s
19951801 -> p
19961802 -> EventM x ([EventSubscription x], DMap k s)
19971803
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
20001804type MergeInitFunc k v q x s
20011805 = DMap k q
20021806 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1824,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
20201824invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211825invalidateMergeHeight' heightRef sub = do
20221826 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
1827+ 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
20251828 writeIORef heightRef $! invalidHeight
20261829 subscriberInvalidateHeight sub oldHeight
20271830
20281831revalidateMergeHeight :: Merge x k v s -> IO ()
20291832revalidateMergeHeight m = do
20301833 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
1834+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341835 heights <- readIORef $ _merge_heightBagRef m
20351836 parents <- readIORef $ _merge_parentsRef m
20361837 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1839,7 @@ revalidateMergeHeight m = do
20381839 LT -> return ()
20391840 EQ -> do
20401841 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1842+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421843 writeIORef (_merge_heightRef m) $! height
20431844 subscriberRecalculateHeight (_merge_sub m) height
20441845 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1847,36 @@ revalidateMergeHeight m = do
20461847scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
20471848scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481849 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
1850+ 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
20521851 --TODO: Assert that m is not empty
20531852 subscriberPropagate (_merge_sub m) vals
20541853
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
1854+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
1855+mergeSubscriber m getKey = Subscriber
20781856 { subscriberPropagate = \a -> do
20791857 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801858 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1859+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
20821860 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831861 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841862 when (DMap.null oldM) $ do -- Only schedule the firing once
20851863 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1864+ --TODO: assertions about height
1865+ currentHeight <- getCurrentHeight
1866+ when (height <= currentHeight) $ do
1867+ if height /= invalidHeight
1868+ then do
1869+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1870+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1871+ else liftIO $ do
1872+#ifdef DEBUG_CYCLES
1873+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1874+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1875+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1876+#else
1877+ let cycleInfo = ""
1878+#endif
1879+ error $ "Causality loop found" <> cycleInfo
20881880 scheduleMergeSelf m height
20891881 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901882 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1887,31 @@ mergeSubscriber subscribed m getKey = Subscriber
20951887 }
20961888
20971889--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)
1890+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
1891+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001892 where updateMe = do
21011893 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1894+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031895 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041896 return subscriptionsToKill
21051897
21061898{-# INLINE mergeGCheap' #-}
21071899mergeGCheap' :: 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
1900+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
1901+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101902 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111903 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121904 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131905 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141906 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
1907+ let m = Merge
21301908 { _merge_parentsRef = parentsRef
21311909 , _merge_heightBagRef = heightBagRef
21321910 , _merge_heightRef = heightRef
21331911 , _merge_sub = sub
21341912 , _merge_accumRef = accumRef
21351913 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1914+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371915 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381916 myHeight = if invalidHeight `elem` heights
21391917 then invalidHeight
@@ -2142,57 +1920,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421920 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431921 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441922 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1923+ unless (DMap.null accum) $ do
1924+ scheduleMergeSelf m myHeight
21461925 liftIO $ writeIORef accumRef $! accum
21471926 liftIO $ writeIORef heightRef $! myHeight
21481927 liftIO $ writeIORef heightBagRef $! myHeightBag
1928+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491929 liftIO $ writeIORef parentsRef $! initialParentState
21501930 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1931+ let s = Subscriber
21521932 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1933+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1934+ defer $ updateMerge m updateFunc a
21551935 , subscriberInvalidateHeight = \_ -> return ()
21561936 , subscriberRecalculateHeight = \_ -> return ()
21571937 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1938+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1939+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601940 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611941 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621942 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1943+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641944 let unsubscribeAll = destroy =<< readIORef parentsRef
1945+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1946+ , occ
1947+ )
21651948
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)
1949+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701950mergeInt = cacheEvent . mergeIntCheap
21711951
21721952{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1953+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741954mergeIntCheap d = Event $ \sub -> do
21751955 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761956 accum <- liftIO $ FastMutableIntMap.newEmpty
21771957 heightRef <- liftIO $ newIORef zeroHeight
21781958 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791959 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− }
21901960 let scheduleSelf = do
21911961 height <- liftIO $ readIORef $ heightRef
21921962 scheduleMerge' height heightRef $ do
21931963 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941964 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1965+ invalidateMyHeight = do
1966+ invalidateMergeHeight' heightRef sub
21961967 recalculateMyHeight = do
21971968 currentHeight <- readIORef heightRef
21981969 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 +1973,12 @@ mergeIntCheap d = Event $ \sub -> do
22021973 LT -> return ()
22031974 EQ -> do
22041975 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1976+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061977 writeIORef heightRef $! height
22071978 subscriberRecalculateHeight sub height
22081979 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091980 mySubscriber k = Subscriber
22101981 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131982 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141983 liftIO $ FastMutableIntMap.insert accum k a
22151984 when wasEmpty scheduleSelf
@@ -2243,6 +2012,7 @@ mergeIntCheap d = Event $ \sub -> do
22432012 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442013 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452014 return Nothing
2015+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462016 defer $ SomeMergeInit $ do
22472017 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482018 where
@@ -2256,39 +2026,35 @@ mergeIntCheap d = Event $ \sub -> do
22562026 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572027 liftIO $ for_ oldParents $ \oldParent -> do
22582028 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612029 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622030 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2031+ let s = Subscriber
22642032 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652033 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662034 defer $ updateMe a
22672035 , subscriberInvalidateHeight = \_ -> return ()
22682036 , subscriberRecalculateHeight = \_ -> return ()
22692037 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2038+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712039 forM_ change $ \c -> defer $ updateMe c
22722040 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732041 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742042 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2043+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762044 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2045+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2046+ , occ
2047+ )
22802048
22812049newtype 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) }
22832050
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2051+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2052+fan e =
22872053 let f = Fan
22882054 { fanParent = e
2289− , fanSubscribed = ref
2055+ , fanSubscribed = unsafeNewIORef e Nothing
22902056 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2057+ in EventSelector $ \k -> eventFan k f
22922058
22932059runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942060runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2108,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23422108-- | Run an event action outside of a frame
23432109runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
23442110runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2111+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462112 let go = do
23472113 result <- a
23482114 runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
@@ -2359,19 +2125,19 @@ runFrame a = SpiderHost $ do
23592125 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602126 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612127 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2128+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632129 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642130 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652131 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2132+ when debugPropagate $ putStrLn "Updating merges"
23672133 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2134+ when debugPropagate $ putStrLn "Updating merges done"
23692135 toReconnect <- readIORef toReconnectRef
23702136 clearEventEnv env
23712137 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722138 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732139 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2140+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752141 finalize wi
23762142 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772143 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2151,7 @@ runFrame a = SpiderHost $ do
23852151 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
23862152 {-
23872153 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2154+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892155 EventRoot _ -> "EventRoot"
23902156 EventNever -> "EventNever"
23912157 _ -> "something else"
@@ -2400,7 +2166,7 @@ runFrame a = SpiderHost $ do
24002166 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012167 when (parentHeight /= myHeight) $ do
24022168 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2169+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042170 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
24052171 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062172 unsubscribe subscription
@@ -2441,7 +2207,7 @@ invalidateCoincidenceHeight subscribed = do
24412207 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422208 when (oldHeight /= invalidHeight) $ do
24432209 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2210+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452211
24462212updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472213updateSwitchHeight new subscribed = do
@@ -2449,7 +2215,7 @@ updateSwitchHeight new subscribed = do
24492215 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502216 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512217 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2218+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532219
24542220recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552221recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2224,7 @@ recalculateCoincidenceHeight subscribed = do
24582224 height <- calculateCoincidenceHeight subscribed
24592225 when (height /= invalidHeight) $ do
24602226 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2227+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622228
24632229calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642230calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2286,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202286 {-# INLINABLE headE #-}
25212287 headE = R.slowHeadE
25222288-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252289
25262290instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272291 {-# INLINABLE sample #-}
@@ -2543,9 +2307,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432307 {-# INLINABLE headE #-}
25442308 headE = R.slowHeadE
25452309-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492310
25502311instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512312 {-# INLINE return #-}
@@ -2554,13 +2315,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542315 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552316 {-# INLINE (>>) #-}
25562317 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582318 {-# INLINE fail #-}
25592319 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612320
25622321{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2322+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642323newJoinDyn d =
25652324 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662325 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2368,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092368 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102369 {-# INLINABLE headE #-}
26112370 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152371
26162372instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172373 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2384,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282384 {-# INLINABLE headE #-}
26292385 headE = R.slowHeadE
26302386-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332387
26342388instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352389 {-# INLINABLE sample #-}
@@ -2650,8 +2404,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502404 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512405 {-# INLINABLE headE #-}
26522406 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552407
26562408--------------------------------------------------------------------------------
26572409-- Deprecated items
@@ -2689,13 +2441,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892441 touch h
26902442 return result
26912443
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2444+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
26932445 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
26942446 newFanEventWithTrigger f = SpiderHost $ do
26952447 es <- newFanEventWithTriggerIO f
26962448 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972449
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2450+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992451 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002452 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012453 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2469,7 @@ unsafeNewSpiderTimelineEnv = do
27172469#ifdef DEBUG
27182470 depthRef <- newIORef 0
27192471#endif
2720− return $ STE $ SpiderTimelineEnv
2472+ return $ SpiderTimelineEnv
27212473 { _spiderTimeline_lock = lock
27222474 , _spiderTimeline_eventEnv = env
27232475#ifdef DEBUG
@@ -2733,13 +2485,13 @@ data LocalSpiderTimeline (x :: Type) s
27332485
27342486instance Reifies s (SpiderTimelineEnv x) =>
27352487 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2488+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372489
27382490localSpiderTimeline
2739− :: proxy s
2491+ :: Proxy s
27402492 -> SpiderTimelineEnv x
27412493 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2494+localSpiderTimeline _ = unsafeCoerce
27432495
27442496-- | Pass a new timeline to the given function.
27452497withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2757,8 +2509,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572509 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582510 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592511 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 }
2512+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2513+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622514 type PullM (SpiderTimeline x) = SpiderPullM x
27632515 type PushM (SpiderTimeline x) = SpiderPushM x
27642516 {-# INLINABLE never #-}
@@ -2771,15 +2523,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712523 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722524 {-# INLINABLE pull #-}
27732525 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
27762526 {-# INLINABLE mergeG #-}
27772527 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2528+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
27792529 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
27802530 -> DMap k q
27812531 -> R.Event (SpiderTimeline x) (DMap k v)
27822532 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2533+ {-# INLINABLE fan #-}
2534+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832535 {-# INLINABLE switch #-}
27842536 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852537 {-# INLINABLE coincidence #-}
@@ -2787,7 +2539,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872539 {-# INLINABLE current #-}
27882540 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892541 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2542+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912543 {-# INLINABLE unsafeBuildDynamic #-}
27922544 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932545 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2806,10 +2558,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062558 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072559 eventCoercion Coercion = Coercion
28082560 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2561+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112562 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2563+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132564 {-# INLINABLE fanInt #-}
28142565 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152566
@@ -2843,14 +2594,8 @@ instance Monad (SpiderHost x) where
28432594 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442595 {-# INLINABLE return #-}
28452596 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472597 {-# 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
2598+ fail s = SpiderHost $ fail s
28542599
28552600-- | Run an action affecting the global Spider timeline; this will be guarded by
28562601-- a mutex for that timeline
@@ -2872,21 +2617,19 @@ instance Monad (SpiderHostFrame x) where
28722617 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732618 {-# INLINABLE return #-}
28742619 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762620 {-# INLINABLE fail #-}
28772621 fail s = SpiderHostFrame $ fail s
2878−#endif
28792622
28802623instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812624 notReadyUntil _ = pure ()
28822625 notReady = pure ()
28832626
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2627+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852628newEventWithTriggerIO f = do
28862629 es <- newFanEventWithTriggerIO $ \Refl -> f
28872630 return $ select es Refl
28882631
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2632+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902633newFanEventWithTriggerIO f = do
28912634 occRef <- newIORef DMap.empty
28922635 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2663,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202663instance PrimMonad (SpiderHostFrame x) where
29212664 type PrimState (SpiderHostFrame x) = PrimState IO
29222665 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 ()