@@ -9,49 +9,39 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MagicHash #-}
13+{-# LANGUAGE MultiParamTypeClasses #-}
14+{-# LANGUAGE MultiWayIf #-}
1215{-# LANGUAGE RankNTypes #-}
1316{-# LANGUAGE RoleAnnotations #-}
1417{-# LANGUAGE ScopedTypeVariables #-}
1518{-# LANGUAGE TypeFamilies #-}
1619{-# LANGUAGE TypeOperators #-}
1720{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23−
2421#ifdef USE_REFLEX_OPTIMIZER
2522{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
2623#endif
27−{-# OPTIONS_GHC -Wunused-binds #-}
2824-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2925-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3026module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
3127
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
28+import Control.Applicative
3529import Control.Concurrent
3630import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
31+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3832import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
33+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4034import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
35+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4436import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4737import Data.Align
4838import Data.Coerce
49−import Data.Dependent.Map (DMap)
39+import Data.Dependent.Map (DMap, DSum (..))
5040import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
5241import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5342import qualified Data.FastMutableIntMap as FastMutableIntMap
5443import Data.Foldable hiding (concat, elem, sequence_)
44+import Data.Function
5545import Data.Functor.Constant
5646import Data.Functor.Misc
5747import Data.Functor.Product
@@ -59,73 +49,59 @@ import Data.GADT.Compare
5949import Data.IntMap.Strict (IntMap)
6050import qualified Data.IntMap.Strict as IntMap
6151import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
52+import Data.List hiding (foldl')
53+import Data.Maybe
54+import Data.Monoid ((<>))
6555import Data.Proxy
6656import Data.These
6757import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
58+import Data.Word
59+import GHC.Exts
7160import GHC.IORef (IORef (..))
7261import GHC.Stack
7362import Reflex.FastWeak
63+import Reflex.FunctorMaybe
7464import System.IO.Unsafe
7565import System.Mem.Weak
7666import Unsafe.Coerce
7767
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−
8768#ifdef DEBUG_CYCLES
8869import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9170import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9271import qualified Data.List.NonEmpty as NonEmpty
72+import Data.Monoid (mempty)
9373import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
74+#endif
9575
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
76+import Data.FastWeakBag (FastWeakBag)
9777import qualified Data.FastWeakBag as FastWeakBag
98−
9978import Data.Reflection
100−import Data.Some (Some(Some))
79+import Data.Some (Some)
80+import qualified Data.Some as Some
10181import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10382import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10483import qualified Data.WeakBag as WeakBag
10584import qualified Reflex.Class
10685import qualified Reflex.Class as R
10786import qualified Reflex.Host.Class
10887import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
88+import Reflex.Patch
89+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
90+
91+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
92+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11293
11394#ifdef DEBUG_TRACE_EVENTS
11495import qualified Data.ByteString.Char8 as BS8
11596import System.IO (stderr)
116−import Data.List (isPrefixOf)
11797#endif
11898
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
12399#ifdef DEBUG_TRACE_EVENTS
100+
124101withStackOneLine :: (BS8.ByteString -> a) -> a
125102withStackOneLine expr = unsafePerformIO $ do
126103 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
104+ return (expr (BS8.pack (unwords (reverse stack))))
129105
130106#endif
131107
@@ -136,42 +112,28 @@ debugInvalidateHeight :: Bool
136112debugInvalidate :: Bool
137113
138114#ifdef DEBUG
115+
139116#define DEBUG_NODEIDS
140117
141−#ifdef DEBUG_TRACE_PROPAGATION
142118debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146119
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150120debugInvalidateHeight = False
151−#endif
152121
153−#ifdef DEBUG_TRACE_INVALIDATION
154122debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158123
159124class HasNodeId a where
160125 getNodeId :: a -> Int
161126
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
127+instance HasNodeId (Hold x p a) where
169128 getNodeId = holdNodeId
170129
130+instance HasNodeId (PushSubscribed x a b) where
131+ getNodeId = pushSubscribedNodeId
132+
171133instance HasNodeId (SwitchSubscribed x a) where
172134 getNodeId = switchSubscribedNodeId
173135
174−instance HasNodeId (FanSubscribed x v a) where
136+instance HasNodeId (FanSubscribed x a) where
175137 getNodeId = fanSubscribedNodeId
176138
177139instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +147,41 @@ instance HasNodeId (Pull x a) where
185147
186148{-# INLINE showNodeId #-}
187149showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
150+showNodeId = ("#"<>) . show . getNodeId
151+
152+showSubscriberType :: Subscriber x a -> String
153+showSubscriberType = \case
154+ SubscriberPush _ _ -> "SubscriberPush"
155+ SubscriberMerge _ _ -> "SubscriberMerge"
156+ SubscriberFan _ -> "SubscriberFan"
157+ SubscriberMergeChange _ -> "SubscriberMergeChange"
158+ SubscriberHold _ -> "SubscriberHold"
159+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
160+ SubscriberSwitch _ -> "SubscriberSwitch"
161+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
162+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
163+ SubscriberHandle -> "SubscriberHandle"
164+
165+showEventType :: Event x a -> String
166+showEventType = \case
167+ EventRoot _ _ -> "EventRoot"
168+ EventNever -> "EventNever"
169+ EventPush _ -> "EventPush"
170+ EventMerge _ -> "EventMerge"
171+ EventFan _ _ -> "EventFan"
172+ EventSwitch _ -> "EventSwitch"
173+ EventCoincidence _ -> "EventCoincidence"
174+ EventHold _ -> "EventHold"
175+ EventDyn _ -> "EventDyn"
176+ EventHoldIdentity _ -> "EventHoldIdentity"
177+ EventDynIdentity _ -> "EventDynIdentity"
193178
194179#else
195180
196181debugPropagate = False
182+
197183debugInvalidateHeight = False
184+
198185debugInvalidate = False
199186
200187-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +189,6 @@ debugInvalidate = False
202189showNodeId :: a -> String
203190showNodeId _ = ""
204191
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209192#endif
210193
211194#ifdef DEBUG_NODEIDS
@@ -215,6 +198,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215198
216199newNodeId :: IO Int
217200newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
201+
202+{-# NOINLINE unsafeNodeId #-}
203+unsafeNodeId :: a -> Int
204+unsafeNodeId a = unsafePerformIO $ do
205+ touch a
206+ newNodeId
218207#endif
219208
220209--------------------------------------------------------------------------------
@@ -253,7 +242,7 @@ subscribeAndRead = unEvent
253242{-# INLINE [1] pushCheap #-}
254243pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255244pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
245+ (subscription, occ) <- subscribeAndRead e $ sub
257246 { subscriberPropagate = \a -> do
258247 mb <- f a
259248 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +261,10 @@ terminalSubscriber p = Subscriber
272261
273262-- | Subscribe to an Event only for the duration of one occurrence
274263{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
264+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276265subscribeAndReadHead e sub = do
277266 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
267+ (subscription, occ) <- subscribeAndRead e $ sub
279268 { subscriberPropagate = \a -> do
280269 liftIO $ unsubscribe =<< readIORef subscriptionRef
281270 subscriberPropagate sub a
@@ -286,42 +275,24 @@ subscribeAndReadHead e sub = do
286275 return (subscription, occ)
287276
288277--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)
278+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290279headE originalE = do
291280 parent <- liftIO $ newIORef $ Just originalE
292281 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293282 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
283+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295284 when (isJust occ) clearParent
296− return $ Event $ \sub ->
285+ return $ Event $ \sub -> do
297286 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
287+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299288 Just e -> subscribeAndReadHead e sub
300289
301290data CacheSubscribed x a
302291 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303292 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304293 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308294 }
309295
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−
325296-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326297-- repeatedly
327298--
@@ -336,33 +307,27 @@ cacheEvent e =
336307#else
337308 Event $
338309#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
310+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
311+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
312+ in \sub -> {-# SCC "cacheEvent" #-} do
343313#ifdef DEBUG_TRACE_EVENTS
344314 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345315#endif
346316 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347317 Just subscribedTicket -> return subscribedTicket
348318 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352319 subscribers <- liftIO FastWeakBag.empty
353320 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
354−#ifdef DEBUG_NODEIDS
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
356−#else
357321 (parentSub, occ) <- subscribeAndRead e $ Subscriber
358−#endif
359− { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
361− scheduleClear occRef
362− propagateFast a subscribers
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
365− }
322+ { subscriberPropagate = \a -> do
323+ liftIO $ writeIORef occRef $ Just a
324+ scheduleClear occRef
325+ propagateFast a subscribers
326+ , subscriberInvalidateHeight = \old -> do
327+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
328+ , subscriberRecalculateHeight = \new -> do
329+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
330+ }
366331 when (isJust occ) $ do
367332 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368333 scheduleClear occRef
@@ -370,45 +335,29 @@ cacheEvent e =
370335 { _cacheSubscribed_subscribers = subscribers
371336 , _cacheSubscribed_parent = parentSub
372337 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376338 }
377339 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378340 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379341 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
381−
382−cacheSubscription :: Subscriber x a -> IORef (FastWeak (CacheSubscribed x a))
383− -> FastWeakTicket (CacheSubscribed x a) -> IO (EventSubscription x, Maybe a)
384−cacheSubscription sub mSubscribedRef subscribedTicket = do
385− subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
388−
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
391− { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
393−
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
398− touch ticket
399− touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
402− , eventSubscribedRetained = toAny subscribedTicket
403−#ifdef DEBUG_CYCLES
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
407−#endif
408− }
409− }
410− return (es, occ)
411−
342+ liftIO $ do
343+ subscribed <- getFastWeakTicketValue subscribedTicket
344+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
345+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
346+ let es = EventSubscription
347+ { _eventSubscription_unsubscribe = do
348+ FastWeakBag.remove ticket
349+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
350+ when isEmpty $ do
351+ writeIORef mSubscribedRef emptyFastWeak
352+ unsubscribe $ _cacheSubscribed_parent subscribed
353+ touch ticket
354+ touch subscribedTicket
355+ , _eventSubscription_subscribed = EventSubscribed
356+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
357+ , eventSubscribedRetained = toAny subscribedTicket
358+ }
359+ }
360+ return (es, occ)
412361
413362subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414363subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +369,13 @@ wrap tag getSpecificSubscribed sub = do
420369 let es = tag subd
421370 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422371
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
372+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424373eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425374
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429375eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
376+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431377
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
378+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433379eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434380
435381eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,7 +384,7 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438384eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439385eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440386
441−eventHold :: Hold x p -> Event x p
387+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442388eventHold !h = Event $ subscribeHoldEvent h
443389
444390eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
@@ -464,6 +410,16 @@ data Subscriber x a = Subscriber
464410 , subscriberRecalculateHeight :: !(Height -> IO ())
465411 }
466412
413+--TODO: Move this comment to WeakBag
414+-- These function are constructor functions that are marked NOINLINE so they are
415+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
416+-- so any weak references that are attached to the constructors will have their
417+-- finalizer run. Using the opaque constructor, does not see the
418+-- constructor application, so it behaves like an IORef and cannot be fused away.
419+--
420+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
421+-- the weak pointer to it in some cases.
422+
467423newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468424newSubscriberHold h = return $ Subscriber
469425 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +427,85 @@ newSubscriberHold h = return $ Subscriber
471427 , subscriberRecalculateHeight = \_ -> return ()
472428 }
473429
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
430+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
431+newSubscriberFan subscribed = return $ Subscriber
476432 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477433 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
434+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479435 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480436 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
437+ let f _ (Pair (Identity v) subsubs) = do
482438 propagate v $ _fanSubscribedChildren_list subsubs
483439 return $ Constant ()
484440 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485441 return ()
486442 , subscriberInvalidateHeight = \old -> do
443+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487444 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
445+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489447 , subscriberRecalculateHeight = \new -> do
448+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490449 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
450+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492452 }
493453
494454newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
455+newSubscriberSwitch subscribed = return $ Subscriber
496456 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
457+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497458 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498459 scheduleClear $ switchSubscribedOccurrence subscribed
499460 propagate a $ switchSubscribedSubscribers subscribed
500461 , subscriberInvalidateHeight = \_ -> do
462+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501463 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502464 when (oldHeight /= invalidHeight) $ do
503465 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
466+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
467+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
468+ , subscriberRecalculateHeight = \new -> do
469+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
470+ updateSwitchHeight new subscribed
471+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
472+ }
507473
508474newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
475+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510476 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
477+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511478 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512479 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513480 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514481 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515482 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517483 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518484 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519485 case occ of
520− Nothing ->
486+ Nothing -> do
521487 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522488 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
489+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
490+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525491 Just o -> do -- Since it's already firing, no need to adjust height
526492 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527493 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528494 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
495+ , subscriberInvalidateHeight = \_ -> do
496+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
497+ invalidateCoincidenceHeight subscribed
498+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
499+ , subscriberRecalculateHeight = \_ -> do
500+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
501+ recalculateCoincidenceHeight subscribed
502+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531503 }
532504
533505newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
506+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535507 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
508+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536509 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537510 case occ of
538511 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +513,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540513 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541514 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542515 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
516+ , subscriberInvalidateHeight = \_ -> do
517+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
518+ invalidateCoincidenceHeight subscribed
519+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
520+ , subscriberRecalculateHeight = \_ -> do
521+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
522+ recalculateCoincidenceHeight subscribed
523+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545524 }
546525
547526invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +530,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551530recalculateSubscriberHeight = flip subscriberRecalculateHeight
552531
553532-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
533+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
534+propagate a subscribers = withIncreasedDepth $ do
556535 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
557536 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
537+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559538
560539-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
540+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
541+propagateFast a subscribers = withIncreasedDepth $ do
563542 -- Note: in the following traversal, we do not visit nodes that are added to the list during our traversal; they are new events, which will necessarily have full information already, so there is no need to traverse them
564543 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
565− FastWeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
544+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566545
567546--------------------------------------------------------------------------------
568547-- EventSubscribed
@@ -571,16 +550,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571550toAny :: a -> Any
572551toAny = unsafeCoerce
573552
574−-- Why do we use Any here, instead of just giving eventSubscribedRetained an
575−-- existential type? Sadly, GHC does not currently know how to unbox types
576−-- with existentially quantified fields. So instead we just coerce values
577−-- to type Any on the way in. Since we never coerce them back, this is
578−-- perfectly safe.
579553data EventSubscribed x = EventSubscribed
580554 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581555 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582556#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
557+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584558 , eventSubscribedHasOwnHeightRef :: !Bool
585559 , eventSubscribedWhoCreated :: !(IO [String])
586560#endif
@@ -607,23 +581,13 @@ eventSubscribedNever = EventSubscribed
607581 , eventSubscribedWhoCreated = return ["never"]
608582#endif
609583 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620584
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
585+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622586eventSubscribedFan !subscribed = EventSubscribed
623587 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624588 , eventSubscribedRetained = toAny subscribed
625589#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
590+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627591 , eventSubscribedHasOwnHeightRef = False
628592 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629593#endif
@@ -636,7 +600,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636600#ifdef DEBUG_CYCLES
637601 , eventSubscribedGetParents = do
638602 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
603+ return [Some.This $ _eventSubscription_subscribed s]
640604 , eventSubscribedHasOwnHeightRef = True
641605 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642606#endif
@@ -649,8 +613,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649613#ifdef DEBUG_CYCLES
650614 , eventSubscribedGetParents = do
651615 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
616+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
617+ innerParents = maybeToList $ fmap Some.This innerSubscription
654618 return $ outerParent : innerParents
655619 , eventSubscribedHasOwnHeightRef = True
656620 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +628,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664628whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665629whoCreatedEventSubscribed = eventSubscribedWhoCreated
666630
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
631+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668632walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
633+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670634 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671635 when (h == invalidHeight) $ do
672636 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
637+ modify (Some.This s :)
674638 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
639+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676640 return subscribers
677641#endif
678642
679643{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
644+subscribeHoldEvent :: HasSpiderTimeline x => Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681645subscribeHoldEvent = subscribeAndRead . holdEvent
682646
683647--------------------------------------------------------------------------------
@@ -700,7 +664,7 @@ behaviorPull !p = Behavior $ do
700664 val <- liftIO $ readIORef $ pullValue p
701665 case val of
702666 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
667+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704668 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705669 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706670 return $ pullSubscribedValue subscribed
@@ -709,7 +673,7 @@ behaviorPull !p = Behavior $ do
709673 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710674 parentsRef <- liftIO $ newIORef []
711675 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
676+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713677 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714678 parents <- liftIO $ readIORef parentsRef
715679 let subscribed = PullSubscribed
@@ -719,7 +683,7 @@ behaviorPull !p = Behavior $ do
719683 , pullSubscribedParents = parents
720684 }
721685 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
686+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723687 return a
724688
725689behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,7 +694,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730694readHoldTracked h = do
731695 result <- liftIO $ readIORef $ holdValue h
732696 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
697+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734698 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735699 return result
736700
@@ -744,46 +708,42 @@ readBehaviorUntracked b = do
744708-- Dynamic
745709--------------------------------------------------------------------------------
746710
747−type DynamicS x p = Dynamic x (PatchTarget p) p
748−
749−data Dynamic x target p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
751− , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
711+data Dynamic x p = Dynamic
712+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
713+ , dynamicUpdated :: !(Event x p)
752714 }
753715
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
716+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760717dynamicHold !h = Dynamic
761718 { dynamicCurrent = behaviorHold h
762719 , dynamicUpdated = eventHold h
763720 }
764721
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
722+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766723dynamicHoldIdentity = dynamicHold
767724
768−dynamicConst :: PatchTarget p -> DynamicS x p
725+dynamicConst :: PatchTarget p -> Dynamic x p
769726dynamicConst !a = Dynamic
770727 { dynamicCurrent = behaviorConst a
771728 , dynamicUpdated = eventNever
772729 }
773730
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
731+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775732dynamicDyn !d = Dynamic
776733 { dynamicCurrent = behaviorDyn d
777734 , dynamicUpdated = eventDyn d
778735 }
779736
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
737+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781738dynamicDynIdentity = dynamicDyn
782739
783740--------------------------------------------------------------------------------
784741-- Combinators
785742--------------------------------------------------------------------------------
786743
744+--TODO: Figure out why certain things are not 'representational', then make them
745+--representational so we can use coerce
746+
787747--type role Hold representational
788748data Hold x p
789749 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +764,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804764
805765-- | Stores all global data relevant to a particular Spider timeline; only one
806766-- value should exist for each type @x@
807−newtype SpiderTimelineEnv x = STE {unSTE :: SpiderTimelineEnv' x}
808−-- We implement SpiderTimelineEnv with a newtype wrapper so
809−-- we can get the coercions we want safely.
810−type role SpiderTimelineEnv nominal
811−
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
767+data SpiderTimelineEnv x = SpiderTimelineEnv
813768 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814769 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815770#ifdef DEBUG
816771 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817772#endif
818773 }
819−type role SpiderTimelineEnv' phantom
774+type role SpiderTimelineEnv nominal
820775
821776instance Eq (SpiderTimelineEnv x) where
822777 _ == _ = True -- Since only one exists of each type
823778
824779instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
780+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826781 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827782 else Nothing
828783
@@ -832,9 +787,9 @@ data EventEnv x
832787 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833788 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834789 , eventEnvMergeInits :: !(IORef [SomeMergeInit x]) -- Needed for Subscribe
835− , eventEnvClears :: !(IORef [Some Clear]) -- Needed for Subscribe
836− , eventEnvIntClears :: !(IORef [Some IntClear])
837− , eventEnvRootClears :: !(IORef [Some RootClear])
790+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
791+ , eventEnvIntClears :: !(IORef [SomeIntClear])
792+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838793 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839794 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840795 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +800,7 @@ runEventM :: EventM x a -> IO a
845800runEventM = unEventM
846801
847802asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
803+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849804
850805class MonadIO m => Defer a m where
851806 getDeferralQueue :: m (IORef [a])
@@ -906,29 +861,29 @@ putCurrentHeight h = do
906861 heightRef <- asksEventEnv eventEnvCurrentHeight
907862 liftIO $ writeIORef heightRef $! h
908863
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
864+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910865 {-# INLINE getDeferralQueue #-}
911866 getDeferralQueue = asksEventEnv eventEnvClears
912867
913868{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
869+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
870+scheduleClear r = defer $ SomeClear r
916871
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
872+instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
918873 {-# INLINE getDeferralQueue #-}
919874 getDeferralQueue = asksEventEnv eventEnvIntClears
920875
921876{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
877+scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
878+scheduleIntClear r = defer $ SomeIntClear r
924879
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
880+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926881 {-# INLINE getDeferralQueue #-}
927882 getDeferralQueue = asksEventEnv eventEnvRootClears
928883
929884{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
885+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
886+scheduleRootClear r = defer $ SomeRootClear r
932887
933888instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934889 {-# INLINE getDeferralQueue #-}
@@ -983,9 +938,9 @@ getHoldEventSubscription h = do
983938
984939type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985940
941+--type role BehaviorM representational
986942-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
943+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989944
990945instance Monad (BehaviorM x) where
991946 {-# INLINE (>>=) #-}
@@ -994,16 +949,14 @@ instance Monad (BehaviorM x) where
994949 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995950 {-# INLINE return #-}
996951 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998952 {-# INLINE fail #-}
999953 fail s = BehaviorM $ fail s
1000−#endif
1001954
1002955data BehaviorSubscribed x a
1003956 = forall p. BehaviorSubscribedHold (Hold x p)
1004957 | BehaviorSubscribedPull (PullSubscribed x a)
1005958
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
959+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007960
1008961--type role PullSubscribed representational
1009962data PullSubscribed x a
@@ -1038,7 +991,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1038991#endif
1039992 }
1040993
1041−data Root x k
994+data Root x (k :: * -> *)
1042995 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043996 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044997 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1010,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571010newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581011
10591012-- EventM can do everything BehaviorM can, plus create holds
1060−newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException)
1013+newtype EventM x a = EventM { unEventM :: IO a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadException, MonadAsyncException) -- The environment should be Nothing if we are not in a frame, and Just if we are - in which case it is a list of assignments to be done after the frame is over
10611014
10621015newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631016
@@ -1082,8 +1035,7 @@ heightBagFromList :: [Height] -> HeightBag
10821035heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831036
10841037heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1038+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871039
10881040heightBagRemove :: Height -> HeightBag -> HeightBag
10891041heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1044,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921044 0 -> IntMap.delete h c
10931045 _ -> IntMap.insert h (pred old) c
10941046
1095−heightBagRemoveMaybe :: Height -> HeightBag -> Maybe HeightBag
1096−heightBagRemoveMaybe (Height h) b@(HeightBag s c) = heightBagVerify . removed <$> IntMap.lookup h c where
1097− removed old = HeightBag (pred s) $ case old of
1098− 0 -> IntMap.delete h c
1099− _ -> IntMap.insert h (pred old) c
1100−
1101−
11021047heightBagMax :: HeightBag -> Height
11031048heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041049 Just ((h, _), _) -> Height h
@@ -1116,25 +1061,25 @@ heightBagVerify b@(HeightBag s c) = if
11161061heightBagVerify = id
11171062#endif
11181063
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)))
1064+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1065+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1066+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1067+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231068 }
11241069
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
1070+data FanSubscribed (x :: *) k
1071+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1072+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1073+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291074 , fanSubscribedParent :: !(EventSubscription x)
11301075#ifdef DEBUG_NODEIDS
11311076 , fanSubscribedNodeId :: Int
11321077#endif
11331078 }
11341079
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1080+data Fan x k
1081+ = Fan { fanParent :: !(Event x (DMap k Identity))
1082+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381083 }
11391084
11401085data SwitchSubscribed x a
@@ -1188,35 +1133,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881133newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891134newInvalidatorPull p = return $! InvalidatorPull p
11901135
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1136+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1137+ fmapMaybe f = push $ return . f
11931138
11941139instance HasSpiderTimeline x => Align (Event x) where
11951140 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1198−#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1141+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12011142
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−
1209−data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210− | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211− | HoldDyn !(Hold x p)
1212−
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1143+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141144
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1145+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161146newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171147
12181148--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)
1149+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201150zipDynWith f da db =
12211151 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221152 ec = flip push eab $ \o -> do
@@ -1231,20 +1161,26 @@ zipDynWith f da db =
12311161 return $ Just $ Identity $ f a b
12321162 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331163
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1164+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
12351165buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1166+ result <- liftIO $ newIORef $ Left (readV0, v')
12371167 let !d = Dyn result
12381168 defer $ SomeDynInit d
12391169 return d
12401170
12411171unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1172+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1173+ where x = (readV0, v')
12441174
12451175-- ResultM can read behaviors and events
12461176type ResultM = EventM
12471177
1178+{-# NOINLINE unsafeNewIORef #-}
1179+unsafeNewIORef :: a -> b -> IORef b
1180+unsafeNewIORef a b = unsafePerformIO $ do
1181+ touch a
1182+ newIORef b
1183+
12481184instance HasSpiderTimeline x => Functor (Event x) where
12491185 fmap f = push $ return . Just . f
12501186
@@ -1257,42 +1193,33 @@ push f e = cacheEvent (pushCheap f e)
12571193
12581194{-# INLINABLE pull #-}
12591195pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1261− ref <- newIORef Nothing
1262−#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1264−#endif
1265− pure $ behaviorPull $ Pull
1266− { pullCompute = a
1267− , pullValue = ref
1196+pull a = behaviorPull $ Pull
1197+ { pullCompute = a
1198+ , pullValue = unsafeNewIORef a Nothing
12681199#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1200+ , pullNodeId = unsafeNodeId a
12701201#endif
1271− }
1202+ }
12721203
12731204{-# INLINABLE switch #-}
12741205switch :: 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− }
1206+switch a = eventSwitch $ Switch
1207+ { switchParent = a
1208+ , switchSubscribed = unsafeNewIORef a Nothing
1209+ }
12811210
12821211coincidence :: 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− }
1212+coincidence a = eventCoincidence $ Coincidence
1213+ { coincidenceParent = a
1214+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1215+ }
12891216
12901217-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911218run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921219run roots after = do
12931220 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294− let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1221+ t <- SpiderHost ask
1222+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961223 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971224 occBefore <- liftIO $ do
12981225 occBefore <- readIORef occRef
@@ -1330,11 +1257,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301257 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311258 EQ -> a
13321259
1333−newtype Clear a = Clear (IORef (Maybe a))
1260+data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
13341261
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1262+data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
13361263
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1264+data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
13381265
13391266data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401267
@@ -1346,110 +1273,55 @@ mkWeakPtrWithDebug x debugNote = do
13461273 x' <- evaluate x
13471274 mkWeakPtr x' $
13481275 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1276+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501277 else Nothing
13511278
13521279type WeakList a = [Weak a]
13531280
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−
13811281{-# 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
1282+#ifdef DEBUG
1283+withIncreasedDepth :: CanTrace x m => m a -> m a
1284+withIncreasedDepth a = do
1285+ spiderTimeline <- askSpiderTimelineEnv
1286+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851287 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1288+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871289 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−
14121290#else
1291+withIncreasedDepth :: m a -> m a
1292+withIncreasedDepth = id
1293+#endif
14131294
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1295+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171296
14181297{-# INLINE tracePropagate #-}
14191298tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1299+tracePropagate p = traceWhen p debugPropagate
14211300
14221301{-# INLINE traceInvalidate #-}
14231302traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1425−
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1303+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14291304
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 ()
1305+{-# INLINE traceWhen #-}
1306+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1307+traceWhen p b message = traceMWhen p b $ return message
14471308
1309+{-# INLINE traceMWhen #-}
1310+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1311+traceMWhen _ b getMessage = when b $ do
1312+ message <- getMessage
1313+#ifdef DEBUG
1314+ spiderTimeline <- askSpiderTimelineEnv
1315+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1316+#else
1317+ let d = 0
14481318#endif
1319+ liftIO $ putStrLn $ replicate d ' ' <> message
14491320
14501321whoCreatedIORef :: IORef a -> IO [String]
14511322whoCreatedIORef (IORef a) = whoCreated $! a
14521323
1324+#ifdef DEBUG_CYCLES
14531325groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541326groupByHead = \case
14551327 [] -> []
@@ -1460,54 +1332,20 @@ groupByHead = \case
14601332 | otherwise -> (x, xs :| []) : l
14611333
14621334listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1465−
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1468−
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1472−#else
1473−filterStack prefix = id
1474−#endif
1475−
1476−#ifdef DEBUG_CYCLES
1477−
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
1480−
1481−instance Show EventLoopException where
1482− show (EventLoopException stacks) = "causality loop detected:\n" <> if null stacks
1483− then "no location information, compile with profiling enabled for stack tree"
1484− else showStacks stacks
1485−
1486−#else
1487−
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
1490−
1491−instance Show EventLoopException where
1492− show EventLoopException = "causality loop detected: \n" <>
1493− "compile reflex with flag 'debug-cycles' and compile with profiling enabled for stack tree"
1494−
1335+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951336#endif
14961337
1497−
14981338{-# INLINE propagateSubscriberHold #-}
14991339propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001340propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1341+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021342 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031343 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051344 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061345 case {-# SCC "apply" #-} apply a v of
15071346 Nothing -> return ()
15081347 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1348+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111349 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121350 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131351 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1353,25 @@ propagateSubscriberHold h a = do
15151353data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161354
15171355runBehaviorM :: 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)
1356+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191357
15201358askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211359askInvalidator = do
1522− (!m, _) <- ask
1360+ (!m, _) <- BehaviorM ask
15231361 case m of
15241362 Nothing -> return Nothing
15251363 Just (!wi, _) -> return $ Just wi
15261364
15271365askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281366askParentsRef = do
1529− (!m, _) <- ask
1367+ (!m, _) <- BehaviorM ask
15301368 case m of
15311369 Nothing -> return Nothing
15321370 Just (_, !p) -> return $ Just p
15331371
15341372askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351373askBehaviorHoldInits = do
1536− (_, !his) <- ask
1374+ (_, !his) <- BehaviorM ask
15371375 return his
15381376
15391377{-# INLINE getDynHold #-}
@@ -1541,27 +1379,20 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411379getDynHold d = do
15421380 mh <- liftIO $ readIORef $ unDyn d
15431381 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1382+ Right h -> return h
1383+ Left (readV0, v') -> do
15461384 holdInits <- getDeferralQueue
15471385 v0 <- liftIO $ runBehaviorM readV0 Nothing holdInits
1548− hold' v0 v'
1549− BuildDyn (readV0, v') -> do
1550− v0 <- liftIO $ runEventM readV0
1551− hold' v0 v'
1552− where
1553− hold' v0 v' = do
15541386 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1387+ liftIO $ writeIORef (unDyn d) $ Right h
15561388 return h
15571389
1558−
15591390-- Always refers to 0
15601391{-# NOINLINE zeroRef #-}
15611392zeroRef :: IORef Height
15621393zeroRef = unsafePerformIO $ newIORef zeroHeight
15631394
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)
1395+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651396getRootSubscribed k r sub = do
15661397 mSubscribed <- readIORef $ rootSubscribed r
15671398 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1406,9 @@ getRootSubscribed k r sub = do
15751406 let !cached = rootSubscribed r
15761407 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771408 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1409+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811410 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821411 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861412 let !subscribed = RootSubscribed
15871413 { rootSubscribedKey = k
15881414 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1417,7 @@ getRootSubscribed k r sub = do
15911417 , rootSubscribedUninit = uninit
15921418 , rootSubscribedWeakSelf = weakSelf
15931419#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1420+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951421#endif
15961422 }
15971423 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1453,6 @@ data FanInt x a = FanInt
16271453 { _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
16281454 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291455 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331456 }
16341457
16351458newFanInt :: IO (FanInt x a)
@@ -1637,39 +1460,38 @@ newFanInt = do
16371460 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
16381461 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391462 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431463 return $ FanInt
16441464 { _fanInt_subscribers = subscribers
16451465 , _fanInt_subscriptionRef = subscriptionRef
16461466 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501467 }
16511468
1469+{-# NOINLINE unsafeNewFanInt #-}
1470+unsafeNewFanInt :: b -> FanInt x a
1471+unsafeNewFanInt b = unsafePerformIO $ do
1472+ touch b
1473+ newFanInt
1474+
16521475fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1476+fanInt p =
1477+ let self = unsafeNewFanInt p
1478+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561479 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571480 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
1481+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601482 { subscriberPropagate = \m -> do
16611483 liftIO $ writeIORef (_fanInt_occRef self) m
16621484 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 ->
1485+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1486+ FastWeakBag.traverse b $ \s -> do
16651487 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1488+ , subscriberInvalidateHeight = \old -> do
1489+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1490+ FastWeakBag.traverse b $ \s -> do
16691491 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1492+ , subscriberRecalculateHeight = \new -> do
1493+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1494+ FastWeakBag.traverse b $ \s -> do
16731495 subscriberRecalculateHeight s new
16741496 }
16751497 liftIO $ do
@@ -1683,28 +1505,13 @@ fanInt p = unsafePerformIO $ do
16831505 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841506 return b
16851507 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1508+ t <- liftIO $ FastWeakBag.insert sub b
16871509 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−
1510+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1511+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051512
17061513{-# 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))
1514+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081515getFanSubscribed k f sub = do
17091516 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101517 case mSubscribed of
@@ -1722,16 +1529,13 @@ getFanSubscribed k f sub = do
17221529 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231530 occRef <- liftIO $ newIORef parentOcc
17241531 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281532 let subscribed = FanSubscribed
17291533 { fanSubscribedCachedSubscribed = fanSubscribed f
17301534 , fanSubscribedOccurrence = occRef
17311535 , fanSubscribedParent = subscription
17321536 , fanSubscribedSubscribers = subscribersRef
17331537#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1538+ , fanSubscribedNodeId = unsafeNodeId f
17351539#endif
17361540 }
17371541 let !self = (k, subscribed)
@@ -1741,7 +1545,7 @@ getFanSubscribed k f sub = do
17411545 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421546 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431547
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1548+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451549cleanupFanSubscribed (k, subscribed) = do
17461550 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471551 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1557,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531557 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541558
17551559{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1560+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571561subscribeFanSubscribed k subscribed sub = do
17581562 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591563 case DMap.lookup k subscribers of
@@ -1791,9 +1595,6 @@ getSwitchSubscribed s sub = do
17911595 when (isJust parentOcc) $ scheduleClear occRef
17921596 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931597 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971598 let !subscribed = SwitchSubscribed
17981599 { switchSubscribedCachedSubscribed = switchSubscribed s
17991600 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1607,7 @@ getSwitchSubscribed s sub = do
18061607 , switchSubscribedCurrentParent = subscriptionRef
18071608 , switchSubscribedWeakSelf = weakSelf
18081609#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1610+ , switchSubscribedNodeId = unsafeNodeId s
18101611#endif
18111612 }
18121613 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1652,6 @@ getCoincidenceSubscribed c sub = do
18511652 scheduleClear innerSubdRef
18521653 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531654 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571655 let subscribed = CoincidenceSubscribed
18581656 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591657 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1662,7 @@ getCoincidenceSubscribed c sub = do
18641662 , coincidenceSubscribedInnerParent = innerSubdRef
18651663 , coincidenceSubscribedWeakSelf = weakSelf
18661664#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1665+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681666#endif
18691667 }
18701668 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1679,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811679subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821680subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831681
1884−{-# INLINE mergeG #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886− => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1888−mergeG nt d = cacheEvent (mergeCheap nt d)
1682+{-# INLINE merge #-}
1683+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1684+merge d = cacheEvent (mergeCheap d)
18891685
18901686{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892− => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894−mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1687+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1688+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951689
18961690{-# INLINE [1] mergeCheap #-}
1897−mergeCheap
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899− => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1901− -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1691+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1692+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031693 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1694+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051695 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061696 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071697 (mOldSubd, newPs) <- case me of
19081698 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091699 Just e -> do
19101700 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1701+ subscription@(EventSubscription _ subd) <- subscribe e s
19121702 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131703 let newParent = MergeSubscribedParent subscription
19141704 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151705 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161706 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1707+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201708 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211709 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221710 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1711+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251712 getInitialSubscribers initialParents subscriber = do
19261713 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271714 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1715+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291716 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1717+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311718 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321719 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331720 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341721 )
1935−
19361722 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371723 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381724
19391725{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941− => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1943− -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1726+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1727+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451728 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1729+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471730 updateMe subscriber heightBagRef oldParents p = do
19481731 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1732+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501733 subscribeParent k e = do
19511734 keyRef <- liftIO $ newIORef k
19521735 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1738,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551738 newParentHeight <- getEventSubscribedHeight subd
19561739 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571740 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1741+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591742 -- Collect old parents for deletion and update the keys of moved parents
1960− let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1743+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611744 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621745 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1746+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661747 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671748 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681749 Just toKey -> do
19691750 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701751 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1752+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741753 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1754+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761755 getInitialSubscribers initialParents subscriber = do
19771756 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781757 keyRef <- liftIO $ newIORef k
19791758 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1759+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811760 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1761+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831762 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841763 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851764 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861765 )
1987−
19881766 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891767 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901768
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1769+type MergeUpdateFunc k x p s
1770+ = (forall a. EventM x (k a) -> Subscriber x a)
19931771 -> IORef HeightBag
19941772 -> DMap k s
19951773 -> p
19961774 -> EventM x ([EventSubscription x], DMap k s)
19971775
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
1999−
2000−type MergeInitFunc k v q x s
2001− = DMap k q
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
2003− -> EventM x (DMap k v, [Height], DMap k s)
1776+type MergeInitFunc k x s
1777+ = DMap k (Event x)
1778+ -> (forall a. EventM x (k a) -> Subscriber x a)
1779+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041780
20051781type MergeDestroyFunc k s
20061782 = DMap k s
20071783 -> IO ()
20081784
2009−data Merge x k v s = Merge
1785+data Merge x k s = Merge
20101786 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111787 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121788 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1789+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1790+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151791 }
20161792
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1793+invalidateMergeHeight :: Merge x k s -> IO ()
20181794invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191795
20201796invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211797invalidateMergeHeight' heightRef sub = do
20221798 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
1799+ 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
20251800 writeIORef heightRef $! invalidHeight
20261801 subscriberInvalidateHeight sub oldHeight
20271802
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1803+
1804+revalidateMergeHeight :: Merge x k s -> IO ()
20291805revalidateMergeHeight m = do
20301806 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
1807+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341808 heights <- readIORef $ _merge_heightBagRef m
20351809 parents <- readIORef $ _merge_parentsRef m
20361810 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1812,44 @@ revalidateMergeHeight m = do
20381812 LT -> return ()
20391813 EQ -> do
20401814 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1815+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421816 writeIORef (_merge_heightRef m) $! height
20431817 subscriberRecalculateHeight (_merge_sub m) height
20441818 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451819
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1820+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471821scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481822 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
1823+ 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
20521824 --TODO: Assert that m is not empty
20531825 subscriberPropagate (_merge_sub m) vals
20541826
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
1827+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1828+mergeSubscriber m getKey = Subscriber
20781829 { subscriberPropagate = \a -> do
20791830 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801831 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1832+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821833 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831834 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841835 when (DMap.null oldM) $ do -- Only schedule the firing once
20851836 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1837+ --TODO: assertions about height
1838+ currentHeight <- getCurrentHeight
1839+ when (height <= currentHeight) $ do
1840+ if height /= invalidHeight
1841+ then do
1842+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1843+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1844+ else liftIO $ do
1845+#ifdef DEBUG_CYCLES
1846+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1847+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1848+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1849+#else
1850+ let cycleInfo = ""
1851+#endif
1852+ error $ "Causality loop found" <> cycleInfo
20881853 scheduleMergeSelf m height
20891854 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901855 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1860,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951860 }
20961861
20971862--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)
1863+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1864+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001865 where updateMe = do
21011866 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1867+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031868 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041869 return subscriptionsToKill
21051870
2106−{-# INLINE mergeGCheap' #-}
2107−mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
2108− => MergeGetSubscription x s -> MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> DynamicS x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1871+{-# INLINE mergeCheap' #-}
1872+mergeCheap' :: forall k x p s. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k (Event x)) => MergeInitFunc k x s -> MergeUpdateFunc k x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k Identity)
1873+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101874 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111875 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121876 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131877 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141878 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
1879+ let m = Merge
21301880 { _merge_parentsRef = parentsRef
21311881 , _merge_heightBagRef = heightBagRef
21321882 , _merge_heightRef = heightRef
21331883 , _merge_sub = sub
21341884 , _merge_accumRef = accumRef
21351885 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1886+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371887 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381888 myHeight = if invalidHeight `elem` heights
21391889 then invalidHeight
@@ -2142,57 +1892,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421892 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431893 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441894 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1895+ unless (DMap.null accum) $ do
1896+ scheduleMergeSelf m myHeight
21461897 liftIO $ writeIORef accumRef $! accum
21471898 liftIO $ writeIORef heightRef $! myHeight
21481899 liftIO $ writeIORef heightBagRef $! myHeightBag
1900+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491901 liftIO $ writeIORef parentsRef $! initialParentState
21501902 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1903+ let s = Subscriber
21521904 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1905+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1906+ defer $ updateMerge m updateFunc a
21551907 , subscriberInvalidateHeight = \_ -> return ()
21561908 , subscriberRecalculateHeight = \_ -> return ()
21571909 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1910+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1911+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601912 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611913 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621914 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1915+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641916 let unsubscribeAll = destroy =<< readIORef parentsRef
1917+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1918+ , occ
1919+ )
21651920
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)
1921+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701922mergeInt = cacheEvent . mergeIntCheap
21711923
21721924{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1925+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741926mergeIntCheap d = Event $ \sub -> do
21751927 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761928 accum <- liftIO $ FastMutableIntMap.newEmpty
21771929 heightRef <- liftIO $ newIORef zeroHeight
21781930 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791931 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− }
21901932 let scheduleSelf = do
21911933 height <- liftIO $ readIORef $ heightRef
21921934 scheduleMerge' height heightRef $ do
21931935 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941936 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1937+ invalidateMyHeight = do
1938+ invalidateMergeHeight' heightRef sub
21961939 recalculateMyHeight = do
21971940 currentHeight <- readIORef heightRef
21981941 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 +1945,12 @@ mergeIntCheap d = Event $ \sub -> do
22021945 LT -> return ()
22031946 EQ -> do
22041947 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1948+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061949 writeIORef heightRef $! height
22071950 subscriberRecalculateHeight sub height
22081951 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091952 mySubscriber k = Subscriber
22101953 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131954 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141955 liftIO $ FastMutableIntMap.insert accum k a
22151956 when wasEmpty scheduleSelf
@@ -2243,6 +1984,7 @@ mergeIntCheap d = Event $ \sub -> do
22431984 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22441985 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22451986 return Nothing
1987+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22461988 defer $ SomeMergeInit $ do
22471989 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22481990 where
@@ -2256,39 +1998,35 @@ mergeIntCheap d = Event $ \sub -> do
22561998 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22571999 liftIO $ for_ oldParents $ \oldParent -> do
22582000 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612001 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622002 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2003+ let s = Subscriber
22642004 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652005 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662006 defer $ updateMe a
22672007 , subscriberInvalidateHeight = \_ -> return ()
22682008 , subscriberRecalculateHeight = \_ -> return ()
22692009 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2010+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712011 forM_ change $ \c -> defer $ updateMe c
22722012 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732013 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742014 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2015+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762016 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2017+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2018+ , occ
2019+ )
22802020
22812021newtype 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) }
22832022
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2023+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2024+fan e =
22872025 let f = Fan
22882026 { fanParent = e
2289− , fanSubscribed = ref
2027+ , fanSubscribed = unsafeNewIORef e Nothing
22902028 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2029+ in EventSelector $ \k -> eventFan k f
22922030
22932031runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942032runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2341,37 +2079,37 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23412079
23422080-- | Run an event action outside of a frame
23432081runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344−runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2082+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2083+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462084 let go = do
23472085 result <- a
23482086 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
23492087 return result
23502088 result <- runEventM go
23512089 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2090+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23532091 toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2092+ forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
23552093 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2094+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23572095 toAssign <- readIORef $ eventEnvAssignments env
23582096 toReconnectRef <- newIORef []
23592097 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602098 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612099 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2100+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632101 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642102 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652103 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2104+ when debugPropagate $ putStrLn "Updating merges"
23672105 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2106+ when debugPropagate $ putStrLn "Updating merges done"
23692107 toReconnect <- readIORef toReconnectRef
23702108 clearEventEnv env
23712109 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722110 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732111 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2112+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752113 finalize wi
23762114 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772115 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2382,10 +2120,10 @@ runFrame a = SpiderHost $ do
23822120 runEventM $ runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) --TODO: Is this actually OK? It seems like it should be, since we know that no events are firing at this point, but it still seems inelegant
23832121 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23842122 sub <- newSubscriberSwitch subscribed
2385− 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
2123+ subscription <- runReaderT (unSpiderHost (runFrame ({-# SCC "subscribeSwitch" #-} subscribe e sub))) spiderTimeline --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
23862124 {-
23872125 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2126+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892127 EventRoot _ -> "EventRoot"
23902128 EventNever -> "EventNever"
23912129 _ -> "something else"
@@ -2400,7 +2138,7 @@ runFrame a = SpiderHost $ do
24002138 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012139 when (parentHeight /= myHeight) $ do
24022140 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2141+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042142 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
24052143 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062144 unsubscribe subscription
@@ -2441,7 +2179,7 @@ invalidateCoincidenceHeight subscribed = do
24412179 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422180 when (oldHeight /= invalidHeight) $ do
24432181 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2182+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452183
24462184updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472185updateSwitchHeight new subscribed = do
@@ -2449,7 +2187,7 @@ updateSwitchHeight new subscribed = do
24492187 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502188 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512189 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2190+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532191
24542192recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552193recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2196,7 @@ recalculateCoincidenceHeight subscribed = do
24582196 height <- calculateCoincidenceHeight subscribed
24592197 when (height /= invalidHeight) $ do
24602198 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2199+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622200
24632201calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642202calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,6 +2235,9 @@ invalidate toReconnectRef wis = do
24972235-- Reflex integration
24982236--------------------------------------------------------------------------------
24992237
2238+-- When we're specializing, we include this from Reflex.Class instead, because
2239+-- it needs access to these types; when we're not, we want them here, so our
2240+-- instance isn't an orphan instance.
25002241-- | Designates the default, global Spider timeline
25012242data SpiderTimeline x
25022243type role SpiderTimeline nominal
@@ -2520,8 +2261,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
25202261 {-# INLINABLE headE #-}
25212262 headE = R.slowHeadE
25222263-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
25252264
25262265instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
25272266 {-# INLINABLE sample #-}
@@ -2543,9 +2282,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
25432282 {-# INLINABLE headE #-}
25442283 headE = R.slowHeadE
25452284-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
25492285
25502286instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
25512287 {-# INLINE return #-}
@@ -2554,13 +2290,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
25542290 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
25552291 {-# INLINE (>>) #-}
25562292 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
25582293 {-# INLINE fail #-}
25592294 fail _ = error "Dynamic does not support 'fail'"
2560−#endif
25612295
25622296{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2297+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
25642298newJoinDyn d =
25652299 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
25662300 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2570,13 +2304,9 @@ newJoinDyn d =
25702304 in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
25712305
25722306instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2307+ fmap f = SpiderDynamic . newMapDyn f . unSpiderDynamic
25742308 x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
25752309
2576−mapDynamicSpider :: HasSpiderTimeline x => (a -> b) -> Reflex.Class.Dynamic (SpiderTimeline x) a -> Reflex.Class.Dynamic (SpiderTimeline x) b
2577−mapDynamicSpider f = SpiderDynamic . newMapDyn f . unSpiderDynamic
2578−{-# INLINE [1] mapDynamicSpider #-}
2579−
25802310instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
25812311 pure = SpiderDynamic . dynamicConst
25822312#if MIN_VERSION_base(4,10,0)
@@ -2595,7 +2325,7 @@ holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.S
25952325holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
25962326holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
25972327
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2328+buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPullM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
25992329buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
26002330
26012331instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
@@ -2609,9 +2339,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26092339 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
26102340 {-# INLINABLE headE #-}
26112341 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
26152342
26162343instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
26172344 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2355,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
26282355 {-# INLINABLE headE #-}
26292356 headE = R.slowHeadE
26302357-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
26332358
26342359instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
26352360 {-# INLINABLE sample #-}
@@ -2650,8 +2375,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
26502375 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
26512376 {-# INLINABLE headE #-}
26522377 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
26552378
26562379--------------------------------------------------------------------------------
26572380-- Deprecated items
@@ -2689,13 +2412,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
26892412 touch h
26902413 return result
26912414
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2415+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2416+ newEventWithTrigger = SpiderHost . lift . fmap SpiderEvent . newEventWithTriggerIO
2417+ newFanEventWithTrigger f = SpiderHost $ lift $ do
26952418 es <- newFanEventWithTriggerIO f
26962419 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
26972420
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2421+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
26992422 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
27002423 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
27012424 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2440,7 @@ unsafeNewSpiderTimelineEnv = do
27172440#ifdef DEBUG
27182441 depthRef <- newIORef 0
27192442#endif
2720− return $ STE $ SpiderTimelineEnv
2443+ return $ SpiderTimelineEnv
27212444 { _spiderTimeline_lock = lock
27222445 , _spiderTimeline_eventEnv = env
27232446#ifdef DEBUG
@@ -2727,19 +2450,19 @@ unsafeNewSpiderTimelineEnv = do
27272450
27282451-- | Create a new SpiderTimelineEnv
27292452newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2453+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312454
2732−data LocalSpiderTimeline (x :: Type) s
2455+data LocalSpiderTimeline x s
27332456
27342457instance Reifies s (SpiderTimelineEnv x) =>
27352458 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2459+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372460
27382461localSpiderTimeline
2739− :: proxy s
2462+ :: Proxy s
27402463 -> SpiderTimelineEnv x
27412464 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2465+localSpiderTimeline _ = unsafeCoerce
27432466
27442467-- | Pass a new timeline to the given function.
27452468withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2470,18 @@ withSpiderTimeline k = do
27472470 env <- unsafeNewSpiderTimelineEnv
27482471 reify env $ \s -> k $ localSpiderTimeline s env
27492472
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2473+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512474
27522475type ComputeM = EventM
27532476
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2477+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552478
27562479instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572480 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582481 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592482 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 }
2483+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2484+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622485 type PullM (SpiderTimeline x) = SpiderPullM x
27632486 type PushM (SpiderTimeline x) = SpiderPushM x
27642487 {-# INLINABLE never #-}
@@ -2771,15 +2494,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712494 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722495 {-# INLINABLE pull #-}
27732496 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776− {-# INLINABLE mergeG #-}
2777− mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780− -> DMap k q
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2497+ {-# INLINABLE merge #-}
2498+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2499+ {-# INLINABLE fan #-}
2500+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832501 {-# INLINABLE switch #-}
27842502 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852503 {-# INLINABLE coincidence #-}
@@ -2787,15 +2505,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872505 {-# INLINABLE current #-}
27882506 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892507 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2508+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912509 {-# INLINABLE unsafeBuildDynamic #-}
27922510 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932511 {-# INLINABLE unsafeBuildIncremental #-}
27942512 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2513+ {-# INLINABLE mergeIncremental #-}
2514+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2515+ {-# INLINABLE mergeIncrementalWithMove #-}
2516+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992517 {-# INLINABLE currentIncremental #-}
28002518 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012519 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2524,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062524 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072525 eventCoercion Coercion = Coercion
28082526 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2527+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112528 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2529+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132530 {-# INLINABLE fanInt #-}
28142531 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
28152532
@@ -2834,7 +2551,7 @@ instance MonadAtomicRef (EventM x) where
28342551 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352552
28362553-- | The monad for actions that manipulate a Spider timeline identified by @x@
2837−newtype SpiderHost (x :: Type) a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2554+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382555
28392556instance Monad (SpiderHost x) where
28402557 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2560,20 @@ instance Monad (SpiderHost x) where
28432560 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442561 {-# INLINABLE return #-}
28452562 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472563 {-# 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
2564+ fail s = SpiderHost $ fail s
28542565
28552566-- | Run an action affecting the global Spider timeline; this will be guarded by
28562567-- a mutex for that timeline
28572568runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2569+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592570
28602571-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612572-- mutex for that timeline
28622573runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2574+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
28642575
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2576+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672577
28682578instance Monad (SpiderHostFrame x) where
28692579 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2582,19 @@ instance Monad (SpiderHostFrame x) where
28722582 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732583 {-# INLINABLE return #-}
28742584 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762585 {-# INLINABLE fail #-}
28772586 fail s = SpiderHostFrame $ fail s
2878−#endif
28792587
28802588instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
28812589 notReadyUntil _ = pure ()
28822590 notReady = pure ()
28832591
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2592+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852593newEventWithTriggerIO f = do
28862594 es <- newFanEventWithTriggerIO $ \Refl -> f
28872595 return $ select es Refl
28882596
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2597+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902598newFanEventWithTriggerIO f = do
28912599 occRef <- newIORef DMap.empty
28922600 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2628,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202628instance PrimMonad (SpiderHostFrame x) where
29212629 type PrimState (SpiderHostFrame x) = PrimState IO
29222630 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 ()