@@ -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,63 @@ 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
91+#endif
10892import Reflex.NotReady.Class
109−import Data.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
93+import Reflex.Patch
94+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
95+
96+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
97+import Prelude hiding (any, concat, mapM, mapM_, sequence)
11298
11399#ifdef DEBUG_TRACE_EVENTS
114−import qualified Data.ByteString.Char8 as BS8
115100import System.IO (stderr)
116−import Data.List (isPrefixOf)
101+import qualified Data.ByteString.Char8 as BS8
117102#endif
118103
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
122−
123104#ifdef DEBUG_TRACE_EVENTS
105+
124106withStackOneLine :: (BS8.ByteString -> a) -> a
125107withStackOneLine expr = unsafePerformIO $ do
126108 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
128− where dropInternal = filterStack "Reflex.Spider.Internal"
109+ return (expr (BS8.pack (unwords (reverse stack))))
129110
130111#endif
131112
@@ -136,42 +117,28 @@ debugInvalidateHeight :: Bool
136117debugInvalidate :: Bool
137118
138119#ifdef DEBUG
120+
139121#define DEBUG_NODEIDS
140122
141−#ifdef DEBUG_TRACE_PROPAGATION
142123debugPropagate = True
143−#else
144−debugPropagate = False
145−#endif
146124
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
149−#else
150125debugInvalidateHeight = False
151−#endif
152126
153−#ifdef DEBUG_TRACE_INVALIDATION
154127debugInvalidate = True
155−#else
156−debugInvalidate = False
157−#endif
158128
159129class HasNodeId a where
160130 getNodeId :: a -> Int
161131
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
132+instance HasNodeId (Hold x p a) where
169133 getNodeId = holdNodeId
170134
135+instance HasNodeId (PushSubscribed x a b) where
136+ getNodeId = pushSubscribedNodeId
137+
171138instance HasNodeId (SwitchSubscribed x a) where
172139 getNodeId = switchSubscribedNodeId
173140
174−instance HasNodeId (FanSubscribed x v a) where
141+instance HasNodeId (FanSubscribed x a) where
175142 getNodeId = fanSubscribedNodeId
176143
177144instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +152,41 @@ instance HasNodeId (Pull x a) where
185152
186153{-# INLINE showNodeId #-}
187154showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
189−
190−showNodeId' :: Int -> String
191−showNodeId' = ("#"<>) . show
192−
155+showNodeId = ("#"<>) . show . getNodeId
156+
157+showSubscriberType :: Subscriber x a -> String
158+showSubscriberType = \case
159+ SubscriberPush _ _ -> "SubscriberPush"
160+ SubscriberMerge _ _ -> "SubscriberMerge"
161+ SubscriberFan _ -> "SubscriberFan"
162+ SubscriberMergeChange _ -> "SubscriberMergeChange"
163+ SubscriberHold _ -> "SubscriberHold"
164+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
165+ SubscriberSwitch _ -> "SubscriberSwitch"
166+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
167+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
168+ SubscriberHandle -> "SubscriberHandle"
169+
170+showEventType :: Event x a -> String
171+showEventType = \case
172+ EventRoot _ _ -> "EventRoot"
173+ EventNever -> "EventNever"
174+ EventPush _ -> "EventPush"
175+ EventMerge _ -> "EventMerge"
176+ EventFan _ _ -> "EventFan"
177+ EventSwitch _ -> "EventSwitch"
178+ EventCoincidence _ -> "EventCoincidence"
179+ EventHold _ -> "EventHold"
180+ EventDyn _ -> "EventDyn"
181+ EventHoldIdentity _ -> "EventHoldIdentity"
182+ EventDynIdentity _ -> "EventDynIdentity"
193183
194184#else
195185
196186debugPropagate = False
187+
197188debugInvalidateHeight = False
189+
198190debugInvalidate = False
199191
200192-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +194,6 @@ debugInvalidate = False
202194showNodeId :: a -> String
203195showNodeId _ = ""
204196
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
207−showNodeId' _ = ""
208−
209197#endif
210198
211199#ifdef DEBUG_NODEIDS
@@ -215,6 +203,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
215203
216204newNodeId :: IO Int
217205newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
206+
207+{-# NOINLINE unsafeNodeId #-}
208+unsafeNodeId :: a -> Int
209+unsafeNodeId a = unsafePerformIO $ do
210+ touch a
211+ newNodeId
218212#endif
219213
220214--------------------------------------------------------------------------------
@@ -253,7 +247,7 @@ subscribeAndRead = unEvent
253247{-# INLINE [1] pushCheap #-}
254248pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255249pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
250+ (subscription, occ) <- subscribeAndRead e $ sub
257251 { subscriberPropagate = \a -> do
258252 mb <- f a
259253 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +266,10 @@ terminalSubscriber p = Subscriber
272266
273267-- | Subscribe to an Event only for the duration of one occurrence
274268{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
269+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276270subscribeAndReadHead e sub = do
277271 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
272+ (subscription, occ) <- subscribeAndRead e $ sub
279273 { subscriberPropagate = \a -> do
280274 liftIO $ unsubscribe =<< readIORef subscriptionRef
281275 subscriberPropagate sub a
@@ -286,42 +280,24 @@ subscribeAndReadHead e sub = do
286280 return (subscription, occ)
287281
288282--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)
283+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290284headE originalE = do
291285 parent <- liftIO $ newIORef $ Just originalE
292286 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293287 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
288+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295289 when (isJust occ) clearParent
296− return $ Event $ \sub ->
290+ return $ Event $ \sub -> do
297291 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
292+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299293 Just e -> subscribeAndReadHead e sub
300294
301295data CacheSubscribed x a
302296 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303297 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304298 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
305−#ifdef DEBUG_NODEIDS
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
307−#endif
308299 }
309300
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−
325301-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326302-- repeatedly
327303--
@@ -336,33 +312,27 @@ cacheEvent e =
336312#else
337313 Event $
338314#endif
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
315+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
316+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
317+ in \sub -> {-# SCC "cacheEvent" #-} do
343318#ifdef DEBUG_TRACE_EVENTS
344319 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
345320#endif
346321 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347322 Just subscribedTicket -> return subscribedTicket
348323 Nothing -> do
349−#ifdef DEBUG_NODEIDS
350− nodeId <- liftIO newNodeId
351−#endif
352324 subscribers <- liftIO FastWeakBag.empty
353325 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
357326 (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− }
327+ { subscriberPropagate = \a -> do
328+ liftIO $ writeIORef occRef $ Just a
329+ scheduleClear occRef
330+ propagateFast a subscribers
331+ , subscriberInvalidateHeight = \old -> do
332+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
333+ , subscriberRecalculateHeight = \new -> do
334+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
335+ }
366336 when (isJust occ) $ do
367337 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368338 scheduleClear occRef
@@ -370,45 +340,29 @@ cacheEvent e =
370340 { _cacheSubscribed_subscribers = subscribers
371341 , _cacheSubscribed_parent = parentSub
372342 , _cacheSubscribed_occurrence = occRef
373−#ifdef DEBUG_NODEIDS
374− , _cacheSubscribed_nodeId = nodeId
375−#endif
376343 }
377344 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378345 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379346 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−
347+ liftIO $ do
348+ subscribed <- getFastWeakTicketValue subscribedTicket
349+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
350+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
351+ let es = EventSubscription
352+ { _eventSubscription_unsubscribe = do
353+ FastWeakBag.remove ticket
354+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
355+ when isEmpty $ do
356+ writeIORef mSubscribedRef emptyFastWeak
357+ unsubscribe $ _cacheSubscribed_parent subscribed
358+ touch ticket
359+ touch subscribedTicket
360+ , _eventSubscription_subscribed = EventSubscribed
361+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
362+ , eventSubscribedRetained = toAny subscribedTicket
363+ }
364+ }
365+ return (es, occ)
412366
413367subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414368subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +374,13 @@ wrap tag getSpecificSubscribed sub = do
420374 let es = tag subd
421375 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
422376
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
377+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424378eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
425379
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
428−
429380eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
381+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
431382
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
383+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433384eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
434385
435386eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -438,7 +389,7 @@ eventSwitch !s = Event $ wrap eventSubscribedSwitch $ getSwitchSubscribed s
438389eventCoincidence :: HasSpiderTimeline x => Coincidence x a -> Event x a
439390eventCoincidence !c = Event $ wrap eventSubscribedCoincidence $ getCoincidenceSubscribed c
440391
441−eventHold :: Hold x p -> Event x p
392+eventHold :: HasSpiderTimeline x => Hold x p -> Event x p
442393eventHold !h = Event $ subscribeHoldEvent h
443394
444395eventDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Event x p
@@ -464,6 +415,16 @@ data Subscriber x a = Subscriber
464415 , subscriberRecalculateHeight :: !(Height -> IO ())
465416 }
466417
418+--TODO: Move this comment to WeakBag
419+-- These function are constructor functions that are marked NOINLINE so they are
420+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
421+-- so any weak references that are attached to the constructors will have their
422+-- finalizer run. Using the opaque constructor, does not see the
423+-- constructor application, so it behaves like an IORef and cannot be fused away.
424+--
425+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
426+-- the weak pointer to it in some cases.
427+
467428newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468429newSubscriberHold h = return $ Subscriber
469430 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +432,85 @@ newSubscriberHold h = return $ Subscriber
471432 , subscriberRecalculateHeight = \_ -> return ()
472433 }
473434
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
435+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
436+newSubscriberFan subscribed = return $ Subscriber
476437 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477438 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
439+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479440 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480441 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
442+ let f _ (Pair (Identity v) subsubs) = do
482443 propagate v $ _fanSubscribedChildren_list subsubs
483444 return $ Constant ()
484445 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485446 return ()
486447 , subscriberInvalidateHeight = \old -> do
448+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487449 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
450+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
451+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489452 , subscriberRecalculateHeight = \new -> do
453+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490454 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
455+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
456+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
492457 }
493458
494459newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
460+newSubscriberSwitch subscribed = return $ Subscriber
496461 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
462+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497463 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498464 scheduleClear $ switchSubscribedOccurrence subscribed
499465 propagate a $ switchSubscribedSubscribers subscribed
500466 , subscriberInvalidateHeight = \_ -> do
467+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501468 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502469 when (oldHeight /= invalidHeight) $ do
503470 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
506− }
471+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
472+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
473+ , subscriberRecalculateHeight = \new -> do
474+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
475+ updateSwitchHeight new subscribed
476+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
477+ }
507478
508479newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
480+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510481 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
482+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511483 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512484 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513485 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514486 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515487 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
516−
517488 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518489 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519490 case occ of
520− Nothing ->
491+ Nothing -> do
521492 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522493 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
494+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
495+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525496 Just o -> do -- Since it's already firing, no need to adjust height
526497 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527498 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528499 propagate o $ coincidenceSubscribedSubscribers subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
500+ , subscriberInvalidateHeight = \_ -> do
501+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
502+ invalidateCoincidenceHeight subscribed
503+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
504+ , subscriberRecalculateHeight = \_ -> do
505+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
506+ recalculateCoincidenceHeight subscribed
507+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
531508 }
532509
533510newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
511+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535512 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
513+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536514 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537515 case occ of
538516 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +518,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540518 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541519 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542520 propagate a $ coincidenceSubscribedSubscribers subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
521+ , subscriberInvalidateHeight = \_ -> do
522+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
523+ invalidateCoincidenceHeight subscribed
524+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
525+ , subscriberRecalculateHeight = \_ -> do
526+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
527+ recalculateCoincidenceHeight subscribed
528+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
545529 }
546530
547531invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +535,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551535recalculateSubscriberHeight = flip subscriberRecalculateHeight
552536
553537-- | 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) $
538+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
539+propagate a subscribers = withIncreasedDepth $ do
556540 -- 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
557541 --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
542+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
559543
560544-- | 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) $
545+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
546+propagateFast a subscribers = withIncreasedDepth $ do
563547 -- 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
564548 --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
549+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
566550
567551--------------------------------------------------------------------------------
568552-- EventSubscribed
@@ -571,16 +555,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571555toAny :: a -> Any
572556toAny = unsafeCoerce
573557
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.
579558data EventSubscribed x = EventSubscribed
580559 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581560 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582561#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
562+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584563 , eventSubscribedHasOwnHeightRef :: !Bool
585564 , eventSubscribedWhoCreated :: !(IO [String])
586565#endif
@@ -607,23 +586,13 @@ eventSubscribedNever = EventSubscribed
607586 , eventSubscribedWhoCreated = return ["never"]
608587#endif
609588 }
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− }
620589
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
590+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622591eventSubscribedFan !subscribed = EventSubscribed
623592 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624593 , eventSubscribedRetained = toAny subscribed
625594#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
595+ , eventSubscribedGetParents = return [Some.This $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627596 , eventSubscribedHasOwnHeightRef = False
628597 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
629598#endif
@@ -636,7 +605,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636605#ifdef DEBUG_CYCLES
637606 , eventSubscribedGetParents = do
638607 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
608+ return [Some.This $ _eventSubscription_subscribed s]
640609 , eventSubscribedHasOwnHeightRef = True
641610 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
642611#endif
@@ -649,8 +618,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649618#ifdef DEBUG_CYCLES
650619 , eventSubscribedGetParents = do
651620 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
621+ let outerParent = Some.This $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
622+ innerParents = maybeToList $ fmap Some.This innerSubscription
654623 return $ outerParent : innerParents
655624 , eventSubscribedHasOwnHeightRef = True
656625 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,20 +633,20 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664633whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665634whoCreatedEventSubscribed = eventSubscribedWhoCreated
666635
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
636+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668637walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
638+ subscribers <- flip execStateT mempty $ ($ Some.This s0) $ fix $ \loop (Some.This s) -> do
670639 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671640 when (h == invalidHeight) $ do
672641 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
642+ modify (Some.This s :)
674643 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
644+ forM_ subscribers $ \(Some.This s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676645 return subscribers
677646#endif
678647
679648{-# INLINE subscribeHoldEvent #-}
680−subscribeHoldEvent :: Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
649+subscribeHoldEvent :: HasSpiderTimeline x => Hold x p -> Subscriber x p -> EventM x (EventSubscription x, Maybe p)
681650subscribeHoldEvent = subscribeAndRead . holdEvent
682651
683652--------------------------------------------------------------------------------
@@ -700,7 +669,7 @@ behaviorPull !p = Behavior $ do
700669 val <- liftIO $ readIORef $ pullValue p
701670 case val of
702671 Just subscribed -> do
703− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
672+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
704673 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (pullSubscribedInvalidators subscribed) (wi:))
705674 liftIO $ touch $ pullSubscribedOwnInvalidator subscribed
706675 return $ pullSubscribedValue subscribed
@@ -709,7 +678,7 @@ behaviorPull !p = Behavior $ do
709678 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710679 parentsRef <- liftIO $ newIORef []
711680 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
681+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713682 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714683 parents <- liftIO $ readIORef parentsRef
715684 let subscribed = PullSubscribed
@@ -719,7 +688,7 @@ behaviorPull !p = Behavior $ do
719688 , pullSubscribedParents = parents
720689 }
721690 liftIO $ writeIORef (pullValue p) $ Just subscribed
722− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedPull subscribed)) :))
691+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedPull subscribed) :))
723692 return a
724693
725694behaviorDyn :: Patch p => Dyn x p -> Behavior x (PatchTarget p)
@@ -730,7 +699,7 @@ readHoldTracked :: Hold x p -> BehaviorM x (PatchTarget p)
730699readHoldTracked h = do
731700 result <- liftIO $ readIORef $ holdValue h
732701 askInvalidator >>= mapM_ (\wi -> liftIO $ modifyIORef' (holdInvalidators h) (wi:))
733− askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (Some (BehaviorSubscribedHold h)) :))
702+ askParentsRef >>= mapM_ (\r -> liftIO $ modifyIORef' r (SomeBehaviorSubscribed (BehaviorSubscribedHold h) :))
734703 liftIO $ touch h -- Otherwise, if this gets inlined enough, the hold's parent reference may get collected
735704 return result
736705
@@ -744,46 +713,42 @@ readBehaviorUntracked b = do
744713-- Dynamic
745714--------------------------------------------------------------------------------
746715
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`?
716+data Dynamic x p = Dynamic
717+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
718+ , dynamicUpdated :: !(Event x p)
752719 }
753720
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
755−
756−
757−
758−
759−dynamicHold :: Hold x p -> DynamicS x p
721+dynamicHold :: HasSpiderTimeline x => Hold x p -> Dynamic x p
760722dynamicHold !h = Dynamic
761723 { dynamicCurrent = behaviorHold h
762724 , dynamicUpdated = eventHold h
763725 }
764726
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
727+dynamicHoldIdentity :: HasSpiderTimeline x => Hold x (Identity a) -> Dynamic x (Identity a)
766728dynamicHoldIdentity = dynamicHold
767729
768−dynamicConst :: PatchTarget p -> DynamicS x p
730+dynamicConst :: PatchTarget p -> Dynamic x p
769731dynamicConst !a = Dynamic
770732 { dynamicCurrent = behaviorConst a
771733 , dynamicUpdated = eventNever
772734 }
773735
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
736+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775737dynamicDyn !d = Dynamic
776738 { dynamicCurrent = behaviorDyn d
777739 , dynamicUpdated = eventDyn d
778740 }
779741
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
742+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781743dynamicDynIdentity = dynamicDyn
782744
783745--------------------------------------------------------------------------------
784746-- Combinators
785747--------------------------------------------------------------------------------
786748
749+--TODO: Figure out why certain things are not 'representational', then make them
750+--representational so we can use coerce
751+
787752--type role Hold representational
788753data Hold x p
789754 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -795,7 +760,9 @@ data Hold x p
795760#endif
796761 }
797762
798−-- | A statically allocated 'SpiderTimeline'
763+-- | A statically allocated 'SpiderTimeline'; this is the only instance of
764+-- 'SpiderTimeline' that can used when using
765+-- -fspecialize-to-spidertimeline-global.
799766data Global
800767
801768{-# NOINLINE globalSpiderTimelineEnv #-}
@@ -804,27 +771,30 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
804771
805772-- | Stores all global data relevant to a particular Spider timeline; only one
806773-- 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
774+data SpiderTimelineEnv x = SpiderTimelineEnv
813775 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814776 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815777#ifdef DEBUG
816778 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
817779#endif
818780 }
819−type role SpiderTimelineEnv' phantom
781+type role SpiderTimelineEnv nominal
820782
821783instance Eq (SpiderTimelineEnv x) where
822784 _ == _ = True -- Since only one exists of each type
823785
824786instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
787+#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
788+ geqToEq _ = id
789+ geqUnify (a :: SpiderTimelineEnv a) (b :: SpiderTimelineEnv b) different same = if _spiderTimeline_lock a == _spiderTimeline_lock b
790+ then case unsafeCoerce Refl :: a :~: b of
791+ Refl -> same -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
792+ else different
793+#else
794+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826795 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827796 else Nothing
797+#endif
828798
829799data EventEnv x
830800 = EventEnv { eventEnvAssignments :: !(IORef [SomeAssignment x]) -- Needed for Subscribe
@@ -832,9 +802,9 @@ data EventEnv x
832802 , eventEnvDynInits :: !(IORef [SomeDynInit x])
833803 , eventEnvMergeUpdates :: !(IORef [SomeMergeUpdate x])
834804 , 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])
805+ , eventEnvClears :: !(IORef [SomeClear]) -- Needed for Subscribe
806+ , eventEnvIntClears :: !(IORef [SomeIntClear])
807+ , eventEnvRootClears :: !(IORef [SomeRootClear])
838808 , eventEnvCurrentHeight :: !(IORef Height) -- Needed for Subscribe
839809 , eventEnvResetCoincidences :: !(IORef [SomeResetCoincidence x]) -- Needed for Subscribe
840810 , eventEnvDelayedMerges :: !(IORef (IntMap [EventM x ()]))
@@ -845,7 +815,7 @@ runEventM :: EventM x a -> IO a
845815runEventM = unEventM
846816
847817asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
818+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
849819
850820class MonadIO m => Defer a m where
851821 getDeferralQueue :: m (IORef [a])
@@ -894,7 +864,11 @@ instance HasSpiderTimeline x => HasCurrentHeight x (EventM x) where
894864 delayedRef <- asksEventEnv eventEnvDelayedMerges
895865 liftIO $ modifyIORef' delayedRef $ IntMap.insertWith (++) (unHeight height) [subscribed]
896866
867+#ifdef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
868+class x ~ Global => HasSpiderTimeline x where
869+#else
897870class HasSpiderTimeline x where
871+#endif
898872 -- | Retrieve the current SpiderTimelineEnv
899873 spiderTimeline :: SpiderTimelineEnv x
900874
@@ -906,29 +880,29 @@ putCurrentHeight h = do
906880 heightRef <- asksEventEnv eventEnvCurrentHeight
907881 liftIO $ writeIORef heightRef $! h
908882
909−instance HasSpiderTimeline x => Defer (Some Clear) (EventM x) where
883+instance HasSpiderTimeline x => Defer SomeClear (EventM x) where
910884 {-# INLINE getDeferralQueue #-}
911885 getDeferralQueue = asksEventEnv eventEnvClears
912886
913887{-# INLINE scheduleClear #-}
914−scheduleClear :: Defer (Some Clear) m => IORef (Maybe a) -> m ()
915−scheduleClear r = defer $ Some $ Clear r
888+scheduleClear :: Defer SomeClear m => IORef (Maybe a) -> m ()
889+scheduleClear r = defer $ SomeClear r
916890
917−instance HasSpiderTimeline x => Defer (Some IntClear) (EventM x) where
891+instance HasSpiderTimeline x => Defer SomeIntClear (EventM x) where
918892 {-# INLINE getDeferralQueue #-}
919893 getDeferralQueue = asksEventEnv eventEnvIntClears
920894
921895{-# INLINE scheduleIntClear #-}
922−scheduleIntClear :: Defer (Some IntClear) m => IORef (IntMap a) -> m ()
923−scheduleIntClear r = defer $ Some $ IntClear r
896+scheduleIntClear :: Defer SomeIntClear m => IORef (IntMap a) -> m ()
897+scheduleIntClear r = defer $ SomeIntClear r
924898
925−instance HasSpiderTimeline x => Defer (Some RootClear) (EventM x) where
899+instance HasSpiderTimeline x => Defer SomeRootClear (EventM x) where
926900 {-# INLINE getDeferralQueue #-}
927901 getDeferralQueue = asksEventEnv eventEnvRootClears
928902
929903{-# INLINE scheduleRootClear #-}
930−scheduleRootClear :: Defer (Some RootClear) m => IORef (DMap k Identity) -> m ()
931−scheduleRootClear r = defer $ Some $ RootClear r
904+scheduleRootClear :: Defer SomeRootClear m => IORef (DMap k Identity) -> m ()
905+scheduleRootClear r = defer $ SomeRootClear r
932906
933907instance HasSpiderTimeline x => Defer (SomeResetCoincidence x) (EventM x) where
934908 {-# INLINE getDeferralQueue #-}
@@ -983,9 +957,9 @@ getHoldEventSubscription h = do
983957
984958type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
985959
960+--type role BehaviorM representational
986961-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
962+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
989963
990964instance Monad (BehaviorM x) where
991965 {-# INLINE (>>=) #-}
@@ -994,16 +968,14 @@ instance Monad (BehaviorM x) where
994968 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995969 {-# INLINE return #-}
996970 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998971 {-# INLINE fail #-}
999972 fail s = BehaviorM $ fail s
1000−#endif
1001973
1002974data BehaviorSubscribed x a
1003975 = forall p. BehaviorSubscribedHold (Hold x p)
1004976 | BehaviorSubscribedPull (PullSubscribed x a)
1005977
1006−newtype SomeBehaviorSubscribed x = SomeBehaviorSubscribed (Some (BehaviorSubscribed x))
978+data SomeBehaviorSubscribed x = forall a. SomeBehaviorSubscribed (BehaviorSubscribed x a)
1007979
1008980--type role PullSubscribed representational
1009981data PullSubscribed x a
@@ -1038,7 +1010,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
10381010#endif
10391011 }
10401012
1041−data Root x k
1013+data Root x (k :: * -> *)
10421014 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
10431015 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
10441016 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1029,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
10571029newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
10581030
10591031-- 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)
1032+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
10611033
10621034newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
10631035
@@ -1082,8 +1054,7 @@ heightBagFromList :: [Height] -> HeightBag
10821054heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
10831055
10841056heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1057+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
10871058
10881059heightBagRemove :: Height -> HeightBag -> HeightBag
10891060heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1063,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
10921063 0 -> IntMap.delete h c
10931064 _ -> IntMap.insert h (pred old) c
10941065
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−
11021066heightBagMax :: HeightBag -> Height
11031067heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
11041068 Just ((h, _), _) -> Height h
@@ -1116,25 +1080,25 @@ heightBagVerify b@(HeightBag s c) = if
11161080heightBagVerify = id
11171081#endif
11181082
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)))
1083+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1084+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1085+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1086+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
11231087 }
11241088
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
1089+data FanSubscribed (x :: *) k
1090+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1091+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1092+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
11291093 , fanSubscribedParent :: !(EventSubscription x)
11301094#ifdef DEBUG_NODEIDS
11311095 , fanSubscribedNodeId :: Int
11321096#endif
11331097 }
11341098
1135−data Fan x k v
1136− = Fan { fanParent :: !(Event x (DMap k v))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1099+data Fan x k
1100+ = Fan { fanParent :: !(Event x (DMap k Identity))
1101+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
11381102 }
11391103
11401104data SwitchSubscribed x a
@@ -1188,35 +1152,20 @@ newInvalidatorSwitch subd = return $! InvalidatorSwitch subd
11881152newInvalidatorPull :: Pull x a -> IO (Invalidator x)
11891153newInvalidatorPull p = return $! InvalidatorPull p
11901154
1191−instance HasSpiderTimeline x => Filterable (Event x) where
1192− mapMaybe f = push $ return . f
1155+instance HasSpiderTimeline x => FunctorMaybe (Event x) where
1156+ fmapMaybe f = push $ return . f
11931157
11941158instance HasSpiderTimeline x => Align (Event x) where
11951159 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)
1160+ align ea eb = fmapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
12121161
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1162+newtype Dyn x p = Dyn { unDyn :: IORef (Either (BehaviorM x (PatchTarget p), Event x p) (Hold x p)) }
12141163
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1164+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
12161165newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
12171166
12181167--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)
1168+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
12201169zipDynWith f da db =
12211170 let eab = align (dynamicUpdated da) (dynamicUpdated db)
12221171 ec = flip push eab $ \o -> do
@@ -1231,20 +1180,26 @@ zipDynWith f da db =
12311180 return $ Just $ Identity $ f a b
12321181 in dynamicDynIdentity $ unsafeBuildDynamic (f <$> readBehaviorUntracked (dynamicCurrent da) <*> readBehaviorUntracked (dynamicCurrent db)) ec
12331182
1234−buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => EventM x (PatchTarget p) -> Event x p -> m (Dyn x p)
1183+buildDynamic :: (Defer (SomeDynInit x) m, Patch p) => BehaviorM x (PatchTarget p) -> Event x p -> m (Dyn x p)
12351184buildDynamic readV0 v' = do
1236− result <- liftIO $ newIORef $ BuildDyn (readV0, v')
1185+ result <- liftIO $ newIORef $ Left (readV0, v')
12371186 let !d = Dyn result
12381187 defer $ SomeDynInit d
12391188 return d
12401189
12411190unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1191+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ Left x
1192+ where x = (readV0, v')
12441193
12451194-- ResultM can read behaviors and events
12461195type ResultM = EventM
12471196
1197+{-# NOINLINE unsafeNewIORef #-}
1198+unsafeNewIORef :: a -> b -> IORef b
1199+unsafeNewIORef a b = unsafePerformIO $ do
1200+ touch a
1201+ newIORef b
1202+
12481203instance HasSpiderTimeline x => Functor (Event x) where
12491204 fmap f = push $ return . Just . f
12501205
@@ -1257,42 +1212,33 @@ push f e = cacheEvent (pushCheap f e)
12571212
12581213{-# INLINABLE pull #-}
12591214pull :: 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
1215+pull a = behaviorPull $ Pull
1216+ { pullCompute = a
1217+ , pullValue = unsafeNewIORef a Nothing
12681218#ifdef DEBUG_NODEIDS
1269− , pullNodeId = nid
1219+ , pullNodeId = unsafeNodeId a
12701220#endif
1271− }
1221+ }
12721222
12731223{-# INLINABLE switch #-}
12741224switch :: 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− }
1225+switch a = eventSwitch $ Switch
1226+ { switchParent = a
1227+ , switchSubscribed = unsafeNewIORef a Nothing
1228+ }
12811229
12821230coincidence :: 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− }
1231+coincidence a = eventCoincidence $ Coincidence
1232+ { coincidenceParent = a
1233+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1234+ }
12891235
12901236-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
12911237run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
12921238run roots after = do
12931239 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
1240+ t <- SpiderHost ask
1241+ result <- SpiderHost $ lift $ withMVar (_spiderTimeline_lock t) $ \_ -> flip runReaderT t $ unSpiderHost $ runFrame $ do
12961242 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
12971243 occBefore <- liftIO $ do
12981244 occBefore <- readIORef occRef
@@ -1330,11 +1276,11 @@ scheduleMerge' initialHeight heightRef a = scheduleMerge initialHeight $ do
13301276 GT -> scheduleMerge' height heightRef a -- The height has been increased (by a coincidence event; TODO: is this the only way?)
13311277 EQ -> a
13321278
1333−newtype Clear a = Clear (IORef (Maybe a))
1279+data SomeClear = forall a. SomeClear {-# UNPACK #-} !(IORef (Maybe a))
13341280
1335−newtype IntClear a = IntClear (IORef (IntMap a))
1281+data SomeIntClear = forall a. SomeIntClear {-# UNPACK #-} !(IORef (IntMap a))
13361282
1337−newtype RootClear k = RootClear (IORef (DMap k Identity))
1283+data SomeRootClear = forall k. SomeRootClear {-# UNPACK #-} !(IORef (DMap k Identity))
13381284
13391285data SomeAssignment x = forall a. SomeAssignment {-# UNPACK #-} !(IORef a) {-# UNPACK #-} !(IORef [Weak (Invalidator x)]) a
13401286
@@ -1346,110 +1292,55 @@ mkWeakPtrWithDebug x debugNote = do
13461292 x' <- evaluate x
13471293 mkWeakPtr x' $
13481294 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1295+ then Just $ putStrLn $ "finalizing: " ++ debugNote
13501296 else Nothing
13511297
13521298type WeakList a = [Weak a]
13531299
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−
13811300{-# 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
1301+#ifdef DEBUG
1302+withIncreasedDepth :: CanTrace x m => m a -> m a
1303+withIncreasedDepth a = do
1304+ spiderTimeline <- askSpiderTimelineEnv
1305+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
13851306 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1307+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
13871308 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−
14121309#else
1310+withIncreasedDepth :: m a -> m a
1311+withIncreasedDepth = id
1312+#endif
14131313
1414−{-# INLINE withIncreasedDepth #-}
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1314+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
14171315
14181316{-# INLINE tracePropagate #-}
14191317tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1318+tracePropagate p = traceWhen p debugPropagate
14211319
14221320{-# INLINE traceInvalidate #-}
14231321traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1322+traceInvalidate = when debugInvalidate . liftIO . putStrLn
14251323
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 ()
1324+{-# INLINE traceWhen #-}
1325+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1326+traceWhen p b message = traceMWhen p b $ return message
14471327
1328+{-# INLINE traceMWhen #-}
1329+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1330+traceMWhen _ b getMessage = when b $ do
1331+ message <- getMessage
1332+#ifdef DEBUG
1333+ spiderTimeline <- askSpiderTimelineEnv
1334+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1335+#else
1336+ let d = 0
14481337#endif
1338+ liftIO $ putStrLn $ replicate d ' ' <> message
14491339
14501340whoCreatedIORef :: IORef a -> IO [String]
14511341whoCreatedIORef (IORef a) = whoCreated $! a
14521342
1343+#ifdef DEBUG_CYCLES
14531344groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
14541345groupByHead = \case
14551346 [] -> []
@@ -1460,54 +1351,20 @@ groupByHead = \case
14601351 | otherwise -> (x, xs :| []) : l
14611352
14621353listsToForest :: 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−
1354+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
14951355#endif
14961356
1497−
14981357{-# INLINE propagateSubscriberHold #-}
14991358propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
15001359propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1360+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
15021361 invalidators <- liftIO $ readIORef $ holdInvalidators h
15031362 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1504−
15051363 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
15061364 case {-# SCC "apply" #-} apply a v of
15071365 Nothing -> return ()
15081366 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1367+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
15111368 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
15121369 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
15131370 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1372,25 @@ propagateSubscriberHold h a = do
15151372data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
15161373
15171374runBehaviorM :: 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)
1375+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
15191376
15201377askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
15211378askInvalidator = do
1522− (!m, _) <- ask
1379+ (!m, _) <- BehaviorM ask
15231380 case m of
15241381 Nothing -> return Nothing
15251382 Just (!wi, _) -> return $ Just wi
15261383
15271384askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
15281385askParentsRef = do
1529− (!m, _) <- ask
1386+ (!m, _) <- BehaviorM ask
15301387 case m of
15311388 Nothing -> return Nothing
15321389 Just (_, !p) -> return $ Just p
15331390
15341391askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
15351392askBehaviorHoldInits = do
1536− (_, !his) <- ask
1393+ (_, !his) <- BehaviorM ask
15371394 return his
15381395
15391396{-# INLINE getDynHold #-}
@@ -1541,27 +1398,20 @@ getDynHold :: (Defer (SomeHoldInit x) m, Patch p) => Dyn x p -> m (Hold x p)
15411398getDynHold d = do
15421399 mh <- liftIO $ readIORef $ unDyn d
15431400 case mh of
1544− HoldDyn h -> return h
1545− UnsafeDyn (readV0, v') -> do
1401+ Right h -> return h
1402+ Left (readV0, v') -> do
15461403 holdInits <- getDeferralQueue
15471404 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
15541405 h <- hold v0 v'
1555− liftIO $ writeIORef (unDyn d) $ HoldDyn h
1406+ liftIO $ writeIORef (unDyn d) $ Right h
15561407 return h
15571408
1558−
15591409-- Always refers to 0
15601410{-# NOINLINE zeroRef #-}
15611411zeroRef :: IORef Height
15621412zeroRef = unsafePerformIO $ newIORef zeroHeight
15631413
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)
1414+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
15651415getRootSubscribed k r sub = do
15661416 mSubscribed <- readIORef $ rootSubscribed r
15671417 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1425,9 @@ getRootSubscribed k r sub = do
15751425 let !cached = rootSubscribed r
15761426 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
15771427 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1578−
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1580−
1428+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
15811429 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
15821430 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1584− nid <- newNodeId
1585−#endif
15861431 let !subscribed = RootSubscribed
15871432 { rootSubscribedKey = k
15881433 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1436,7 @@ getRootSubscribed k r sub = do
15911436 , rootSubscribedUninit = uninit
15921437 , rootSubscribedWeakSelf = weakSelf
15931438#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1439+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
15951440#endif
15961441 }
15971442 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1472,6 @@ data FanInt x a = FanInt
16271472 { _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
16281473 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
16291474 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1632−#endif
16331475 }
16341476
16351477newFanInt :: IO (FanInt x a)
@@ -1637,39 +1479,38 @@ newFanInt = do
16371479 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
16381480 subscriptionRef <- newIORef $ error "fanInt: no subscription"
16391481 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1642−#endif
16431482 return $ FanInt
16441483 { _fanInt_subscribers = subscribers
16451484 , _fanInt_subscriptionRef = subscriptionRef
16461485 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1649−#endif
16501486 }
16511487
1488+{-# NOINLINE unsafeNewFanInt #-}
1489+unsafeNewFanInt :: b -> FanInt x a
1490+unsafeNewFanInt b = unsafePerformIO $ do
1491+ touch b
1492+ newFanInt
1493+
16521494fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1654− self <- newFanInt
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1495+fanInt p =
1496+ let self = unsafeNewFanInt p
1497+ in EventSelectorInt $ \k -> Event $ \sub -> do
16561498 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
16571499 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
1500+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
16601501 { subscriberPropagate = \m -> do
16611502 liftIO $ writeIORef (_fanInt_occRef self) m
16621503 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 ->
1504+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1505+ FastWeakBag.traverse b $ \s -> do
16651506 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1668− FastWeakBag.traverse_ b $ \s ->
1507+ , subscriberInvalidateHeight = \old -> do
1508+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1509+ FastWeakBag.traverse b $ \s -> do
16691510 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1672− FastWeakBag.traverse_ b $ \s ->
1511+ , subscriberRecalculateHeight = \new -> do
1512+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1513+ FastWeakBag.traverse b $ \s -> do
16731514 subscriberRecalculateHeight s new
16741515 }
16751516 liftIO $ do
@@ -1683,28 +1524,13 @@ fanInt p = unsafePerformIO $ do
16831524 FastMutableIntMap.insert (_fanInt_subscribers self) k b
16841525 return b
16851526 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1527+ t <- liftIO $ FastWeakBag.insert sub b
16871528 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−
1529+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1530+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
17051531
17061532{-# 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))
1533+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
17081534getFanSubscribed k f sub = do
17091535 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
17101536 case mSubscribed of
@@ -1722,16 +1548,13 @@ getFanSubscribed k f sub = do
17221548 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
17231549 occRef <- liftIO $ newIORef parentOcc
17241550 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1727−#endif
17281551 let subscribed = FanSubscribed
17291552 { fanSubscribedCachedSubscribed = fanSubscribed f
17301553 , fanSubscribedOccurrence = occRef
17311554 , fanSubscribedParent = subscription
17321555 , fanSubscribedSubscribers = subscribersRef
17331556#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1557+ , fanSubscribedNodeId = unsafeNodeId f
17351558#endif
17361559 }
17371560 let !self = (k, subscribed)
@@ -1741,7 +1564,7 @@ getFanSubscribed k f sub = do
17411564 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
17421565 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
17431566
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1567+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
17451568cleanupFanSubscribed (k, subscribed) = do
17461569 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17471570 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1576,7 @@ cleanupFanSubscribed (k, subscribed) = do
17531576 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
17541577
17551578{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1579+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
17571580subscribeFanSubscribed k subscribed sub = do
17581581 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
17591582 case DMap.lookup k subscribers of
@@ -1791,9 +1614,6 @@ getSwitchSubscribed s sub = do
17911614 when (isJust parentOcc) $ scheduleClear occRef
17921615 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
17931616 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1796−#endif
17971617 let !subscribed = SwitchSubscribed
17981618 { switchSubscribedCachedSubscribed = switchSubscribed s
17991619 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1626,7 @@ getSwitchSubscribed s sub = do
18061626 , switchSubscribedCurrentParent = subscriptionRef
18071627 , switchSubscribedWeakSelf = weakSelf
18081628#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1629+ , switchSubscribedNodeId = unsafeNodeId s
18101630#endif
18111631 }
18121632 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1671,6 @@ getCoincidenceSubscribed c sub = do
18511671 scheduleClear innerSubdRef
18521672 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
18531673 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1856−#endif
18571674 let subscribed = CoincidenceSubscribed
18581675 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
18591676 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1681,7 @@ getCoincidenceSubscribed c sub = do
18641681 , coincidenceSubscribedInnerParent = innerSubdRef
18651682 , coincidenceSubscribedWeakSelf = weakSelf
18661683#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1684+ , coincidenceSubscribedNodeId = unsafeNodeId c
18681685#endif
18691686 }
18701687 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1698,57 @@ cleanupCoincidenceSubscribed subscribed = do
18811698subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
18821699subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
18831700
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)
1701+{-# INLINE merge #-}
1702+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1703+merge d = cacheEvent (mergeCheap d)
18891704
18901705{-# 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)
1706+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1707+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
18951708
18961709{-# 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
1710+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
1711+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
19031712 where
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1713+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
19051714 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
19061715 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
19071716 (mOldSubd, newPs) <- case me of
19081717 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
19091718 Just e -> do
19101719 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1720+ subscription@(EventSubscription _ subd) <- subscribe e s
19121721 newParentHeight <- liftIO $ getEventSubscribedHeight subd
19131722 let newParent = MergeSubscribedParent subscription
19141723 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19151724 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
19161725 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1919−
1726+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
19201727 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19211728 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
19221729 foldM f ([], oldParents) $ DMap.toList p
1923−
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1730+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
19251731 getInitialSubscribers initialParents subscriber = do
19261732 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19271733 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1734+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19291735 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1736+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
19311737 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19321738 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19331739 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19341740 )
1935−
19361741 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
19371742 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
19381743
19391744{-# 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
1745+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
1746+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
19451747 where
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1748+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
19471749 updateMe subscriber heightBagRef oldParents p = do
19481750 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1751+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
19501752 subscribeParent k e = do
19511753 keyRef <- liftIO $ newIORef k
19521754 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1757,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
19551757 newParentHeight <- getEventSubscribedHeight subd
19561758 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
19571759 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1760+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
19591761 -- 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
1762+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
19611763 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
19621764 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1964− _mergeSubscribedParentWithMove_subscription parent
1965−
1765+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
19661766 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
19671767 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
19681768 Just toKey -> do
19691769 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
19701770 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1973−
1771+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
19741772 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1773+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
19761774 getInitialSubscribers initialParents subscriber = do
19771775 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
19781776 keyRef <- liftIO $ newIORef k
19791777 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1778+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
19811779 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1780+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
19831781 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
19841782 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
19851783 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
19861784 )
1987−
19881785 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
19891786 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
19901787
1991−type MergeUpdateFunc k v x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1788+type MergeUpdateFunc k x p s
1789+ = (forall a. EventM x (k a) -> Subscriber x a)
19931790 -> IORef HeightBag
19941791 -> DMap k s
19951792 -> p
19961793 -> EventM x ([EventSubscription x], DMap k s)
19971794
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)
1795+type MergeInitFunc k x s
1796+ = DMap k (Event x)
1797+ -> (forall a. EventM x (k a) -> Subscriber x a)
1798+ -> EventM x (DMap k Identity, [Height], DMap k s)
20041799
20051800type MergeDestroyFunc k s
20061801 = DMap k s
20071802 -> IO ()
20081803
2009−data Merge x k v s = Merge
1804+data Merge x k s = Merge
20101805 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
20111806 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
20121807 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1808+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
1809+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
20151810 }
20161811
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1812+invalidateMergeHeight :: Merge x k s -> IO ()
20181813invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
20191814
20201815invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
20211816invalidateMergeHeight' heightRef sub = do
20221817 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
1818+ 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
20251819 writeIORef heightRef $! invalidHeight
20261820 subscriberInvalidateHeight sub oldHeight
20271821
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1822+
1823+revalidateMergeHeight :: Merge x k s -> IO ()
20291824revalidateMergeHeight m = do
20301825 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
1826+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
20341827 heights <- readIORef $ _merge_heightBagRef m
20351828 parents <- readIORef $ _merge_parentsRef m
20361829 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1831,44 @@ revalidateMergeHeight m = do
20381831 LT -> return ()
20391832 EQ -> do
20401833 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1834+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
20421835 writeIORef (_merge_heightRef m) $! height
20431836 subscriberRecalculateHeight (_merge_sub m) height
20441837 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
20451838
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1839+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
20471840scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
20481841 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
1842+ 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
20521843 --TODO: Assert that m is not empty
20531844 subscriberPropagate (_merge_sub m) vals
20541845
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
1846+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
1847+mergeSubscriber m getKey = Subscriber
20781848 { subscriberPropagate = \a -> do
20791849 oldM <- liftIO $ readIORef $ _merge_accumRef m
20801850 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1851+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
20821852 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
20831853 liftIO $ writeIORef (_merge_accumRef m) $! newM
20841854 when (DMap.null oldM) $ do -- Only schedule the firing once
20851855 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
2087−
1856+ --TODO: assertions about height
1857+ currentHeight <- getCurrentHeight
1858+ when (height <= currentHeight) $ do
1859+ if height /= invalidHeight
1860+ then do
1861+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1862+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1863+ else liftIO $ do
1864+#ifdef DEBUG_CYCLES
1865+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1866+ stacks <- forM nodesInvolvedInCycle $ \(Some.This es) -> whoCreatedEventSubscribed es
1867+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1868+#else
1869+ let cycleInfo = ""
1870+#endif
1871+ error $ "Causality loop found" <> cycleInfo
20881872 scheduleMergeSelf m height
20891873 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
20901874 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1879,30 @@ mergeSubscriber subscribed m getKey = Subscriber
20951879 }
20961880
20971881--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)
1882+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
1883+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
21001884 where updateMe = do
21011885 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1886+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
21031887 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
21041888 return subscriptionsToKill
21051889
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
1890+{-# INLINE mergeCheap' #-}
1891+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)
1892+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
21101893 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21111894 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
21121895 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
21131896 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
21141897 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
1898+ let m = Merge
21301899 { _merge_parentsRef = parentsRef
21311900 , _merge_heightBagRef = heightBagRef
21321901 , _merge_heightRef = heightRef
21331902 , _merge_sub = sub
21341903 , _merge_accumRef = accumRef
21351904 }
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1905+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
21371906 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
21381907 myHeight = if invalidHeight `elem` heights
21391908 then invalidHeight
@@ -2142,57 +1911,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
21421911 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
21431912 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
21441913 else (Nothing, dm)
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1914+ unless (DMap.null accum) $ do
1915+ scheduleMergeSelf m myHeight
21461916 liftIO $ writeIORef accumRef $! accum
21471917 liftIO $ writeIORef heightRef $! myHeight
21481918 liftIO $ writeIORef heightBagRef $! myHeightBag
1919+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
21491920 liftIO $ writeIORef parentsRef $! initialParentState
21501921 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1922+ let s = Subscriber
21521923 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1924+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
1925+ defer $ updateMerge m updateFunc a
21551926 , subscriberInvalidateHeight = \_ -> return ()
21561927 , subscriberRecalculateHeight = \_ -> return ()
21571928 }
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1929+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
1930+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
21601931 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
21611932 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
21621933 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1934+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
21641935 let unsubscribeAll = destroy =<< readIORef parentsRef
1936+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
1937+ , occ
1938+ )
21651939
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)
1940+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21701941mergeInt = cacheEvent . mergeIntCheap
21711942
21721943{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1944+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
21741945mergeIntCheap d = Event $ \sub -> do
21751946 initialParents <- readBehaviorUntracked $ dynamicCurrent d
21761947 accum <- liftIO $ FastMutableIntMap.newEmpty
21771948 heightRef <- liftIO $ newIORef zeroHeight
21781949 heightBagRef <- liftIO $ newIORef heightBagEmpty
21791950 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− }
21901951 let scheduleSelf = do
21911952 height <- liftIO $ readIORef $ heightRef
21921953 scheduleMerge' height heightRef $ do
21931954 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
21941955 subscriberPropagate sub vals
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1956+ invalidateMyHeight = do
1957+ invalidateMergeHeight' heightRef sub
21961958 recalculateMyHeight = do
21971959 currentHeight <- readIORef heightRef
21981960 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 +1964,12 @@ mergeIntCheap d = Event $ \sub -> do
22021964 LT -> return ()
22031965 EQ -> do
22041966 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1967+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
22061968 writeIORef heightRef $! height
22071969 subscriberRecalculateHeight sub height
22081970 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
22091971 mySubscriber k = Subscriber
22101972 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2212−
22131973 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
22141974 liftIO $ FastMutableIntMap.insert accum k a
22151975 when wasEmpty scheduleSelf
@@ -2243,6 +2003,7 @@ mergeIntCheap d = Event $ \sub -> do
22432003 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
22442004 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
22452005 return Nothing
2006+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
22462007 defer $ SomeMergeInit $ do
22472008 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
22482009 where
@@ -2256,39 +2017,35 @@ mergeIntCheap d = Event $ \sub -> do
22562017 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
22572018 liftIO $ for_ oldParents $ \oldParent -> do
22582019 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2259−
2260− print ("updateMe", oldParentHeight)
22612020 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
22622021 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2022+ let s = Subscriber
22642023 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
22652024 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
22662025 defer $ updateMe a
22672026 , subscriberInvalidateHeight = \_ -> return ()
22682027 , subscriberRecalculateHeight = \_ -> return ()
22692028 }
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2029+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
22712030 forM_ change $ \c -> defer $ updateMe c
22722031 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
22732032 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
22742033 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2034+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
22762035 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2277−
2278−
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2036+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2037+ , occ
2038+ )
22802039
22812040newtype 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) }
22832041
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2285−fanG e = unsafePerformIO $ do
2286− ref <- newIORef Nothing
2042+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2043+fan e =
22872044 let f = Fan
22882045 { fanParent = e
2289− , fanSubscribed = ref
2046+ , fanSubscribed = unsafeNewIORef e Nothing
22902047 }
2291− pure $ EventSelectorG $ \k -> eventFan k f
2048+ in EventSelector $ \k -> eventFan k f
22922049
22932050runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
22942051runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2341,37 +2098,37 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
23412098
23422099-- | Run an event action outside of a frame
23432100runFrame :: 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)
2101+runFrame a = SpiderHost $ ask >>= \_ -> lift $ do
2102+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
23462103 let go = do
23472104 result <- a
23482105 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
23492106 return result
23502107 result <- runEventM go
23512108 toClear <- readIORef $ eventEnvClears env
2352− forM_ toClear $ \(Some (Clear ref)) -> {-# SCC "clear" #-} writeIORef ref Nothing
2109+ forM_ toClear $ \(SomeClear ref) -> {-# SCC "clear" #-} writeIORef ref Nothing
23532110 toClearInt <- readIORef $ eventEnvIntClears env
2354− forM_ toClearInt $ \(Some (IntClear ref)) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
2111+ forM_ toClearInt $ \(SomeIntClear ref) -> {-# SCC "intClear" #-} writeIORef ref $! IntMap.empty
23552112 toClearRoot <- readIORef $ eventEnvRootClears env
2356− forM_ toClearRoot $ \(Some (RootClear ref)) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
2113+ forM_ toClearRoot $ \(SomeRootClear ref) -> {-# SCC "rootClear" #-} writeIORef ref $! DMap.empty
23572114 toAssign <- readIORef $ eventEnvAssignments env
23582115 toReconnectRef <- newIORef []
23592116 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
23602117 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
23612118 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2119+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
23632120 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
23642121 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
23652122 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2123+ when debugPropagate $ putStrLn "Updating merges"
23672124 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2125+ when debugPropagate $ putStrLn "Updating merges done"
23692126 toReconnect <- readIORef toReconnectRef
23702127 clearEventEnv env
23712128 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
23722129 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
23732130 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2131+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
23752132 finalize wi
23762133 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
23772134 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2382,10 +2139,10 @@ runFrame a = SpiderHost $ do
23822139 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
23832140 --TODO: Make sure we touch the pieces of the SwitchSubscribed at the appropriate times
23842141 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
2142+ 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
23862143 {-
23872144 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2145+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
23892146 EventRoot _ -> "EventRoot"
23902147 EventNever -> "EventNever"
23912148 _ -> "something else"
@@ -2400,7 +2157,7 @@ runFrame a = SpiderHost $ do
24002157 myHeight <- readIORef $ switchSubscribedHeight subscribed
24012158 when (parentHeight /= myHeight) $ do
24022159 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2160+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
24042161 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
24052162 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
24062163 unsubscribe subscription
@@ -2441,7 +2198,7 @@ invalidateCoincidenceHeight subscribed = do
24412198 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
24422199 when (oldHeight /= invalidHeight) $ do
24432200 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2201+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
24452202
24462203updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
24472204updateSwitchHeight new subscribed = do
@@ -2449,7 +2206,7 @@ updateSwitchHeight new subscribed = do
24492206 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24502207 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
24512208 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2209+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
24532210
24542211recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
24552212recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2215,7 @@ recalculateCoincidenceHeight subscribed = do
24582215 height <- calculateCoincidenceHeight subscribed
24592216 when (height /= invalidHeight) $ do
24602217 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2218+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
24622219
24632220calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
24642221calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2497,218 +2254,13 @@ invalidate toReconnectRef wis = do
24972254-- Reflex integration
24982255--------------------------------------------------------------------------------
24992256
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'"
2560−#endif
2561−
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)
2257+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
2258+-- When we're specializing, we include this from Reflex.Class instead, because
2259+-- it needs access to these types; when we're not, we want them here, so our
2260+-- instance isn't an orphan instance.
2261+#include "SpiderTimeline.include.hs"
2262+#include "SpiderTimelineHost.include.hs"
25842263#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
27122264
27132265unsafeNewSpiderTimelineEnv :: forall x. IO (SpiderTimelineEnv x)
27142266unsafeNewSpiderTimelineEnv = do
@@ -2717,7 +2269,7 @@ unsafeNewSpiderTimelineEnv = do
27172269#ifdef DEBUG
27182270 depthRef <- newIORef 0
27192271#endif
2720− return $ STE $ SpiderTimelineEnv
2272+ return $ SpiderTimelineEnv
27212273 { _spiderTimeline_lock = lock
27222274 , _spiderTimeline_eventEnv = env
27232275#ifdef DEBUG
@@ -2725,40 +2277,43 @@ unsafeNewSpiderTimelineEnv = do
27252277#endif
27262278 }
27272279
2280+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27282281-- | Create a new SpiderTimelineEnv
27292282newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730−newSpiderTimeline = withSpiderTimeline (pure . Some)
2283+newSpiderTimeline = withSpiderTimeline (pure . Some.This)
27312284
2732−data LocalSpiderTimeline (x :: Type) s
2285+data LocalSpiderTimeline x s
27332286
27342287instance Reifies s (SpiderTimelineEnv x) =>
27352288 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2289+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
27372290
27382291localSpiderTimeline
2739− :: proxy s
2292+ :: Proxy s
27402293 -> SpiderTimelineEnv x
27412294 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2295+localSpiderTimeline _ = unsafeCoerce
27432296
27442297-- | Pass a new timeline to the given function.
27452298withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
27462299withSpiderTimeline k = do
27472300 env <- unsafeNewSpiderTimelineEnv
27482301 reify env $ \s -> k $ localSpiderTimeline s env
2302+#endif
27492303
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2304+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27512305
27522306type ComputeM = EventM
27532307
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2308+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
27552309
2310+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
27562311instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27572312 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
27582313 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
27592314 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 }
2315+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2316+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
27622317 type PullM (SpiderTimeline x) = SpiderPullM x
27632318 type PushM (SpiderTimeline x) = SpiderPushM x
27642319 {-# INLINABLE never #-}
@@ -2771,15 +2326,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27712326 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
27722327 {-# INLINABLE pull #-}
27732328 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
2329+ {-# INLINABLE merge #-}
2330+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2331+ {-# INLINABLE fan #-}
2332+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
27832333 {-# INLINABLE switch #-}
27842334 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
27852335 {-# INLINABLE coincidence #-}
@@ -2787,15 +2337,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
27872337 {-# INLINABLE current #-}
27882338 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
27892339 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2340+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
27912341 {-# INLINABLE unsafeBuildDynamic #-}
27922342 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
27932343 {-# INLINABLE unsafeBuildIncremental #-}
27942344 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
2345+ {-# INLINABLE mergeIncremental #-}
2346+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2347+ {-# INLINABLE mergeIncrementalWithMove #-}
2348+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
27992349 {-# INLINABLE currentIncremental #-}
28002350 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
28012351 {-# INLINABLE updatedIncremental #-}
@@ -2806,12 +2356,12 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
28062356 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
28072357 eventCoercion Coercion = Coercion
28082358 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2810− incrementalCoercion Coercion Coercion = Coercion
2359+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
28112360 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2361+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
28132362 {-# INLINABLE fanInt #-}
28142363 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2364+#endif
28152365
28162366data RootTrigger x a = forall k. GCompare k => RootTrigger (WeakBag (Subscriber x a), IORef (DMap k Identity), k a)
28172367
@@ -2834,7 +2384,7 @@ instance MonadAtomicRef (EventM x) where
28342384 atomicModifyRef r f = liftIO $ atomicModifyRef r f
28352385
28362386-- | 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)
2387+newtype SpiderHost x a = SpiderHost { unSpiderHost :: ReaderT (SpiderTimelineEnv x) IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28382388
28392389instance Monad (SpiderHost x) where
28402390 {-# INLINABLE (>>=) #-}
@@ -2843,27 +2393,22 @@ instance Monad (SpiderHost x) where
28432393 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
28442394 {-# INLINABLE return #-}
28452395 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
28472396 {-# 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
2397+ fail s = SpiderHost $ fail s
28542398
28552399-- | Run an action affecting the global Spider timeline; this will be guarded by
28562400-- a mutex for that timeline
28572401runSpiderHost :: SpiderHost Global a -> IO a
2858−runSpiderHost (SpiderHost a) = a
2402+runSpiderHost (SpiderHost a) = runReaderT a globalSpiderTimelineEnv
28592403
2404+#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
28602405-- | Run an action affecting a given Spider timeline; this will be guarded by a
28612406-- mutex for that timeline
28622407runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863−runSpiderHostForTimeline (SpiderHost a) _ = a
2408+runSpiderHostForTimeline (SpiderHost a) = runReaderT a
2409+#endif
28642410
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866− deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2411+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
28672412
28682413instance Monad (SpiderHostFrame x) where
28692414 {-# INLINABLE (>>=) #-}
@@ -2872,21 +2417,19 @@ instance Monad (SpiderHostFrame x) where
28722417 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
28732418 {-# INLINABLE return #-}
28742419 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
28762420 {-# INLINABLE fail #-}
28772421 fail s = SpiderHostFrame $ fail s
2878−#endif
28792422
2880−instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2423+instance NotReady x (SpiderHostFrame x) where
28812424 notReadyUntil _ = pure ()
28822425 notReady = pure ()
28832426
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2427+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
28852428newEventWithTriggerIO f = do
28862429 es <- newFanEventWithTriggerIO $ \Refl -> f
28872430 return $ select es Refl
28882431
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2432+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
28902433newFanEventWithTriggerIO f = do
28912434 occRef <- newIORef DMap.empty
28922435 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2463,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
29202463instance PrimMonad (SpiderHostFrame x) where
29212464 type PrimState (SpiderHostFrame x) = PrimState IO
29222465 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 ()