@@ -9,49 +9,40 @@
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 #-}
24+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
25+{-# OPTIONS_GHC -fno-warn-orphans #-}
26+#endif
2827-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
2928-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
3029module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
3130
32−#if MIN_VERSION_base(4,10,0)
33−import Control.Applicative (liftA2)
34−#endif
31+import Control.Applicative
3532import Control.Concurrent
3633import Control.Exception
37−import Control.Monad hiding (forM, forM_, mapM, mapM_)
34+import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
3835import Control.Monad.Exception
39−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
36+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)
4037import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
38+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)
4439import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
4740import Data.Align
4841import Data.Coerce
49−import Data.Dependent.Map (DMap)
42+import Data.Dependent.Map (DMap, DSum (..))
5043import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52−import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53−import qualified Data.FastMutableIntMap as FastMutableIntMap
5444import Data.Foldable hiding (concat, elem, sequence_)
45+import Data.Function
5546import Data.Functor.Constant
5647import Data.Functor.Misc
5748import Data.Functor.Product
@@ -59,73 +50,62 @@ import Data.GADT.Compare
5950import Data.IntMap.Strict (IntMap)
6051import qualified Data.IntMap.Strict as IntMap
6152import Data.IORef
62−import Data.Kind (Type)
63−import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
53+import Data.List hiding (foldl')
54+import Data.Maybe
55+import Data.Monoid ((<>))
6556import Data.Proxy
6657import Data.These
6758import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69−import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
59+import Data.Word
60+import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
61+import qualified Data.FastMutableIntMap as FastMutableIntMap
62+import GHC.Exts
7163import GHC.IORef (IORef (..))
7264import GHC.Stack
7365import Reflex.FastWeak
66+import Reflex.FunctorMaybe
7467import System.IO.Unsafe
7568import System.Mem.Weak
7669import Unsafe.Coerce
7770
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−
8771#ifdef DEBUG_CYCLES
8872import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
89−#endif
90−
9173import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9274import qualified Data.List.NonEmpty as NonEmpty
75+import Data.Monoid (mempty)
9376import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
77+#endif
9578
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
79+import Data.FastWeakBag (FastWeakBag)
9780import qualified Data.FastWeakBag as FastWeakBag
98−
99−import Data.Reflection
100−import Data.Some (Some(Some))
101−import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
10381import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
10482import qualified Data.WeakBag as WeakBag
83+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
84+import Data.Reflection
85+import Data.Some (Some)
86+import qualified Data.Some as Some
87+import Data.Type.Coercion
10588import qualified Reflex.Class
10689import qualified Reflex.Class as R
10790import qualified Reflex.Host.Class
108−import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
91+#endif
92+import Reflex.Patch
93+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
94+
95+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
96+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11297
11398#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
11599import System.IO (stderr)
116−import Data.List (isPrefixOf)
100+import qualified Data.ByteString.Char8 as BS8
117101#endif
118102
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123103#ifdef DEBUG_TRACE_EVENTS
104+
124105withStackOneLine :: (BS8.ByteString -> a) -> a
125106withStackOneLine expr = unsafePerformIO $ do
126107 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
108+ return (expr (BS8.pack (unwords (reverse stack))))
129109
130110#endif
131111
@@ -136,42 +116,28 @@ debugInvalidateHeight :: Bool
136116debugInvalidate :: Bool
137117
138118#ifdef DEBUG
119+
139120#define DEBUG_NODEIDS
140121
141−#ifdef DEBUG_TRACE_PROPAGATION
142122debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146123
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150124debugInvalidateHeight = False
151−#endif
152125
153−#ifdef DEBUG_TRACE_INVALIDATION
154126debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158127
159128class HasNodeId a where
160129 getNodeId :: a -> Int
161130
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
131+instance HasNodeId (Hold x p a) where
169132 getNodeId = holdNodeId
170133
134+instance HasNodeId (PushSubscribed x a b) where
135+ getNodeId = pushSubscribedNodeId
136+
171137instance HasNodeId (SwitchSubscribed x a) where
172138 getNodeId = switchSubscribedNodeId
173139
174−instance HasNodeId (FanSubscribed x v a) where
140+instance HasNodeId (FanSubscribed x a) where
175141 getNodeId = fanSubscribedNodeId
176142
177143instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +151,41 @@ instance HasNodeId (Pull x a) where
185151
186152{-# INLINE showNodeId #-}
187153showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
154+showNodeId = ("#"<>) . show . getNodeId
155+
156+showSubscriberType :: Subscriber x a -> String
157+showSubscriberType = \case
158+ SubscriberPush _ _ -> "SubscriberPush"
159+ SubscriberMerge _ _ -> "SubscriberMerge"
160+ SubscriberFan _ -> "SubscriberFan"
161+ SubscriberMergeChange _ -> "SubscriberMergeChange"
162+ SubscriberHold _ -> "SubscriberHold"
163+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
164+ SubscriberSwitch _ -> "SubscriberSwitch"
165+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
166+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
167+ SubscriberHandle -> "SubscriberHandle"
168+
169+showEventType :: Event x a -> String
170+showEventType = \case
171+ EventRoot _ _ -> "EventRoot"
172+ EventNever -> "EventNever"
173+ EventPush _ -> "EventPush"
174+ EventMerge _ -> "EventMerge"
175+ EventFan _ _ -> "EventFan"
176+ EventSwitch _ -> "EventSwitch"
177+ EventCoincidence _ -> "EventCoincidence"
178+ EventHold _ -> "EventHold"
179+ EventDyn _ -> "EventDyn"
180+ EventHoldIdentity _ -> "EventHoldIdentity"
181+ EventDynIdentity _ -> "EventDynIdentity"
193182
194183#else
195184
196185debugPropagate = False
186+
197187debugInvalidateHeight = False
188+
198189debugInvalidate = False
199190
200191-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +193,6 @@ debugInvalidate = False
202193showNodeId :: a -> String
203194showNodeId _ = ""
204195
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209196#endif
210197
211198#ifdef DEBUG_NODEIDS
@@ -215,6 +202,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215202
216203newNodeId :: IO Int
217204newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
205+
206+{-# NOINLINE unsafeNodeId #-}
207+unsafeNodeId :: a -> Int
208+unsafeNodeId a = unsafePerformIO $ do
209+ touch a
210+ newNodeId
218211#endif
219212
220213--------------------------------------------------------------------------------
@@ -253,7 +246,7 @@ subscribeAndRead = unEvent
253246{-# INLINE [1] pushCheap #-}
254247pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255248pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
249+ (subscription, occ) <- subscribeAndRead e $ sub
257250 { subscriberPropagate = \a -> do
258251 mb <- f a
259252 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +265,10 @@ terminalSubscriber p = Subscriber
272265
273266-- | Subscribe to an Event only for the duration of one occurrence
274267{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
268+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276269subscribeAndReadHead e sub = do
277270 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
271+ (subscription, occ) <- subscribeAndRead e $ sub
279272 { subscriberPropagate = \a -> do
280273 liftIO $ unsubscribe =<< readIORef subscriptionRef
281274 subscriberPropagate sub a
@@ -286,42 +279,24 @@ subscribeAndReadHead e sub = do
286279 return (subscription, occ)
287280
288281--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)
282+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290283headE originalE = do
291284 parent <- liftIO $ newIORef $ Just originalE
292285 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293286 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
287+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295288 when (isJust occ) clearParent
296− return $ Event $ \sub ->
289+ return $ Event $ \sub -> do
297290 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
291+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299292 Just e -> subscribeAndReadHead e sub
300293
301294data CacheSubscribed x a
302295 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303296 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304297 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308298 }
309299
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−
325300-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326301-- repeatedly
327302--
@@ -336,33 +311,27 @@ cacheEvent e =
336311#else
337312 Event $
338313#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
314+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
315+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
316+ in \sub -> {-# SCC "cacheEvent" #-} do
343317#ifdef DEBUG_TRACE_EVENTS
344318 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345319#endif
346320 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347321 Just subscribedTicket -> return subscribedTicket
348322 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352323 subscribers <- liftIO FastWeakBag.empty
353324 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
357325 (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− }
326+ { subscriberPropagate = \a -> do
327+ liftIO $ writeIORef occRef $ Just a
328+ scheduleClear occRef
329+ propagateFast a subscribers
330+ , subscriberInvalidateHeight = \old -> do
331+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
332+ , subscriberRecalculateHeight = \new -> do
333+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
334+ }
366335 when (isJust occ) $ do
367336 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368337 scheduleClear occRef
@@ -370,45 +339,29 @@ cacheEvent e =
370339 { _cacheSubscribed_subscribers = subscribers
371340 , _cacheSubscribed_parent = parentSub
372341 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376342 }
377343 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378344 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379345 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−
346+ liftIO $ do
347+ subscribed <- getFastWeakTicketValue subscribedTicket
348+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
349+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
350+ let es = EventSubscription
351+ { _eventSubscription_unsubscribe = do
352+ FastWeakBag.remove ticket
353+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
354+ when isEmpty $ do
355+ writeIORef mSubscribedRef emptyFastWeak
356+ unsubscribe $ _cacheSubscribed_parent subscribed
357+ touch ticket
358+ touch subscribedTicket
359+ , _eventSubscription_subscribed = EventSubscribed
360+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
361+ , eventSubscribedRetained = toAny subscribedTicket
362+ }
363+ }
364+ return (es, occ)
412365
413366subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414367subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +373,13 @@ wrap tag getSpecificSubscribed sub = do
420373 let es = tag subd
421374 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422375
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
376+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424377eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425378
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429379eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
380+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431381
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
382+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433383eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434384
435385eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,7 +388,7 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438388eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439389eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440390
441−eventHold :: Hold x p -> Event x p
391+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442392eventHold !h = Event $ subscribeHoldEvent h
443393
444394eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
@@ -464,6 +414,16 @@ data Subscriber x a = Subscriber
464414 , subscriberRecalculateHeight :: !(Height -> IO ())
465415 }
466416
417+--TODO: Move this comment to WeakBag
418+-- These function are constructor functions that are marked NOINLINE so they are
419+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
420+-- so any weak references that are attached to the constructors will have their
421+-- finalizer run. Using the opaque constructor, does not see the
422+-- constructor application, so it behaves like an IORef and cannot be fused away.
423+--
424+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
425+-- the weak pointer to it in some cases.
426+
467427newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468428newSubscriberHold h = return $ Subscriber
469429 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +431,85 @@ newSubscriberHold h = return $ Subscriber
471431 , subscriberRecalculateHeight = \_ -> return ()
472432 }
473433
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
434+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
435+newSubscriberFan subscribed = return $ Subscriber
476436 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477437 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
438+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479439 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480440 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
441+ let f _ (Pair (Identity v) subsubs) = do
482442 propagate v $ _fanSubscribedChildren_list subsubs
483443 return $ Constant ()
484444 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485445 return ()
486446 , subscriberInvalidateHeight = \old -> do
447+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487448 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
449+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
450+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489451 , subscriberRecalculateHeight = \new -> do
452+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490453 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
454+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
455+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492456 }
493457
494458newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
459+newSubscriberSwitch subscribed = return $ Subscriber
496460 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
461+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497462 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498463 scheduleClear $ switchSubscribedOccurrence subscribed
499464 propagate a $ switchSubscribedSubscribers subscribed
500465 , subscriberInvalidateHeight = \_ -> do
466+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501467 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502468 when (oldHeight /= invalidHeight) $ do
503469 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
470+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
471+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
472+ , subscriberRecalculateHeight = \new -> do
473+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
474+ updateSwitchHeight new subscribed
475+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
476+ }
507477
508478newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
479+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510480 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
481+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511482 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512483 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513484 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514485 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515486 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517487 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518488 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519489 case occ of
520− Nothing ->
490+ Nothing -> do
521491 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522492 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
493+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
494+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525495 Just o -> do -- Since it's already firing, no need to adjust height
526496 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527497 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528498 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
499+ , subscriberInvalidateHeight = \_ -> do
500+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
501+ invalidateCoincidenceHeight subscribed
502+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
503+ , subscriberRecalculateHeight = \_ -> do
504+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
505+ recalculateCoincidenceHeight subscribed
506+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531507 }
532508
533509newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
510+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535511 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
512+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536513 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537514 case occ of
538515 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +517,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540517 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541518 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542519 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
520+ , subscriberInvalidateHeight = \_ -> do
521+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
522+ invalidateCoincidenceHeight subscribed
523+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
524+ , subscriberRecalculateHeight = \_ -> do
525+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
526+ recalculateCoincidenceHeight subscribed
527+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545528 }
546529
547530invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +534,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551534recalculateSubscriberHeight = flip subscriberRecalculateHeight
552535
553536-- | 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) $
537+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
538+propagate a subscribers = withIncreasedDepth $ do
556539 -- 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
557540 --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
541+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559542
560543-- | 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) $
544+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
545+propagateFast a subscribers = withIncreasedDepth $ do
563546 -- 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
564547 --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
548+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566549
567550--------------------------------------------------------------------------------
568551-- EventSubscribed
@@ -571,16 +554,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571554toAny :: a -> Any
572555toAny = unsafeCoerce
573556
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.
579557data EventSubscribed x = EventSubscribed
580558 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581559 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582560#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
561+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584562 , eventSubscribedHasOwnHeightRef :: !Bool
585563 , eventSubscribedWhoCreated :: !(IO [String])
586564#endif
@@ -607,23 +585,13 @@ eventSubscribedNever = EventSubscribed
607585 , eventSubscribedWhoCreated = return ["never"]
608586#endif
609587 }
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− }
620588
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
589+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622590eventSubscribedFan !subscribed = EventSubscribed
623591 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624592 , eventSubscribedRetained = toAny subscribed
625593#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
594+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627595 , eventSubscribedHasOwnHeightRef = False
628596 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629597#endif
@@ -636,7 +604,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636604#ifdef DEBUG_CYCLES
637605 , eventSubscribedGetParents = do
638606 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
607+ return [Some.This $ _eventSubscription_subscribed s]
640608 , eventSubscribedHasOwnHeightRef = True
641609 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642610#endif
@@ -649,8 +617,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649617#ifdef DEBUG_CYCLES
650618 , eventSubscribedGetParents = do
651619 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
620+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
621+ innerParents = maybeToList $ fmap Some.This innerSubscription
654622 return $ outerParent : innerParents
655623 , eventSubscribedHasOwnHeightRef = True
656624 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +632,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664632whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665633whoCreatedEventSubscribed = eventSubscribedWhoCreated
666634
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
635+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668636walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
637+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670638 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671639 when (h == invalidHeight) $ do
672640 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
641+ modify (Some.This s :)
674642 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
643+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676644 return subscribers
677645#endif
678646
679647{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
648+subscribeHoldEvent :: HasSpiderTimeline x => Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681649subscribeHoldEvent = subscribeAndRead . holdEvent
682650
683651--------------------------------------------------------------------------------
@@ -700,7 +668,7 @@ behaviorPull !p = Behavior $ do
700668 val <- liftIO $ readIORef $ pullValue p
701669 case val of
702670 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
671+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704672 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705673 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706674 return $ pullSubscribedValue subscribed
@@ -709,7 +677,7 @@ behaviorPull !p = Behavior $ do
709677 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710678 parentsRef <- liftIO $ newIORef []
711679 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
680+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713681 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714682 parents <- liftIO $ readIORef parentsRef
715683 let subscribed = PullSubscribed
@@ -719,7 +687,7 @@ behaviorPull !p = Behavior $ do
719687 , pullSubscribedParents = parents
720688 }
721689 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
690+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723691 return a
724692
725693behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,7 +698,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730698readHoldTracked h = do
731699 result <- liftIO $ readIORef $ holdValue h
732700 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
701+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734702 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735703 return result
736704
@@ -744,46 +712,42 @@ readBehaviorUntracked b = do
744712-- Dynamic
745713--------------------------------------------------------------------------------
746714
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`?
715+data Dynamic x p = Dynamic
716+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
717+ , dynamicUpdated :: !(Event x p)
752718 }
753719
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
720+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760721dynamicHold !h = Dynamic
761722 { dynamicCurrent = behaviorHold h
762723 , dynamicUpdated = eventHold h
763724 }
764725
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
726+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766727dynamicHoldIdentity = dynamicHold
767728
768−dynamicConst :: PatchTarget p -> DynamicS x p
729+dynamicConst :: PatchTarget p -> Dynamic x p
769730dynamicConst !a = Dynamic
770731 { dynamicCurrent = behaviorConst a
771732 , dynamicUpdated = eventNever
772733 }
773734
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
735+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775736dynamicDyn !d = Dynamic
776737 { dynamicCurrent = behaviorDyn d
777738 , dynamicUpdated = eventDyn d
778739 }
779740
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
741+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781742dynamicDynIdentity = dynamicDyn
782743
783744--------------------------------------------------------------------------------
784745-- Combinators
785746--------------------------------------------------------------------------------
786747
748+--TODO: Figure out why certain things are not 'representational', then make them
749+--representational so we can use coerce
750+
787751--type role Hold representational
788752data Hold x p
789753 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,7 +759,9 @@ data Hold x p
795759#endif
796760 }
797761
798−-- | A statically allocated 'SpiderTimeline'
762+-- | A statically allocated 'SpiderTimeline'; this is the only instance of
763+-- 'SpiderTimeline' that can used when using
764+-- -fspecialize-to-spidertimeline-global.
799765data Global
800766
801767{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -804,27 +770,30 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804770
805771-- | Stores all global data relevant to a particular Spider timeline; only one
806772-- 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
773+data SpiderTimelineEnv x = SpiderTimelineEnv
813774 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814775 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815776#ifdef DEBUG
816777 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817778#endif
818779 }
819−type role SpiderTimelineEnv' phantom
780+type role SpiderTimelineEnv nominal
820781
821782instance Eq (SpiderTimelineEnv x) where
822783 _ == _ = True -- Since only one exists of each type
823784
824785instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
786+#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
787+ geqToEq _ = id
788+ geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
789+ then case unsafeCoerce Refl :: a :~: b of
790+ Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
791+ else different
792+#else
793+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826794 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827795 else Nothing
796+#endif
828797
829798data EventEnv x
830799 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
@@ -832,9 +801,9 @@ data EventEnv x
832801 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833802 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834803 , 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])
804+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
805+ , eventEnvIntClears :: !(IORef [SomeIntClear])
806+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838807 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839808 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840809 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +814,7 @@ runEventM :: EventM x a -> IO a
845814runEventM = unEventM
846815
847816asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
817+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849818
850819class MonadIO m => Defer a m where
851820 getDeferralQueue :: m (IORef [a])
@@ -894,7 +863,11 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
894863 delayedRef <- asksEventEnv eventEnvDelayedMerges
895864 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896865
866+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
867+class x ~ Global => HasSpiderTimeline x where
868+#else
897869class HasSpiderTimeline x where
870+#endif
898871 -- | Retrieve the current SpiderTimelineEnv
899872 spiderTimeline :: SpiderTimelineEnv x
900873
@@ -906,29 +879,29 @@ putCurrentHeight h = do
906879 heightRef <- asksEventEnv eventEnvCurrentHeight
907880 liftIO $ writeIORef heightRef $! h
908881
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
882+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910883 {-# INLINE getDeferralQueue #-}
911884 getDeferralQueue = asksEventEnv eventEnvClears
912885
913886{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
887+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
888+scheduleClear r = defer $ SomeClear r
916889
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
890+instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
918891 {-# INLINE getDeferralQueue #-}
919892 getDeferralQueue = asksEventEnv eventEnvIntClears
920893
921894{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
895+scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
896+scheduleIntClear r = defer $ SomeIntClear r
924897
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
898+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926899 {-# INLINE getDeferralQueue #-}
927900 getDeferralQueue = asksEventEnv eventEnvRootClears
928901
929902{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
903+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
904+scheduleRootClear r = defer $ SomeRootClear r
932905
933906instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934907 {-# INLINE getDeferralQueue #-}
@@ -983,9 +956,9 @@ getHoldEventSubscription h = do
983956
984957type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985958
959+--type role BehaviorM representational
986960-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
961+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989962
990963instance Monad (BehaviorM x) where
991964 {-# INLINE (>>=) #-}
@@ -994,16 +967,14 @@ instance Monad (BehaviorM x) where
994967 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995968 {-# INLINE return #-}
996969 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998970 {-# INLINE fail #-}
999971 fail s = BehaviorM $ fail s
1000−#endif
1001972
1002973data BehaviorSubscribed x a
1003974 = forall p. BehaviorSubscribedHold (Hold x p)
1004975 | BehaviorSubscribedPull (PullSubscribed x a)
1005976
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
977+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007978
1008979--type role PullSubscribed representational
1009980data PullSubscribed x a
@@ -1038,7 +1009,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
10381009#endif
10391010 }
10401011
1041−data Root x k
1012+data Root x (k :: * -> *)
10421013 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
10431014 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
10441015 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1028,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571028newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581029
10591030-- 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)
1031+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
10611032
10621033newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631034
@@ -1082,8 +1053,7 @@ heightBagFromList :: [Height] -> HeightBag
10821053heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831054
10841055heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1056+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871057
10881058heightBagRemove :: Height -> HeightBag -> HeightBag
10891059heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1062,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921062 0 -> IntMap.delete h c
10931063 _ -> IntMap.insert h (pred old) c
10941064
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−
11021065heightBagMax :: HeightBag -> Height
11031066heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041067 Just ((h, _), _) -> Height h
@@ -1116,25 +1079,25 @@ heightBagVerify b@(HeightBag s c) = if
11161079heightBagVerify = id
11171080#endif
11181081
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)))
1082+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1083+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1084+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1085+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231086 }
11241087
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
1088+data FanSubscribed (x :: *) k
1089+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1090+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1091+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291092 , fanSubscribedParent :: !(EventSubscription x)
11301093#ifdef DEBUG_NODEIDS
11311094 , fanSubscribedNodeId :: Int
11321095#endif
11331096 }
11341097
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1098+data Fan x k
1099+ = Fan { fanParent :: !(Event x (DMap k Identity))
1100+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381101 }
11391102
11401103data SwitchSubscribed x a
@@ -1188,35 +1151,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881151newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891152newInvalidatorPull p = return $! InvalidatorPull p
11901153
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1154+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1155+ fmapMaybe f = push $ return . f
11931156
11941157instance HasSpiderTimeline x => Align (Event x) where
11951158 nil = eventNever
1196−#if MIN_VERSION_these(0, 8, 0)
1197−instance HasSpiderTimeline x => Semialign (Event x) where
1198−#endif
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1201−
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1205−#endif
1206− zip x y = mapMaybe justThese $ align x y
1207−#endif
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)
1159+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12121160
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1161+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141162
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1163+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161164newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171165
12181166--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)
1167+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201168zipDynWith f da db =
12211169 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221170 ec = flip push eab $ \o -> do
@@ -1231,20 +1179,26 @@ zipDynWith f da db =
12311179 return $ Just $ Identity $ f a b
12321180 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331181
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1182+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
12351183buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1184+ result <- liftIO $ newIORef $ Left (readV0, v')
12371185 let !d = Dyn result
12381186 defer $ SomeDynInit d
12391187 return d
12401188
12411189unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1190+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1191+ where x = (readV0, v')
12441192
12451193-- ResultM can read behaviors and events
12461194type ResultM = EventM
12471195
1196+{-# NOINLINE unsafeNewIORef #-}
1197+unsafeNewIORef :: a -> b -> IORef b
1198+unsafeNewIORef a b = unsafePerformIO $ do
1199+ touch a
1200+ newIORef b
1201+
12481202instance HasSpiderTimeline x => Functor (Event x) where
12491203 fmap f = push $ return . Just . f
12501204
@@ -1257,42 +1211,33 @@ push f e = cacheEvent (pushCheap f e)
12571211
12581212{-# INLINABLE pull #-}
12591213pull :: 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
1214+pull a = behaviorPull $ Pull
1215+ { pullCompute = a
1216+ , pullValue = unsafeNewIORef a Nothing
12681217#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1218+ , pullNodeId = unsafeNodeId a
12701219#endif
1271− }
1220+ }
12721221
12731222{-# INLINABLE switch #-}
12741223switch :: 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− }
1224+switch a = eventSwitch $ Switch
1225+ { switchParent = a
1226+ , switchSubscribed = unsafeNewIORef a Nothing
1227+ }
12811228
12821229coincidence :: 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− }
1230+coincidence a = eventCoincidence $ Coincidence
1231+ { coincidenceParent = a
1232+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1233+ }
12891234
12901235-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911236run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921237run roots after = do
12931238 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
1239+ t <- SpiderHost ask
1240+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961241 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971242 occBefore <- liftIO $ do
12981243 occBefore <- readIORef occRef
@@ -1330,11 +1275,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301275 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311276 EQ -> a
13321277
1333−newtype Clear a = Clear (IORef (Maybe a))
1278+data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
13341279
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1280+data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
13361281
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1282+data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
13381283
13391284data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401285
@@ -1346,110 +1291,55 @@ mkWeakPtrWithDebug x debugNote = do
13461291 x' <- evaluate x
13471292 mkWeakPtr x' $
13481293 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1294+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501295 else Nothing
13511296
13521297type WeakList a = [Weak a]
13531298
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−
13811299{-# 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
1300+#ifdef DEBUG
1301+withIncreasedDepth :: CanTrace x m => m a -> m a
1302+withIncreasedDepth a = do
1303+ spiderTimeline <- askSpiderTimelineEnv
1304+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851305 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1306+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871307 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−
14121308#else
1309+withIncreasedDepth :: m a -> m a
1310+withIncreasedDepth = id
1311+#endif
14131312
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1313+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171314
14181315{-# INLINE tracePropagate #-}
14191316tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1317+tracePropagate p = traceWhen p debugPropagate
14211318
14221319{-# INLINE traceInvalidate #-}
14231320traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1321+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14251322
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1429−
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1433−
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1437−
1438−
1439−
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1442−trace _ _ = return ()
1443−
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1323+{-# INLINE traceWhen #-}
1324+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1325+traceWhen p b message = traceMWhen p b $ return message
14471326
1327+{-# INLINE traceMWhen #-}
1328+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1329+traceMWhen _ b getMessage = when b $ do
1330+ message <- getMessage
1331+#ifdef DEBUG
1332+ spiderTimeline <- askSpiderTimelineEnv
1333+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1334+#else
1335+ let d = 0
14481336#endif
1337+ liftIO $ putStrLn $ replicate d ' ' <> message
14491338
14501339whoCreatedIORef :: IORef a -> IO [String]
14511340whoCreatedIORef (IORef a) = whoCreated $! a
14521341
1342+#ifdef DEBUG_CYCLES
14531343groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541344groupByHead = \case
14551345 [] -> []
@@ -1460,54 +1350,20 @@ groupByHead = \case
14601350 | otherwise -> (x, xs :| []) : l
14611351
14621352listsToForest :: 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−
1353+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951354#endif
14961355
1497−
14981356{-# INLINE propagateSubscriberHold #-}
14991357propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001358propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1359+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021360 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031361 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051362 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061363 case {-# SCC "apply" #-} apply a v of
15071364 Nothing -> return ()
15081365 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1366+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111367 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121368 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131369 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1371,25 @@ propagateSubscriberHold h a = do
15151371data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161372
15171373runBehaviorM :: 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)
1374+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191375
15201376askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211377askInvalidator = do
1522− (!m, _) <- ask
1378+ (!m, _) <- BehaviorM ask
15231379 case m of
15241380 Nothing -> return Nothing
15251381 Just (!wi, _) -> return $ Just wi
15261382
15271383askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281384askParentsRef = do
1529− (!m, _) <- ask
1385+ (!m, _) <- BehaviorM ask
15301386 case m of
15311387 Nothing -> return Nothing
15321388 Just (_, !p) -> return $ Just p
15331389
15341390askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351391askBehaviorHoldInits = do
1536− (_, !his) <- ask
1392+ (_, !his) <- BehaviorM ask
15371393 return his
15381394
15391395{-# INLINE getDynHold #-}
@@ -1541,27 +1397,20 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411397getDynHold d = do
15421398 mh <- liftIO $ readIORef $ unDyn d
15431399 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1400+ Right h -> return h
1401+ Left (readV0, v') -> do
15461402 holdInits <- getDeferralQueue
15471403 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
15541404 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1405+ liftIO $ writeIORef (unDyn d) $ Right h
15561406 return h
15571407
1558−
15591408-- Always refers to 0
15601409{-# NOINLINE zeroRef #-}
15611410zeroRef :: IORef Height
15621411zeroRef = unsafePerformIO $ newIORef zeroHeight
15631412
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)
1413+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651414getRootSubscribed k r sub = do
15661415 mSubscribed <- readIORef $ rootSubscribed r
15671416 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1424,9 @@ getRootSubscribed k r sub = do
15751424 let !cached = rootSubscribed r
15761425 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771426 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1427+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811428 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821429 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861430 let !subscribed = RootSubscribed
15871431 { rootSubscribedKey = k
15881432 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1435,7 @@ getRootSubscribed k r sub = do
15911435 , rootSubscribedUninit = uninit
15921436 , rootSubscribedWeakSelf = weakSelf
15931437#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1438+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951439#endif
15961440 }
15971441 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1471,6 @@ data FanInt x a = FanInt
16271471 { _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
16281472 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291473 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331474 }
16341475
16351476newFanInt :: IO (FanInt x a)
@@ -1637,39 +1478,38 @@ newFanInt = do
16371478 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
16381479 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391480 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431481 return $ FanInt
16441482 { _fanInt_subscribers = subscribers
16451483 , _fanInt_subscriptionRef = subscriptionRef
16461484 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501485 }
16511486
1487+{-# NOINLINE unsafeNewFanInt #-}
1488+unsafeNewFanInt :: b -> FanInt x a
1489+unsafeNewFanInt b = unsafePerformIO $ do
1490+ touch b
1491+ newFanInt
1492+
16521493fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1494+fanInt p =
1495+ let self = unsafeNewFanInt p
1496+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561497 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571498 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
1499+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601500 { subscriberPropagate = \m -> do
16611501 liftIO $ writeIORef (_fanInt_occRef self) m
16621502 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 ->
1503+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1504+ FastWeakBag.traverse b $ \s -> do
16651505 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1506+ , subscriberInvalidateHeight = \old -> do
1507+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1508+ FastWeakBag.traverse b $ \s -> do
16691509 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1510+ , subscriberRecalculateHeight = \new -> do
1511+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1512+ FastWeakBag.traverse b $ \s -> do
16731513 subscriberRecalculateHeight s new
16741514 }
16751515 liftIO $ do
@@ -1683,28 +1523,13 @@ fanInt p = unsafePerformIO $ do
16831523 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841524 return b
16851525 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1526+ t <- liftIO $ FastWeakBag.insert sub b
16871527 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−
1528+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1529+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051530
17061531{-# 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))
1532+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081533getFanSubscribed k f sub = do
17091534 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101535 case mSubscribed of
@@ -1722,16 +1547,13 @@ getFanSubscribed k f sub = do
17221547 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231548 occRef <- liftIO $ newIORef parentOcc
17241549 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281550 let subscribed = FanSubscribed
17291551 { fanSubscribedCachedSubscribed = fanSubscribed f
17301552 , fanSubscribedOccurrence = occRef
17311553 , fanSubscribedParent = subscription
17321554 , fanSubscribedSubscribers = subscribersRef
17331555#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1556+ , fanSubscribedNodeId = unsafeNodeId f
17351557#endif
17361558 }
17371559 let !self = (k, subscribed)
@@ -1741,7 +1563,7 @@ getFanSubscribed k f sub = do
17411563 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421564 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431565
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1566+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451567cleanupFanSubscribed (k, subscribed) = do
17461568 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471569 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1575,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531575 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541576
17551577{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1578+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571579subscribeFanSubscribed k subscribed sub = do
17581580 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591581 case DMap.lookup k subscribers of
@@ -1791,9 +1613,6 @@ getSwitchSubscribed s sub = do
17911613 when (isJust parentOcc) $ scheduleClear occRef
17921614 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931615 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971616 let !subscribed = SwitchSubscribed
17981617 { switchSubscribedCachedSubscribed = switchSubscribed s
17991618 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1625,7 @@ getSwitchSubscribed s sub = do
18061625 , switchSubscribedCurrentParent = subscriptionRef
18071626 , switchSubscribedWeakSelf = weakSelf
18081627#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1628+ , switchSubscribedNodeId = unsafeNodeId s
18101629#endif
18111630 }
18121631 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1670,6 @@ getCoincidenceSubscribed c sub = do
18511670 scheduleClear innerSubdRef
18521671 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531672 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571673 let subscribed = CoincidenceSubscribed
18581674 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591675 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1680,7 @@ getCoincidenceSubscribed c sub = do
18641680 , coincidenceSubscribedInnerParent = innerSubdRef
18651681 , coincidenceSubscribedWeakSelf = weakSelf
18661682#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1683+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681684#endif
18691685 }
18701686 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1697,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811697subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821698subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831699
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)
1700+{-# INLINE merge #-}
1701+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1702+merge d = cacheEvent (mergeCheap d)
18891703
18901704{-# 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)
1705+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1706+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951707
18961708{-# 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
1709+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1710+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031711 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1712+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051713 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061714 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071715 (mOldSubd, newPs) <- case me of
19081716 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091717 Just e -> do
19101718 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1719+ subscription@(EventSubscription _ subd) <- subscribe e s
19121720 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131721 let newParent = MergeSubscribedParent subscription
19141722 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151723 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161724 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1725+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201726 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211727 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221728 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1729+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251730 getInitialSubscribers initialParents subscriber = do
19261731 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271732 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1733+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291734 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1735+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311736 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321737 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331738 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341739 )
1935−
19361740 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371741 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381742
19391743{-# 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
1744+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1745+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451746 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1747+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471748 updateMe subscriber heightBagRef oldParents p = do
19481749 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1750+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501751 subscribeParent k e = do
19511752 keyRef <- liftIO $ newIORef k
19521753 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1756,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551756 newParentHeight <- getEventSubscribedHeight subd
19561757 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571758 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1759+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591760 -- 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
1761+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611762 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621763 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1764+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661765 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671766 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681767 Just toKey -> do
19691768 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701769 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1770+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741771 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1772+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761773 getInitialSubscribers initialParents subscriber = do
19771774 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781775 keyRef <- liftIO $ newIORef k
19791776 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1777+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811778 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1779+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831780 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841781 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851782 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861783 )
1987−
19881784 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891785 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901786
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1787+type MergeUpdateFunc k x p s
1788+ = (forall a. EventM x (k a) -> Subscriber x a)
19931789 -> IORef HeightBag
19941790 -> DMap k s
19951791 -> p
19961792 -> EventM x ([EventSubscription x], DMap k s)
19971793
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)
1794+type MergeInitFunc k x s
1795+ = DMap k (Event x)
1796+ -> (forall a. EventM x (k a) -> Subscriber x a)
1797+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041798
20051799type MergeDestroyFunc k s
20061800 = DMap k s
20071801 -> IO ()
20081802
2009−data Merge x k v s = Merge
1803+data Merge x k s = Merge
20101804 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111805 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121806 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1807+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1808+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151809 }
20161810
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1811+invalidateMergeHeight :: Merge x k s -> IO ()
20181812invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191813
20201814invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211815invalidateMergeHeight' heightRef sub = do
20221816 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
1817+ 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
20251818 writeIORef heightRef $! invalidHeight
20261819 subscriberInvalidateHeight sub oldHeight
20271820
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1821+
1822+revalidateMergeHeight :: Merge x k s -> IO ()
20291823revalidateMergeHeight m = do
20301824 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
1825+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341826 heights <- readIORef $ _merge_heightBagRef m
20351827 parents <- readIORef $ _merge_parentsRef m
20361828 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1830,44 @@ revalidateMergeHeight m = do
20381830 LT -> return ()
20391831 EQ -> do
20401832 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1833+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421834 writeIORef (_merge_heightRef m) $! height
20431835 subscriberRecalculateHeight (_merge_sub m) height
20441836 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451837
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1838+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471839scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481840 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
1841+ 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
20521842 --TODO: Assert that m is not empty
20531843 subscriberPropagate (_merge_sub m) vals
20541844
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
1845+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1846+mergeSubscriber m getKey = Subscriber
20781847 { subscriberPropagate = \a -> do
20791848 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801849 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1850+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821851 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831852 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841853 when (DMap.null oldM) $ do -- Only schedule the firing once
20851854 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1855+ --TODO: assertions about height
1856+ currentHeight <- getCurrentHeight
1857+ when (height <= currentHeight) $ do
1858+ if height /= invalidHeight
1859+ then do
1860+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1861+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1862+ else liftIO $ do
1863+#ifdef DEBUG_CYCLES
1864+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1865+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1866+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1867+#else
1868+ let cycleInfo = ""
1869+#endif
1870+ error $ "Causality loop found" <> cycleInfo
20881871 scheduleMergeSelf m height
20891872 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901873 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1878,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951878 }
20961879
20971880--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)
1881+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1882+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001883 where updateMe = do
21011884 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1885+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031886 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041887 return subscriptionsToKill
21051888
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
1889+{-# INLINE mergeCheap' #-}
1890+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)
1891+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101892 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111893 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121894 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131895 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141896 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
1897+ let m = Merge
21301898 { _merge_parentsRef = parentsRef
21311899 , _merge_heightBagRef = heightBagRef
21321900 , _merge_heightRef = heightRef
21331901 , _merge_sub = sub
21341902 , _merge_accumRef = accumRef
21351903 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1904+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371905 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381906 myHeight = if invalidHeight `elem` heights
21391907 then invalidHeight
@@ -2142,57 +1910,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421910 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431911 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441912 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1913+ unless (DMap.null accum) $ do
1914+ scheduleMergeSelf m myHeight
21461915 liftIO $ writeIORef accumRef $! accum
21471916 liftIO $ writeIORef heightRef $! myHeight
21481917 liftIO $ writeIORef heightBagRef $! myHeightBag
1918+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491919 liftIO $ writeIORef parentsRef $! initialParentState
21501920 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1921+ let s = Subscriber
21521922 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1923+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1924+ defer $ updateMerge m updateFunc a
21551925 , subscriberInvalidateHeight = \_ -> return ()
21561926 , subscriberRecalculateHeight = \_ -> return ()
21571927 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1928+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1929+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601930 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611931 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621932 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1933+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641934 let unsubscribeAll = destroy =<< readIORef parentsRef
1935+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1936+ , occ
1937+ )
21651938
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)
1939+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701940mergeInt = cacheEvent . mergeIntCheap
21711941
21721942{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1943+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741944mergeIntCheap d = Event $ \sub -> do
21751945 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761946 accum <- liftIO $ FastMutableIntMap.newEmpty
21771947 heightRef <- liftIO $ newIORef zeroHeight
21781948 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791949 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− }
21901950 let scheduleSelf = do
21911951 height <- liftIO $ readIORef $ heightRef
21921952 scheduleMerge' height heightRef $ do
21931953 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941954 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1955+ invalidateMyHeight = do
1956+ invalidateMergeHeight' heightRef sub
21961957 recalculateMyHeight = do
21971958 currentHeight <- readIORef heightRef
21981959 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 +1963,12 @@ mergeIntCheap d = Event $ \sub -> do
22021963 LT -> return ()
22031964 EQ -> do
22041965 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1966+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061967 writeIORef heightRef $! height
22071968 subscriberRecalculateHeight sub height
22081969 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091970 mySubscriber k = Subscriber
22101971 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131972 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141973 liftIO $ FastMutableIntMap.insert accum k a
22151974 when wasEmpty scheduleSelf
@@ -2243,6 +2002,7 @@ mergeIntCheap d = Event $ \sub -> do
22432002 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442003 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452004 return Nothing
2005+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462006 defer $ SomeMergeInit $ do
22472007 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482008 where
@@ -2256,39 +2016,35 @@ mergeIntCheap d = Event $ \sub -> do
22562016 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572017 liftIO $ for_ oldParents $ \oldParent -> do
22582018 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612019 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622020 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2021+ let s = Subscriber
22642022 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652023 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662024 defer $ updateMe a
22672025 , subscriberInvalidateHeight = \_ -> return ()
22682026 , subscriberRecalculateHeight = \_ -> return ()
22692027 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2028+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712029 forM_ change $ \c -> defer $ updateMe c
22722030 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732031 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742032 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2033+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762034 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2035+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2036+ , occ
2037+ )
22802038
22812039newtype 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) }
22832040
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2041+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2042+fan e =
22872043 let f = Fan
22882044 { fanParent = e
2289− , fanSubscribed = ref
2045+ , fanSubscribed = unsafeNewIORef e Nothing
22902046 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2047+ in EventSelector $ \k -> eventFan k f
22922048
22932049runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942050runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2341,37 +2097,37 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23412097
23422098-- | Run an event action outside of a frame
23432099runFrame :: 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)
2100+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2101+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462102 let go = do
23472103 result <- a
23482104 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
23492105 return result
23502106 result <- runEventM go
23512107 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2108+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23532109 toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2110+ forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
23552111 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2112+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23572113 toAssign <- readIORef $ eventEnvAssignments env
23582114 toReconnectRef <- newIORef []
23592115 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602116 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612117 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2118+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632119 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642120 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652121 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2122+ when debugPropagate $ putStrLn "Updating merges"
23672123 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2124+ when debugPropagate $ putStrLn "Updating merges done"
23692125 toReconnect <- readIORef toReconnectRef
23702126 clearEventEnv env
23712127 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722128 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732129 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2130+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752131 finalize wi
23762132 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772133 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2382,10 +2138,10 @@ runFrame a = SpiderHost $ do
23822138 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
23832139 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23842140 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
2141+ 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
23862142 {-
23872143 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2144+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892145 EventRoot _ -> "EventRoot"
23902146 EventNever -> "EventNever"
23912147 _ -> "something else"
@@ -2400,7 +2156,7 @@ runFrame a = SpiderHost $ do
24002156 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012157 when (parentHeight /= myHeight) $ do
24022158 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2159+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042160 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
24052161 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062162 unsubscribe subscription
@@ -2441,7 +2197,7 @@ invalidateCoincidenceHeight subscribed = do
24412197 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422198 when (oldHeight /= invalidHeight) $ do
24432199 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2200+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452201
24462202updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472203updateSwitchHeight new subscribed = do
@@ -2449,7 +2205,7 @@ updateSwitchHeight new subscribed = do
24492205 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502206 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512207 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2208+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532209
24542210recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552211recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2214,7 @@ recalculateCoincidenceHeight subscribed = do
24582214 height <- calculateCoincidenceHeight subscribed
24592215 when (height /= invalidHeight) $ do
24602216 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2217+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622218
24632219calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642220calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,219 +2253,14 @@ invalidate toReconnectRef wis = do
24972253-- Reflex integration
24982254--------------------------------------------------------------------------------
24992255
2500−-- | Designates the default, global Spider timeline
2501−data SpiderTimeline x
2502−type role SpiderTimeline nominal
2503−
2504−-- | The default, global Spider environment
2505−type Spider = SpiderTimeline Global
2506−
2507−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (EventM x) where
2508− {-# INLINABLE sample #-}
2509− sample (SpiderBehavior b) = readBehaviorUntracked b
2510−
2511−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (EventM x) where
2512− {-# INLINABLE hold #-}
2513− hold = holdSpiderEventM
2514− {-# INLINABLE holdDyn #-}
2515− holdDyn = holdDynSpiderEventM
2516− {-# INLINABLE holdIncremental #-}
2517− holdIncremental = holdIncrementalSpiderEventM
2518− {-# INLINABLE buildDynamic #-}
2519− buildDynamic = buildDynamicSpiderEventM
2520− {-# INLINABLE headE #-}
2521− headE = R.slowHeadE
2522−-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2525−
2526−instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527− {-# INLINABLE sample #-}
2528− sample = coerce . readBehaviorTracked . unSpiderBehavior
2529−
2530−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPushM x) where
2531− {-# INLINABLE sample #-}
2532− sample (SpiderBehavior b) = SpiderPushM $ readBehaviorUntracked b
2533−
2534−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderPushM x) where
2535− {-# INLINABLE hold #-}
2536− hold v0 e = Reflex.Class.current <$> Reflex.Class.holdDyn v0 e
2537− {-# INLINABLE holdDyn #-}
2538− holdDyn v0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce e
2539− {-# INLINABLE holdIncremental #-}
2540− holdIncremental v0 (SpiderEvent e) = SpiderPushM $ SpiderIncremental . dynamicHold <$> Reflex.Spider.Internal.hold v0 e
2541− {-# INLINABLE buildDynamic #-}
2542− buildDynamic getV0 (SpiderEvent e) = SpiderPushM $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce e
2543− {-# INLINABLE headE #-}
2544− headE = R.slowHeadE
2545−-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
2549−
2550−instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551− {-# INLINE return #-}
2552− return = pure
2553− {-# INLINE (>>=) #-}
2554− x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555− {-# INLINE (>>) #-}
2556− (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558− {-# INLINE fail #-}
2559− fail _ = error "Dynamic does not support 'fail'"
2256+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2257+-- When we're specializing, we include this from Reflex.Class instead, because
2258+-- it needs access to these types; when we're not, we want them here, so our
2259+-- instance isn't an orphan instance.
2260+#include "SpiderTimeline.include.hs"
2261+#include "SpiderTimelineHost.include.hs"
25602262#endif
25612263
2562−{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564−newJoinDyn d =
2565− let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566− eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2567− eInner = Reflex.Spider.Internal.switch $ dynamicUpdated <$> dynamicCurrent d
2568− eBoth = Reflex.Spider.Internal.coincidence $ dynamicUpdated . runIdentity <$> dynamicUpdated d
2569− v' = unSpiderEvent $ Reflex.Class.leftmost $ map SpiderEvent [eBoth, eOuter, eInner]
2570− in Reflex.Spider.Internal.unsafeBuildDynamic readV0 v'
2571−
2572−instance HasSpiderTimeline x => Functor (Reflex.Class.Dynamic (SpiderTimeline x)) where
2573− fmap = mapDynamicSpider
2574− x <$ d = R.unsafeBuildDynamic (return x) $ x <$ R.updated d
2575−
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−
2580−instance HasSpiderTimeline x => Applicative (Reflex.Class.Dynamic (SpiderTimeline x)) where
2581− pure = SpiderDynamic . dynamicConst
2582−#if MIN_VERSION_base(4,10,0)
2583− liftA2 f a b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith f (unSpiderDynamic a) (unSpiderDynamic b)
2584−#endif
2585− SpiderDynamic a <*> SpiderDynamic b = SpiderDynamic $ Reflex.Spider.Internal.zipDynWith ($) a b
2586− a *> b = R.unsafeBuildDynamic (R.sample $ R.current b) $ R.leftmost [R.updated b, R.tag (R.current b) $ R.updated a]
2587− (<*) = flip (*>) -- There are no effects, so order doesn't matter
2588−
2589−holdSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Behavior (SpiderTimeline x) a)
2590−holdSpiderEventM v0 e = fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2591−
2592−holdDynSpiderEventM :: HasSpiderTimeline x => a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2593−holdDynSpiderEventM v0 e = fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2594−
2595−holdIncrementalSpiderEventM :: (HasSpiderTimeline x, Patch p) => PatchTarget p -> Reflex.Class.Event (SpiderTimeline x) p -> EventM x (Reflex.Class.Incremental (SpiderTimeline x) p)
2596−holdIncrementalSpiderEventM v0 e = fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2597−
2598−buildDynamicSpiderEventM :: HasSpiderTimeline x => SpiderPushM x a -> Reflex.Class.Event (SpiderTimeline x) a -> EventM x (Reflex.Class.Dynamic (SpiderTimeline x) a)
2599−buildDynamicSpiderEventM getV0 e = fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2600−
2601−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHost x) where
2602− {-# INLINABLE hold #-}
2603− hold v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.hold v0 e
2604− {-# INLINABLE holdDyn #-}
2605− holdDyn v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdDyn v0 e
2606− {-# INLINABLE holdIncremental #-}
2607− holdIncremental v0 e = runFrame . runSpiderHostFrame $ Reflex.Class.holdIncremental v0 e
2608− {-# INLINABLE buildDynamic #-}
2609− buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610− {-# INLINABLE headE #-}
2611− headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
2615−
2616−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617− sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2618−
2619−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (SpiderHostFrame x) where
2620− {-# INLINABLE hold #-}
2621− hold v0 e = SpiderHostFrame $ fmap (SpiderBehavior . behaviorHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2622− {-# INLINABLE holdDyn #-}
2623− holdDyn v0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicHoldIdentity) $ Reflex.Spider.Internal.hold v0 $ coerce $ unSpiderEvent e
2624− {-# INLINABLE holdIncremental #-}
2625− holdIncremental v0 e = SpiderHostFrame $ fmap (SpiderIncremental . dynamicHold) $ Reflex.Spider.Internal.hold v0 $ unSpiderEvent e
2626− {-# INLINABLE buildDynamic #-}
2627− buildDynamic getV0 e = SpiderHostFrame $ fmap (SpiderDynamic . dynamicDynIdentity) $ Reflex.Spider.Internal.buildDynamic (coerce getV0) $ coerce $ unSpiderEvent e
2628− {-# INLINABLE headE #-}
2629− headE = R.slowHeadE
2630−-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2633−
2634−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635− {-# INLINABLE sample #-}
2636− sample = runFrame . readBehaviorUntracked . unSpiderBehavior
2637−
2638−instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2639− {-# INLINABLE sample #-}
2640− sample = Reflex.Spider.Internal.ReadPhase . Reflex.Class.sample
2641−
2642−instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2643− {-# INLINABLE hold #-}
2644− hold v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.hold v0 e
2645− {-# INLINABLE holdDyn #-}
2646− holdDyn v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdDyn v0 e
2647− {-# INLINABLE holdIncremental #-}
2648− holdIncremental v0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.holdIncremental v0 e
2649− {-# INLINABLE buildDynamic #-}
2650− buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651− {-# INLINABLE headE #-}
2652− headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655−
2656−--------------------------------------------------------------------------------
2657−-- Deprecated items
2658−--------------------------------------------------------------------------------
2659−
2660−-- | 'SpiderEnv' is the old name for 'SpiderTimeline'
2661−{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2662−type SpiderEnv = SpiderTimeline
2663−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHostFrame x) where
2664− {-# INLINABLE subscribeEvent #-}
2665− subscribeEvent e = SpiderHostFrame $ do
2666− --TODO: Unsubscribe eventually (manually and/or with weak ref)
2667− val <- liftIO $ newIORef Nothing
2668− subscription <- subscribe (unSpiderEvent e) $ Subscriber
2669− { subscriberPropagate = \a -> do
2670− liftIO $ writeIORef val $ Just a
2671− scheduleClear val
2672− , subscriberInvalidateHeight = \_ -> return ()
2673− , subscriberRecalculateHeight = \_ -> return ()
2674− }
2675− return $ SpiderEventHandle
2676− { spiderEventHandleSubscription = subscription
2677− , spiderEventHandleValue = val
2678− }
2679−
2680−instance HasSpiderTimeline x => Reflex.Host.Class.ReflexHost (SpiderTimeline x) where
2681− type EventTrigger (SpiderTimeline x) = RootTrigger x
2682− type EventHandle (SpiderTimeline x) = SpiderEventHandle x
2683− type HostFrame (SpiderTimeline x) = SpiderHostFrame x
2684−
2685−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline x) (Reflex.Spider.Internal.ReadPhase x) where
2686− {-# NOINLINE readEvent #-}
2687− readEvent h = Reflex.Spider.Internal.ReadPhase $ fmap (fmap return) $ liftIO $ do
2688− result <- readIORef $ spiderEventHandleValue h
2689− touch h
2690− return result
2691−
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693− newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694− newFanEventWithTrigger f = SpiderHost $ do
2695− es <- newFanEventWithTriggerIO f
2696− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2697−
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699− newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700− newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701− es <- newFanEventWithTriggerIO f
2702− return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2703−
2704−instance HasSpiderTimeline x => Reflex.Host.Class.MonadSubscribeEvent (SpiderTimeline x) (SpiderHost x) where
2705− {-# INLINABLE subscribeEvent #-}
2706− subscribeEvent = runFrame . runSpiderHostFrame . Reflex.Host.Class.subscribeEvent
2707−
2708−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexHost (SpiderTimeline x) (SpiderHost x) where
2709− type ReadPhase (SpiderHost x) = Reflex.Spider.Internal.ReadPhase x
2710− fireEventsAndRead es (Reflex.Spider.Internal.ReadPhase a) = run es a
2711− runHostFrame = runFrame . runSpiderHostFrame
2712−
27132264unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
27142265unsafeNewSpiderTimelineEnv = do
27152266 lock <- newMVar ()
@@ -2717,7 +2268,7 @@ unsafeNewSpiderTimelineEnv = do
27172268#ifdef DEBUG
27182269 depthRef <- newIORef 0
27192270#endif
2720− return $ STE $ SpiderTimelineEnv
2271+ return $ SpiderTimelineEnv
27212272 { _spiderTimeline_lock = lock
27222273 , _spiderTimeline_eventEnv = env
27232274#ifdef DEBUG
@@ -2725,40 +2276,43 @@ unsafeNewSpiderTimelineEnv = do
27252276#endif
27262277 }
27272278
2279+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27282280-- | Create a new SpiderTimelineEnv
27292281newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2282+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312283
2732−data LocalSpiderTimeline (x :: Type) s
2284+data LocalSpiderTimeline x s
27332285
27342286instance Reifies s (SpiderTimelineEnv x) =>
27352287 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2288+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372289
27382290localSpiderTimeline
2739− :: proxy s
2291+ :: Proxy s
27402292 -> SpiderTimelineEnv x
27412293 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2294+localSpiderTimeline _ = unsafeCoerce
27432295
27442296-- | Pass a new timeline to the given function.
27452297withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
27462298withSpiderTimeline k = do
27472299 env <- unsafeNewSpiderTimelineEnv
27482300 reify env $ \s -> k $ localSpiderTimeline s env
2301+#endif
27492302
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2303+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512304
27522305type ComputeM = EventM
27532306
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2307+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552308
2309+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27562310instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572311 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582312 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592313 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 }
2314+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2315+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622316 type PullM (SpiderTimeline x) = SpiderPullM x
27632317 type PushM (SpiderTimeline x) = SpiderPushM x
27642318 {-# INLINABLE never #-}
@@ -2771,15 +2325,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712325 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722326 {-# INLINABLE pull #-}
27732327 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
2328+ {-# INLINABLE merge #-}
2329+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2330+ {-# INLINABLE fan #-}
2331+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832332 {-# INLINABLE switch #-}
27842333 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852334 {-# INLINABLE coincidence #-}
@@ -2787,15 +2336,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872336 {-# INLINABLE current #-}
27882337 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892338 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2339+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912340 {-# INLINABLE unsafeBuildDynamic #-}
27922341 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932342 {-# INLINABLE unsafeBuildIncremental #-}
27942343 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
2344+ {-# INLINABLE mergeIncremental #-}
2345+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2346+ {-# INLINABLE mergeIncrementalWithMove #-}
2347+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992348 {-# INLINABLE currentIncremental #-}
28002349 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012350 {-# INLINABLE updatedIncremental #-}
@@ -2806,12 +2355,12 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062355 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072356 eventCoercion Coercion = Coercion
28082357 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2358+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112359 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2360+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132361 {-# INLINABLE fanInt #-}
28142362 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2363+#endif
28152364
28162365data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28172366
@@ -2834,7 +2383,7 @@ instance MonadAtomicRef (EventM x) where
28342383 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352384
28362385-- | 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)
2386+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382387
28392388instance Monad (SpiderHost x) where
28402389 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2392,22 @@ instance Monad (SpiderHost x) where
28432392 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442393 {-# INLINABLE return #-}
28452394 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472395 {-# 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
2396+ fail s = SpiderHost $ fail s
28542397
28552398-- | Run an action affecting the global Spider timeline; this will be guarded by
28562399-- a mutex for that timeline
28572400runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2401+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592402
2403+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
28602404-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612405-- mutex for that timeline
28622406runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2407+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2408+#endif
28642409
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2410+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672411
28682412instance Monad (SpiderHostFrame x) where
28692413 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2416,15 @@ instance Monad (SpiderHostFrame x) where
28722416 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732417 {-# INLINABLE return #-}
28742418 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762419 {-# INLINABLE fail #-}
28772420 fail s = SpiderHostFrame $ fail s
2878−#endif
28792421
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881− notReadyUntil _ = pure ()
2882− notReady = pure ()
2883−
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2422+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852423newEventWithTriggerIO f = do
28862424 es <- newFanEventWithTriggerIO $ \Refl -> f
28872425 return $ select es Refl
28882426
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2427+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902428newFanEventWithTriggerIO f = do
28912429 occRef <- newIORef DMap.empty
28922430 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2458,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202458instance PrimMonad (SpiderHostFrame x) where
29212459 type PrimState (SpiderHostFrame x) = PrimState IO
29222460 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 ()