@@ -9,22 +9,17 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiParamTypeClasses #-}
13+{-# LANGUAGE MultiWayIf #-}
12{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE ScopedTypeVariables #-}
16{-# LANGUAGE ScopedTypeVariables #-}
15{-# LANGUAGE TypeFamilies #-}
17{-# LANGUAGE TypeFamilies #-}
16{-# LANGUAGE TypeOperators #-}
18{-# LANGUAGE TypeOperators #-}
17{-# LANGUAGE UndecidableInstances #-}
19{-# LANGUAGE UndecidableInstances #-}
18−{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21−{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
24#ifdef USE_REFLEX_OPTIMIZER
20#ifdef USE_REFLEX_OPTIMIZER
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
21{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
27−{-# OPTIONS_GHC -Wunused-binds #-}
28-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
23-- | This module is the implementation of the 'Spider' 'Reflex' engine. It uses
29-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
24-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.
30module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
25module Reflex.Spider.Internal (module Reflex.Spider.Internal) where
@@ -38,17 +33,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
38import Control.Monad.Exception
33import Control.Monad.Exception
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
34import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
40import Control.Monad.Primitive
35import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
36+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
44import Control.Monad.Ref
37import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
38import Data.Align
48import Data.Coerce
39import Data.Coerce
49−import Data.Dependent.Map (DMap)
40+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
41import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
42import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53import qualified Data.FastMutableIntMap as FastMutableIntMap
43import qualified Data.FastMutableIntMap as FastMutableIntMap
54import Data.Foldable hiding (concat, elem, sequence_)
44import Data.Foldable hiding (concat, elem, sequence_)
@@ -59,15 +49,13 @@ import Data.GADT.Compare
59import Data.IntMap.Strict (IntMap)
49import Data.IntMap.Strict (IntMap)
60import qualified Data.IntMap.Strict as IntMap
50import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
51import Data.IORef
62−import Data.Kind (Type)
63import Data.Maybe hiding (mapMaybe)
52import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
53+import Data.Monoid ((<>))
65import Data.Proxy
54import Data.Proxy
66import Data.These
55import Data.These
67import Data.Traversable
56import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69import Data.Witherable (Filterable, mapMaybe)
57import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
58+import GHC.Exts
71import GHC.IORef (IORef (..))
59import GHC.IORef (IORef (..))
72import GHC.Stack
60import GHC.Stack
73import Reflex.FastWeak
61import Reflex.FastWeak
@@ -75,57 +63,39 @@ import System.IO.Unsafe
75import System.Mem.Weak
63import System.Mem.Weak
76import Unsafe.Coerce
64import Unsafe.Coerce
78−#ifdef MIN_VERSION_semialign
79−#if MIN_VERSION_these(0,8,0)
80−import Data.These.Combinators (justThese)
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
87#ifdef DEBUG_CYCLES
66#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
67import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
68import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
69import qualified Data.List.NonEmpty as NonEmpty
70+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
71import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
72+#endif
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
74+import Data.FastWeakBag (FastWeakBag)
97import qualified Data.FastWeakBag as FastWeakBag
75import qualified Data.FastWeakBag as FastWeakBag
99import Data.Reflection
76import Data.Reflection
100import Data.Some (Some(Some))
77import Data.Some (Some(Some))
101import Data.Type.Coercion
78import Data.Type.Coercion
102−import Data.Profunctor.Unsafe ((#.), (.#))
103import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
79import Data.WeakBag (WeakBag, WeakBagTicket, _weakBag_children)
104import qualified Data.WeakBag as WeakBag
80import qualified Data.WeakBag as WeakBag
105import qualified Reflex.Class
81import qualified Reflex.Class
106import qualified Reflex.Class as R
82import qualified Reflex.Class as R
107import qualified Reflex.Host.Class
83import qualified Reflex.Host.Class
108import Reflex.NotReady.Class
84import Reflex.NotReady.Class
109−import Data.Patch
85+import Reflex.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
86+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
113#ifdef DEBUG_TRACE_EVENTS
88#ifdef DEBUG_TRACE_EVENTS
114import qualified Data.ByteString.Char8 as BS8
89import qualified Data.ByteString.Char8 as BS8
115import System.IO (stderr)
90import System.IO (stderr)
116−import Data.List (isPrefixOf)
119−-- TODO stdout might not be the best channel for debug output
120−debugStrLn :: String -> IO ()
121−debugStrLn = putStrLn
123#ifdef DEBUG_TRACE_EVENTS
93#ifdef DEBUG_TRACE_EVENTS
124withStackOneLine :: (BS8.ByteString -> a) -> a
95withStackOneLine :: (BS8.ByteString -> a) -> a
125withStackOneLine expr = unsafePerformIO $ do
96withStackOneLine expr = unsafePerformIO $ do
126 stack <- currentCallStack
97 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
98+ return (expr (BS8.pack (unwords (reverse stack))))
128− where dropInternal = filterStack "Reflex.Spider.Internal"
@@ -136,42 +106,28 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
106debugInvalidate :: Bool
138#ifdef DEBUG
108#ifdef DEBUG
139#define DEBUG_NODEIDS
110#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
112debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
114debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
116debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
118class HasNodeId a where
160 getNodeId :: a -> Int
119 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
121+instance HasNodeId (Hold x p a) where
163− getNodeId = _cacheSubscribed_nodeId
165−instance HasNodeId (FanInt x a) where
166− getNodeId = _fanInt_nodeId
168−instance HasNodeId (Hold x p) where
169 getNodeId = holdNodeId
122 getNodeId = holdNodeId
124+instance HasNodeId (PushSubscribed x a b) where
125+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
127instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
128 getNodeId = switchSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
130+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
131 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
133instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +141,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
142{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
143showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
144+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
146+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
147+showSubscriberType = \case
192−
148+ SubscriberPush _ _ -> "SubscriberPush"
149+ SubscriberMerge _ _ -> "SubscriberMerge"
150+ SubscriberFan _ -> "SubscriberFan"
151+ SubscriberMergeChange _ -> "SubscriberMergeChange"
152+ SubscriberHold _ -> "SubscriberHold"
153+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
154+ SubscriberSwitch _ -> "SubscriberSwitch"
155+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
156+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
157+ SubscriberHandle -> "SubscriberHandle"
159+showEventType :: Event x a -> String
160+showEventType = \case
161+ EventRoot _ _ -> "EventRoot"
162+ EventNever -> "EventNever"
163+ EventPush _ -> "EventPush"
164+ EventMerge _ -> "EventMerge"
165+ EventFan _ _ -> "EventFan"
166+ EventSwitch _ -> "EventSwitch"
167+ EventCoincidence _ -> "EventCoincidence"
168+ EventHold _ -> "EventHold"
169+ EventDyn _ -> "EventDyn"
170+ EventHoldIdentity _ -> "EventHoldIdentity"
171+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
175debugPropagate = False
197debugInvalidateHeight = False
177debugInvalidateHeight = False
198debugInvalidate = False
179debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
181-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +183,6 @@ debugInvalidate = False
202showNodeId :: a -> String
183showNodeId :: a -> String
203showNodeId _ = ""
184showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
188#ifdef DEBUG_NODEIDS
@@ -215,6 +192,12 @@ nextNodeIdRef = unsafePerformIO $ newIORef 1
216newNodeId :: IO Int
193newNodeId :: IO Int
217newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
194newNodeId = atomicModifyIORef' nextNodeIdRef $ \n -> (succ n, n)
196+{-# NOINLINE unsafeNodeId #-}
197+unsafeNodeId :: a -> Int
198+unsafeNodeId a = unsafePerformIO $ do
220--------------------------------------------------------------------------------
203--------------------------------------------------------------------------------
@@ -251,9 +234,9 @@ subscribeAndRead = unEvent
251-- caching; if the computation function is very cheap, this is (much) more
234-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
235-- efficient than 'push'
253{-# INLINE [1] pushCheap #-}
236{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
237+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255pushCheap !f e = Event $ \sub -> do
238pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
239+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
240 { subscriberPropagate = \a -> do
258 mb <- f a
241 mb <- f a
259 mapM_ (subscriberPropagate sub) mb
242 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +255,10 @@ terminalSubscriber p = Subscriber
273-- | Subscribe to an Event only for the duration of one occurrence
256-- | Subscribe to an Event only for the duration of one occurrence
274{-# INLINE subscribeAndReadHead #-}
257{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
258+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276subscribeAndReadHead e sub = do
259subscribeAndReadHead e sub = do
277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
260 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
261+ (subscription, occ) <- subscribeAndRead e $ sub
279 { subscriberPropagate = \a -> do
262 { subscriberPropagate = \a -> do
280 liftIO $ unsubscribe =<< readIORef subscriptionRef
263 liftIO $ unsubscribe =<< readIORef subscriptionRef
281 subscriberPropagate sub a
264 subscriberPropagate sub a
@@ -286,42 +269,24 @@ subscribeAndReadHead e sub = do
286 return (subscription, occ)
269 return (subscription, occ)
288--TODO: Make this lazy in its input event
271--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)
272+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290headE originalE = do
273headE originalE = do
291 parent <- liftIO $ newIORef $ Just originalE
274 parent <- liftIO $ newIORef $ Just originalE
292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
275 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293 let clearParent = liftIO $ writeIORef parent Nothing
276 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
277+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295 when (isJust occ) clearParent
278 when (isJust occ) clearParent
296− return $ Event $ \sub ->
279+ return $ Event $ \sub -> do
297 liftIO (readIORef parent) >>= \case
280 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
281+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299 Just e -> subscribeAndReadHead e sub
282 Just e -> subscribeAndReadHead e sub
301data CacheSubscribed x a
284data CacheSubscribed x a
302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
285 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
286 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
287 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
306− , _cacheSubscribed_nodeId :: {-# UNPACK #-} !Int
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
290-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
291-- repeatedly
@@ -336,33 +301,27 @@ cacheEvent e =
339− unsafePerformIO $ do
340− mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
304+ let mSubscribedRef :: IORef (FastWeak (CacheSubscribed x a))
341− <- newIORef emptyFastWeak
305+ !mSubscribedRef = unsafeNewIORef e emptyFastWeak
342− pure $ \sub -> {-# SCC "cacheEvent" #-} do
306+ in \sub -> {-# SCC "cacheEvent" #-} do
343#ifdef DEBUG_TRACE_EVENTS
307#ifdef DEBUG_TRACE_EVENTS
344 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
308 unless (BS8.null callSite) $ liftIO $ BS8.hPutStrLn stderr callSite
346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
310 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347 Just subscribedTicket -> return subscribedTicket
311 Just subscribedTicket -> return subscribedTicket
348 Nothing -> do
312 Nothing -> do
350− nodeId <- liftIO newNodeId
352 subscribers <- liftIO FastWeakBag.empty
313 subscribers <- liftIO FastWeakBag.empty
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
314 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
355− (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
357 (parentSub, occ) <- subscribeAndRead e $ Subscriber
315 (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
316+ { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
317+ liftIO $ writeIORef occRef $ Just a
361− scheduleClear occRef
318+ scheduleClear occRef
362− propagateFast a subscribers
319+ propagateFast a subscribers
320+ , subscriberInvalidateHeight = \old -> do
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
321+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
322+ , subscriberRecalculateHeight = \new -> do
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
323+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
366 when (isJust occ) $ do
325 when (isJust occ) $ do
367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
326 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368 scheduleClear occRef
327 scheduleClear occRef
@@ -370,45 +329,29 @@ cacheEvent e =
370 { _cacheSubscribed_subscribers = subscribers
329 { _cacheSubscribed_subscribers = subscribers
371 , _cacheSubscribed_parent = parentSub
330 , _cacheSubscribed_parent = parentSub
372 , _cacheSubscribed_occurrence = occRef
331 , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
333 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
334 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379 return subscribedTicket
335 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
336+ liftIO $ do
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
337+ subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
338+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
339+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
340+ let es = EventSubscription
391− { _eventSubscription_unsubscribe = do
341+ { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
342+ FastWeakBag.remove ticket
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
343+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
344+ when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
345+ writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
346+ unsubscribe $ _cacheSubscribed_parent subscribed
398− touch ticket
347+ touch ticket
399− touch subscribedTicket
348+ touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
349+ , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
350+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
402− , eventSubscribedRetained = toAny subscribedTicket
351+ , eventSubscribedRetained = toAny subscribedTicket
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
410− return (es, occ)
354+ return (es, occ)
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
356subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
357subscribe e s = fst <$> subscribeAndRead e s
@@ -420,16 +363,13 @@ wrap tag getSpecificSubscribed sub = do
420 let es = tag subd
363 let es = tag subd
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
364 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
366+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
367eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
426−subscribeAndReadNever :: EventM x (EventSubscription x, Maybe a)
427−subscribeAndReadNever = return (EventSubscription (return ()) eventSubscribedNever, Nothing)
429eventNever :: Event x a
369eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
370+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
432−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
372+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
373eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
435eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
375eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -464,6 +404,16 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
404 , subscriberRecalculateHeight :: !(Height -> IO ())
407+--TODO: Move this comment to WeakBag
408+-- These function are constructor functions that are marked NOINLINE so they are
409+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
410+-- so any weak references that are attached to the constructors will have their
411+-- finalizer run. Using the opaque constructor, does not see the
412+-- constructor application, so it behaves like an IORef and cannot be fused away.
414+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
415+-- the weak pointer to it in some cases.
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
417newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
418newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
419 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -471,68 +421,85 @@ newSubscriberHold h = return $ Subscriber
471 , subscriberRecalculateHeight = \_ -> return ()
421 , subscriberRecalculateHeight = \_ -> return ()
474−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
424+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
425+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
426 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
427 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
428+ tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
479 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
429 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
430 scheduleClear $ fanSubscribedOccurrence subscribed
481− let f _ (Pair v subsubs) = do
431+ let f _ (Pair (Identity v) subsubs) = do
482 propagate v $ _fanSubscribedChildren_list subsubs
432 propagate v $ _fanSubscribedChildren_list subsubs
483 return $ Constant ()
433 return $ Constant ()
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
434 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
435 return ()
486 , subscriberInvalidateHeight = \old -> do
436 , subscriberInvalidateHeight = \old -> do
437+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
438 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
439+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
440+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
441 , subscriberRecalculateHeight = \new -> do
442+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
443 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
444+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
445+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
448newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
449+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
450 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
451+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
452 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
453 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
454 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
455 , subscriberInvalidateHeight = \_ -> do
456+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
457 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
458 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
459 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
460+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
461+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
462+ , subscriberRecalculateHeight = \new -> do
463+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
464+ updateSwitchHeight new subscribed
465+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
468newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
469+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
470 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
471+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
472 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
473 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
474 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
475 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
476 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
477 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
478 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
479 case occ of
520− Nothing ->
480+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
481 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
482 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
483+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
484+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
485 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
486 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
487 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
488 propagate o $ coincidenceSubscribedSubscribers subscribed
489+ , subscriberInvalidateHeight = \_ -> do
490+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
491+ invalidateCoincidenceHeight subscribed
492+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
493+ , subscriberRecalculateHeight = \_ -> do
494+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
495+ recalculateCoincidenceHeight subscribed
496+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
499newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
500+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
501 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
502+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
503 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
504 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
505 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +507,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
507 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
508 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
509 propagate a $ coincidenceSubscribedSubscribers subscribed
510+ , subscriberInvalidateHeight = \_ -> do
511+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
512+ invalidateCoincidenceHeight subscribed
513+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
514+ , subscriberRecalculateHeight = \_ -> do
515+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
516+ recalculateCoincidenceHeight subscribed
517+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
520invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +524,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
524recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
526-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
527+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
528+propagate a subscribers = withIncreasedDepth $ do
556 -- 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
529 -- 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
557 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
530 --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
531+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
560-- | Propagate everything at the current height
533-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
534+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
535+propagateFast a subscribers = withIncreasedDepth $ do
563 -- 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
536 -- 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
564 --TODO: Should we check if nodes already have their values before propagating? Maybe we're re-doing work
537 --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
538+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
540--------------------------------------------------------------------------------
568-- EventSubscribed
541-- EventSubscribed
@@ -571,16 +544,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571toAny :: a -> Any
544toAny :: a -> Any
572toAny = unsafeCoerce
545toAny = unsafeCoerce
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
579data EventSubscribed x = EventSubscribed
547data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
548 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
549 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
550#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
551+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
552 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
553 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +575,13 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
575 , eventSubscribedWhoCreated = return ["never"]
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
621−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
579+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
580eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
581 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
582 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
583#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
584+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
585 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
586 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +594,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
594#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
595 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
596 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
597+ return [Some $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
598 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
599 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +607,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
607#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
608 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
609 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
610+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
611+ innerParents = maybeToList $ fmap Some innerSubscription
654 return $ outerParent : innerParents
612 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
613 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
614 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +622,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
622whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
623whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
625+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
626walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
627+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
628 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
629 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
630 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
631+ modify (Some s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
632 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
633+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
634 return subscribers
@@ -709,7 +667,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
667 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
668 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
669 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
670+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
671 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
672 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
673 let subscribed = PullSubscribed
@@ -744,46 +702,42 @@ readBehaviorUntracked b = do
744-- Dynamic
702-- Dynamic
745--------------------------------------------------------------------------------
703--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
705+data Dynamic x p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
706+ { dynamicCurrent :: !(Behavior x (PatchTarget p))
751 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
707 , dynamicUpdated :: Event x p -- This must be lazy; see the comment on holdEvent --TODO: Would this let us eliminate `Dyn`?
754−deriving instance (HasSpiderTimeline x) => Functor (Dynamic x target)
759−dynamicHold :: Hold x p -> DynamicS x p
710+dynamicHold :: Hold x p -> Dynamic x p
760dynamicHold !h = Dynamic
711dynamicHold !h = Dynamic
761 { dynamicCurrent = behaviorHold h
712 { dynamicCurrent = behaviorHold h
762 , dynamicUpdated = eventHold h
713 , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
716+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766dynamicHoldIdentity = dynamicHold
717dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
719+dynamicConst :: PatchTarget p -> Dynamic x p
769dynamicConst !a = Dynamic
720dynamicConst !a = Dynamic
770 { dynamicCurrent = behaviorConst a
721 { dynamicCurrent = behaviorConst a
771 , dynamicUpdated = eventNever
722 , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
725+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775dynamicDyn !d = Dynamic
726dynamicDyn !d = Dynamic
776 { dynamicCurrent = behaviorDyn d
727 { dynamicCurrent = behaviorDyn d
777 , dynamicUpdated = eventDyn d
728 , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
731+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781dynamicDynIdentity = dynamicDyn
732dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
734--------------------------------------------------------------------------------
784-- Combinators
735-- Combinators
785--------------------------------------------------------------------------------
736--------------------------------------------------------------------------------
738+--TODO: Figure out why certain things are not 'representational', then make them
739+--representational so we can use coerce
787--type role Hold representational
741--type role Hold representational
788data Hold x p
742data Hold x p
789 = Hold { holdValue :: !(IORef (PatchTarget p))
743 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +758,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
805-- | Stores all global data relevant to a particular Spider timeline; only one
759-- | Stores all global data relevant to a particular Spider timeline; only one
806-- value should exist for each type @x@
760-- 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
812−data SpiderTimelineEnv' x = SpiderTimelineEnv
761+data SpiderTimelineEnv x = SpiderTimelineEnv
813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
762 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
763 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815#ifdef DEBUG
764#ifdef DEBUG
816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
765 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
819−type role SpiderTimelineEnv' phantom
768+type role SpiderTimelineEnv nominal
821instance Eq (SpiderTimelineEnv x) where
770instance Eq (SpiderTimelineEnv x) where
822 _ == _ = True -- Since only one exists of each type
771 _ == _ = True -- Since only one exists of each type
824instance GEq SpiderTimelineEnv where
773instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
774+ a `geq` b = if _spiderTimeline_lock a == _spiderTimeline_lock b
826 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
775 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827 else Nothing
776 else Nothing
@@ -845,7 +794,7 @@ runEventM :: EventM x a -> IO a
845runEventM = unEventM
794runEventM = unEventM
847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
796asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
797+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
850class MonadIO m => Defer a m where
799class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
800 getDeferralQueue :: m (IORef [a])
@@ -983,9 +932,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
933type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
935+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
936-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
937+newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderT (BehaviorEnv x) IO a } deriving (Functor, Applicative, MonadIO, MonadFix)
988− deriving (Functor, Applicative, MonadIO, MonadFix, MonadReader (BehaviorEnv x))
990instance Monad (BehaviorM x) where
939instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
940 {-# INLINE (>>=) #-}
@@ -994,10 +943,8 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
943 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
944 {-# INLINE return #-}
996 return x = BehaviorM $ return x
945 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
946 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
947 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
949data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
950 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1038,7 +985,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1041−data Root x k
988+data Root x (k :: * -> *)
1042 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
989 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1043 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
990 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1044 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
991 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1057,7 +1004,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1004newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
1006-- 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)
1007+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
1062newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
1009newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -1082,8 +1029,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1029heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
1031heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1032+heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $ IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1086− IntMap.insertWithKey (\_ _ old -> succ old) h 0 c
1088heightBagRemove :: Height -> HeightBag -> HeightBag
1034heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
1035heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1038,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
1038 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
1039 _ -> IntMap.insert h (pred old) c
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
1102heightBagMax :: HeightBag -> Height
1041heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1042heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
1043 Just ((h, _), _) -> Height h
@@ -1116,25 +1055,25 @@ heightBagVerify b@(HeightBag s c) = if
1116heightBagVerify = id
1055heightBagVerify = id
1119−data FanSubscribedChildren x k v a = FanSubscribedChildren
1058+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1120− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1059+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1121− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1060+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1122− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1061+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1125−data FanSubscribed x k v
1064+data FanSubscribed (x :: *) k
1126− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1065+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1127− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1066+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1128− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1067+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1129 , fanSubscribedParent :: !(EventSubscription x)
1068 , fanSubscribedParent :: !(EventSubscription x)
1130#ifdef DEBUG_NODEIDS
1069#ifdef DEBUG_NODEIDS
1131 , fanSubscribedNodeId :: Int
1070 , fanSubscribedNodeId :: Int
1135−data Fan x k v
1074+data Fan x k
1136− = Fan { fanParent :: !(Event x (DMap k v))
1075+ = Fan { fanParent :: !(Event x (DMap k Identity))
1137− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1076+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1140data SwitchSubscribed x a
1079data SwitchSubscribed x a
@@ -1196,27 +1135,19 @@ instance HasSpiderTimeline x => Align (Event x) where
1196#if MIN_VERSION_these(0, 8, 0)
1135#if MIN_VERSION_these(0, 8, 0)
1197instance HasSpiderTimeline x => Semialign (Event x) where
1136instance HasSpiderTimeline x => Semialign (Event x) where
1199− align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200− DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1138+ align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1202−#ifdef MIN_VERSION_semialign
1203−#if MIN_VERSION_semialign(1,1,0)
1204−instance HasSpiderTimeline x => Zip (Event x) where
1206− zip x y = mapMaybe justThese $ align x y
1209data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1140data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1210 | BuildDyn !(EventM x (PatchTarget p), Event x p)
1141 | BuildDyn !(EventM x (PatchTarget p), Event x p)
1211 | HoldDyn !(Hold x p)
1142 | HoldDyn !(Hold x p)
1213−newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1144+newtype Dyn x p = Dyn { unDyn :: IORef (DynType x p) }
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1146+newMapDyn :: HasSpiderTimeline x => (a -> b) -> Dynamic x (Identity a) -> Dynamic x (Identity b)
1216newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1147newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1218--TODO: Avoid the duplication between this and R.zipDynWith
1149--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)
1150+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1220zipDynWith f da db =
1151zipDynWith f da db =
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1152 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1222 ec = flip push eab $ \o -> do
1153 ec = flip push eab $ \o -> do
@@ -1239,12 +1170,18 @@ buildDynamic readV0 v' = do
1239 return d
1170 return d
1241unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1172unsafeBuildDynamic :: BehaviorM x (PatchTarget p) -> Event x p -> Dyn x p
1242−unsafeBuildDynamic readV0 v' =
1173+unsafeBuildDynamic readV0 v' = Dyn $ unsafeNewIORef x $ UnsafeDyn x
1243− Dyn $ unsafePerformIO $ newIORef $ UnsafeDyn (readV0, v')
1174+ where x = (readV0, v')
1245-- ResultM can read behaviors and events
1176-- ResultM can read behaviors and events
1246type ResultM = EventM
1177type ResultM = EventM
1179+{-# NOINLINE unsafeNewIORef #-}
1180+unsafeNewIORef :: a -> b -> IORef b
1181+unsafeNewIORef a b = unsafePerformIO $ do
1248instance HasSpiderTimeline x => Functor (Event x) where
1185instance HasSpiderTimeline x => Functor (Event x) where
1249 fmap f = push $ return . Just . f
1186 fmap f = push $ return . Just . f
@@ -1257,42 +1194,33 @@ push f e = cacheEvent (pushCheap f e)
1258{-# INLINABLE pull #-}
1195{-# INLINABLE pull #-}
1259pull :: BehaviorM x a -> Behavior x a
1196pull :: BehaviorM x a -> Behavior x a
1260−pull a = unsafePerformIO $ do
1197+pull a = behaviorPull $ Pull
1261− ref <- newIORef Nothing
1198+ { pullCompute = a
1199+ , pullValue = unsafeNewIORef a Nothing
1262#ifdef DEBUG_NODEIDS
1200#ifdef DEBUG_NODEIDS
1263− nid <- newNodeId
1201+ , pullNodeId = unsafeNodeId a
1265− pure $ behaviorPull $ Pull
1268−#ifdef DEBUG_NODEIDS
1273{-# INLINABLE switch #-}
1205{-# INLINABLE switch #-}
1274switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1206switch :: HasSpiderTimeline x => Behavior x (Event x a) -> Event x a
1275−switch a = unsafePerformIO $ do
1276− ref <- newIORef Nothing
1277− pure $ eventSwitch $ Switch
1207+switch a = eventSwitch $ Switch
1278− { switchParent = a
1208+ { switchParent = a
1279− , switchSubscribed = ref
1209+ , switchSubscribed = unsafeNewIORef a Nothing
1282coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1212coincidence :: HasSpiderTimeline x => Event x (Event x a) -> Event x a
1283−coincidence a = unsafePerformIO $ do
1284− ref <- newIORef Nothing
1285− pure $ eventCoincidence $ Coincidence
1213+coincidence a = eventCoincidence $ Coincidence
1286− { coincidenceParent = a
1214+ { coincidenceParent = a
1287− , coincidenceSubscribed = ref
1215+ , coincidenceSubscribed = unsafeNewIORef a Nothing
1290-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1218-- Propagate the given event occurrence; before cleaning up, run the given action, which may read the state of events and behaviors
1291run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1219run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> ResultM x b -> SpiderHost x b
1292run roots after = do
1220run roots after = do
1293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1221 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294 let t = spiderTimeline :: SpiderTimelineEnv x
1222 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1223+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1224 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1225 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1226 occBefore <- readIORef occRef
@@ -1346,110 +1274,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1274 x' <- evaluate x
1347 mkWeakPtr x' $
1275 mkWeakPtr x' $
1348 if debugFinalize
1276 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1277+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1278 else Nothing
1352type WeakList a = [Weak a]
1280type WeakList a = [Weak a]
1354−type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1361−debugSubscriber :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> IO (Subscriber x a)
1362−debugSubscriber description = return . debugSubscriber' description
1364−debugSubscriber' :: forall x a. HasSpiderTimeline x => String -> Subscriber x a -> Subscriber x a
1365−debugSubscriber' description subscribed = Subscriber
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"
1381{-# INLINE withIncreasedDepth #-}
1282{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1284+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1285+withIncreasedDepth a = do
1286+ spiderTimeline <- askSpiderTimelineEnv
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1287+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1385 result <- a
1288 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1289+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1387 return result
1290 return result
1389−{-# INLINE tracePropagate #-}
1390−tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1391−tracePropagate p = when debugPropagate . trace p
1393−{-# INLINE traceInvalidate #-}
1394−traceInvalidate :: String -> IO ()
1395−traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397−{-# INLINE traceInvalidateHeight #-}
1398−traceInvalidateHeight :: String -> IO ()
1399−traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1401−{-# INLINE trace #-}
1402−trace :: (CanTrace x m) => proxy x -> String -> m ()
1403−trace p message = traceM p $ return message
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
1292+withIncreasedDepth :: m a -> m a
1293+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1296+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1298{-# INLINE tracePropagate #-}
1419tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1299tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1300+tracePropagate p = traceWhen p debugPropagate
1422{-# INLINE traceInvalidate #-}
1302{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1303traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1304+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1306+{-# INLINE traceWhen #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1307+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1442−trace _ _ = return ()
1308+traceWhen p b message = traceMWhen p b $ return message
1444−{-# INLINE traceM #-}
1445−traceM :: (CanTrace x m) => proxy x -> m String -> m ()
1446−traceM _ _ = return ()
1310+{-# INLINE traceMWhen #-}
1311+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1312+traceMWhen _ b getMessage = when b $ do
1313+ message <- getMessage
1315+ spiderTimeline <- askSpiderTimelineEnv
1316+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1320+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1322whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1323whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1326groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1327groupByHead = \case
1455 [] -> []
1328 [] -> []
@@ -1460,54 +1333,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1333 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1335listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1336+listsToForest l = fmap (\(a, l') -> Node a $ listsToForest $ toList l') $ groupByHead $ catMaybes $ fmap nonEmpty l
1464− where buildForest (a, lists') = Node a $ listsToForest $ toList lists'
1466−showStacks :: [[String]] -> String
1467−showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1469−filterStack :: String -> [String] -> [String]
1470−#ifdef DEBUG_HIDE_INTERNALS
1471−filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473−filterStack prefix = id
1478−data EventLoopException = EventLoopException [[String]]
1479−instance Exception EventLoopException
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
1488−data EventLoopException = EventLoopException
1489−instance Exception EventLoopException
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"
1498{-# INLINE propagateSubscriberHold #-}
1339{-# INLINE propagateSubscriberHold #-}
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1340propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1341propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1342+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1343 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1344 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1345 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506 case {-# SCC "apply" #-} apply a v of
1346 case {-# SCC "apply" #-} apply a v of
1507 Nothing -> return ()
1347 Nothing -> return ()
1508 Just v' -> do
1348 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1349+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1350 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1351 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1352 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1354,25 @@ propagateSubscriberHold h a = do
1515data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1354data SomeResetCoincidence x = forall a. SomeResetCoincidence !(EventSubscription x) !(Maybe (CoincidenceSubscribed x a)) -- The CoincidenceSubscriber will be present only if heights need to be reset
1517runBehaviorM :: BehaviorM x a -> Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]) -> IORef [SomeHoldInit x] -> IO a
1356runBehaviorM :: 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)
1357+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1359askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1360askInvalidator = do
1522− (!m, _) <- ask
1361+ (!m, _) <- BehaviorM ask
1523 case m of
1362 case m of
1524 Nothing -> return Nothing
1363 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1364 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1366askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1367askParentsRef = do
1529− (!m, _) <- ask
1368+ (!m, _) <- BehaviorM ask
1530 case m of
1369 case m of
1531 Nothing -> return Nothing
1370 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1371 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1373askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1374askBehaviorHoldInits = do
1536− (_, !his) <- ask
1375+ (_, !his) <- BehaviorM ask
1537 return his
1376 return his
1539{-# INLINE getDynHold #-}
1378{-# INLINE getDynHold #-}
@@ -1561,7 +1400,7 @@ getDynHold d = do
1561zeroRef :: IORef Height
1400zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1401zeroRef = unsafePerformIO $ newIORef zeroHeight
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)
1403+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1404getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1405 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1406 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,14 +1414,9 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1414 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1415 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1416 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1417+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1418 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1419 writeIORef uninitRef $! uninit
1583−#ifdef DEBUG_NODEIDS
1586 let !subscribed = RootSubscribed
1420 let !subscribed = RootSubscribed
1587 { rootSubscribedKey = k
1421 { rootSubscribedKey = k
1588 , rootSubscribedCachedSubscribed = cached
1422 , rootSubscribedCachedSubscribed = cached
@@ -1591,7 +1425,7 @@ getRootSubscribed k r sub = do
1591 , rootSubscribedUninit = uninit
1425 , rootSubscribedUninit = uninit
1592 , rootSubscribedWeakSelf = weakSelf
1426 , rootSubscribedWeakSelf = weakSelf
1593#ifdef DEBUG_NODEIDS
1427#ifdef DEBUG_NODEIDS
1594− , rootSubscribedNodeId = nid
1428+ , rootSubscribedNodeId = unsafeNodeId (k, r, subs)
1597 -- If we die at the same moment that all our children die, they will
1431 -- If we die at the same moment that all our children die, they will
@@ -1627,9 +1461,6 @@ data FanInt x a = FanInt
1627 { _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
1461 { _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
1628 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1462 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1463 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1635newFanInt :: IO (FanInt x a)
1466newFanInt :: IO (FanInt x a)
@@ -1637,39 +1468,38 @@ newFanInt = do
1637 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
1468 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
1638 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1469 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639 occRef <- newIORef $ error "fanInt: no occurrence"
1470 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1643 return $ FanInt
1471 return $ FanInt
1644 { _fanInt_subscribers = subscribers
1472 { _fanInt_subscribers = subscribers
1645 , _fanInt_subscriptionRef = subscriptionRef
1473 , _fanInt_subscriptionRef = subscriptionRef
1646 , _fanInt_occRef = occRef
1474 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1477+{-# NOINLINE unsafeNewFanInt #-}
1478+unsafeNewFanInt :: b -> FanInt x a
1479+unsafeNewFanInt b = unsafePerformIO $ do
1652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1483fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1653−fanInt p = unsafePerformIO $ do
1484+fanInt p =
1654− self <- newFanInt
1485+ let self = unsafeNewFanInt p
1655− pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1486+ in EventSelectorInt $ \k -> Event $ \sub -> do
1656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1487 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1488 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
1489+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1660 { subscriberPropagate = \m -> do
1490 { subscriberPropagate = \m -> do
1661 liftIO $ writeIORef (_fanInt_occRef self) m
1491 liftIO $ writeIORef (_fanInt_occRef self) m
1662 scheduleIntClear $ _fanInt_occRef self
1492 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?
1493+ FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1664− FastWeakBag.traverse_ b $ \s ->
1494+ FastWeakBag.traverse b $ \s -> do
1665 subscriberPropagate s v
1495 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1496+ , subscriberInvalidateHeight = \old -> do
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1497+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1668− FastWeakBag.traverse_ b $ \s ->
1498+ FastWeakBag.traverse b $ \s -> do
1669 subscriberInvalidateHeight s old
1499 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1500+ , subscriberRecalculateHeight = \new -> do
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1501+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1672− FastWeakBag.traverse_ b $ \s ->
1502+ FastWeakBag.traverse b $ \s -> do
1673 subscriberRecalculateHeight s new
1503 subscriberRecalculateHeight s new
1675 liftIO $ do
1505 liftIO $ do
@@ -1683,28 +1513,13 @@ fanInt p = unsafePerformIO $ do
1683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1513 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684 return b
1514 return b
1685 Just b -> return b
1515 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1516+ t <- liftIO $ FastWeakBag.insert sub b
1687 currentOcc <- readIORef (_fanInt_occRef self)
1517 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1518+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1519+ return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
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)
1699− , eventSubscribedGetParents = return [subscribedParent]
1700− , eventSubscribedHasOwnHeightRef = False
1701− , eventSubscribedWhoCreated = whoCreatedIORef $ _fanInt_subscriptionRef self
1706{-# INLINABLE getFanSubscribed #-}
1521{-# 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))
1522+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
1708getFanSubscribed k f sub = do
1523getFanSubscribed k f sub = do
1709 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1524 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1710 case mSubscribed of
1525 case mSubscribed of
@@ -1722,16 +1537,13 @@ getFanSubscribed k f sub = do
1722 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1537 subscribersRef <- liftIO $ newIORef $ error "getFanSubscribed: subscribersRef not yet initialized"
1723 occRef <- liftIO $ newIORef parentOcc
1538 occRef <- liftIO $ newIORef parentOcc
1724 when (isJust parentOcc) $ scheduleClear occRef
1539 when (isJust parentOcc) $ scheduleClear occRef
1725−#ifdef DEBUG_NODEIDS
1726− nid <- liftIO newNodeId
1728 let subscribed = FanSubscribed
1540 let subscribed = FanSubscribed
1729 { fanSubscribedCachedSubscribed = fanSubscribed f
1541 { fanSubscribedCachedSubscribed = fanSubscribed f
1730 , fanSubscribedOccurrence = occRef
1542 , fanSubscribedOccurrence = occRef
1731 , fanSubscribedParent = subscription
1543 , fanSubscribedParent = subscription
1732 , fanSubscribedSubscribers = subscribersRef
1544 , fanSubscribedSubscribers = subscribersRef
1733#ifdef DEBUG_NODEIDS
1545#ifdef DEBUG_NODEIDS
1734− , fanSubscribedNodeId = nid
1546+ , fanSubscribedNodeId = unsafeNodeId f
1737 let !self = (k, subscribed)
1549 let !self = (k, subscribed)
@@ -1741,7 +1553,7 @@ getFanSubscribed k f sub = do
1741 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1553 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1742 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1554 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1744−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1556+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1745cleanupFanSubscribed (k, subscribed) = do
1557cleanupFanSubscribed (k, subscribed) = do
1746 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1558 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1747 let reducedSubscribers = DMap.delete k subscribers
1559 let reducedSubscribers = DMap.delete k subscribers
@@ -1753,7 +1565,7 @@ cleanupFanSubscribed (k, subscribed) = do
1753 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1565 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1755{-# INLINE subscribeFanSubscribed #-}
1567{-# INLINE subscribeFanSubscribed #-}
1756−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1568+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1757subscribeFanSubscribed k subscribed sub = do
1569subscribeFanSubscribed k subscribed sub = do
1758 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1570 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1759 case DMap.lookup k subscribers of
1571 case DMap.lookup k subscribers of
@@ -1791,9 +1603,6 @@ getSwitchSubscribed s sub = do
1791 when (isJust parentOcc) $ scheduleClear occRef
1603 when (isJust parentOcc) $ scheduleClear occRef
1792 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1604 weakSelf <- liftIO $ newIORef $ error "getSwitchSubscribed: weakSelf not yet initialized"
1793 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1605 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupSwitchSubscribed
1794−#ifdef DEBUG_NODEIDS
1795− nid <- liftIO newNodeId
1797 let !subscribed = SwitchSubscribed
1606 let !subscribed = SwitchSubscribed
1798 { switchSubscribedCachedSubscribed = switchSubscribed s
1607 { switchSubscribedCachedSubscribed = switchSubscribed s
1799 , switchSubscribedOccurrence = occRef
1608 , switchSubscribedOccurrence = occRef
@@ -1806,7 +1615,7 @@ getSwitchSubscribed s sub = do
1806 , switchSubscribedCurrentParent = subscriptionRef
1615 , switchSubscribedCurrentParent = subscriptionRef
1807 , switchSubscribedWeakSelf = weakSelf
1616 , switchSubscribedWeakSelf = weakSelf
1808#ifdef DEBUG_NODEIDS
1617#ifdef DEBUG_NODEIDS
1809− , switchSubscribedNodeId = nid
1618+ , switchSubscribedNodeId = unsafeNodeId s
1812 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
1621 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "switchSubscribedWeakSelf"
@@ -1851,9 +1660,6 @@ getCoincidenceSubscribed c sub = do
1851 scheduleClear innerSubdRef
1660 scheduleClear innerSubdRef
1852 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1661 weakSelf <- liftIO $ newIORef $ error "getCoincidenceSubscribed: weakSelf not yet implemented"
1853 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1662 (subs, slnForSub) <- liftIO $ WeakBag.singleton sub weakSelf cleanupCoincidenceSubscribed
1854−#ifdef DEBUG_NODEIDS
1855− nid <- liftIO newNodeId
1857 let subscribed = CoincidenceSubscribed
1663 let subscribed = CoincidenceSubscribed
1858 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1664 { coincidenceSubscribedCachedSubscribed = coincidenceSubscribed c
1859 , coincidenceSubscribedOccurrence = occRef
1665 , coincidenceSubscribedOccurrence = occRef
@@ -1864,7 +1670,7 @@ getCoincidenceSubscribed c sub = do
1864 , coincidenceSubscribedInnerParent = innerSubdRef
1670 , coincidenceSubscribedInnerParent = innerSubdRef
1865 , coincidenceSubscribedWeakSelf = weakSelf
1671 , coincidenceSubscribedWeakSelf = weakSelf
1866#ifdef DEBUG_NODEIDS
1672#ifdef DEBUG_NODEIDS
1867− , coincidenceSubscribedNodeId = nid
1673+ , coincidenceSubscribedNodeId = unsafeNodeId c
1870 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
1676 liftIO $ writeIORef weakSelf =<< evaluate =<< mkWeakPtrWithDebug subscribed "CoincidenceSubscribed"
@@ -1881,72 +1687,57 @@ cleanupCoincidenceSubscribed subscribed = do
1881subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1687subscribeCoincidenceSubscribed :: CoincidenceSubscribed x a -> Subscriber x a -> IO WeakBagTicket
1882subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1688subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceSubscribedSubscribers subscribed) (coincidenceSubscribedWeakSelf subscribed) cleanupCoincidenceSubscribed
1884−{-# INLINE mergeG #-}
1690+{-# INLINE merge #-}
1885−mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1691+merge :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
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)
1692+merge d = cacheEvent (mergeCheap d)
1890{-# INLINE mergeWithMove #-}
1694{-# INLINE mergeWithMove #-}
1891−mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1695+mergeWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
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)
1696+mergeWithMove d = cacheEvent (mergeCheapWithMove d)
1896{-# INLINE [1] mergeCheap #-}
1698{-# INLINE [1] mergeCheap #-}
1898− :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1699+mergeCheap :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMap k (Event x)) -> Event x (DMap k Identity)
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
1700+mergeCheap = mergeCheap' getInitialSubscribers updateMe destroy
1904− updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1702+ updateMe :: MergeUpdateFunc k x (PatchDMap k (Event x)) (MergeSubscribedParent x)
1905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1703 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1906 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1704 let f (subscriptionsToKill, ps) (k :=> ComposeMaybe me) = do
1907 (mOldSubd, newPs) <- case me of
1705 (mOldSubd, newPs) <- case me of
1908 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1706 Nothing -> return $ DMap.updateLookupWithKey (\_ _ -> Nothing) k ps
1909 Just e -> do
1707 Just e -> do
1910 let s = subscriber $ return k
1708 let s = subscriber $ return k
1911− subscription@(EventSubscription _ subd) <- subscribe (nt e) s
1709+ subscription@(EventSubscription _ subd) <- subscribe e s
1912 newParentHeight <- liftIO $ getEventSubscribedHeight subd
1710 newParentHeight <- liftIO $ getEventSubscribedHeight subd
1913 let newParent = MergeSubscribedParent subscription
1711 let newParent = MergeSubscribedParent subscription
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1712 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1713 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916 forM_ mOldSubd $ \oldSubd -> do
1714 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1715+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1716 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1717 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922 foldM f ([], oldParents) $ DMap.toList p
1718 foldM f ([], oldParents) $ DMap.toList p
1924− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParent x)
1719+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParent x)
1925 getInitialSubscribers initialParents subscriber = do
1720 getInitialSubscribers initialParents subscriber = do
1926 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1721 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1927 let s = subscriber $ return k
1722 let s = subscriber $ return k
1928− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1723+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1929 height <- liftIO $ getEventSubscribedHeight parentSubd
1724 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1725+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1726 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1727 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1728 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1936 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1730 destroy :: MergeDestroyFunc k (MergeSubscribedParent x)
1937 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1731 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParent sub) -> unsubscribe sub
1939{-# INLINE [1] mergeCheapWithMove #-}
1733{-# INLINE [1] mergeCheapWithMove #-}
1940−mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1734+mergeCheapWithMove :: forall k x. (HasSpiderTimeline x, GCompare k) => Dynamic x (PatchDMapWithMove k (Event x)) -> Event x (DMap k Identity)
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
1735+mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy
1946− updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1737+ updateMe :: MergeUpdateFunc k x (PatchDMapWithMove k (Event x)) (MergeSubscribedParentWithMove x k)
1947 updateMe subscriber heightBagRef oldParents p = do
1738 updateMe subscriber heightBagRef oldParents p = do
1948 -- Prepare new parents for insertion
1739 -- Prepare new parents for insertion
1949− let subscribeParent :: forall a. k a -> Event x (v a) -> EventM x (MergeSubscribedParentWithMove x k a)
1740+ let subscribeParent :: forall a. k a -> Event x a -> EventM x (MergeSubscribedParentWithMove x k a)
1950 subscribeParent k e = do
1741 subscribeParent k e = do
1951 keyRef <- liftIO $ newIORef k
1742 keyRef <- liftIO $ newIORef k
1952 let s = subscriber $ liftIO $ readIORef keyRef
1743 let s = subscriber $ liftIO $ readIORef keyRef
@@ -1955,82 +1746,73 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1955 newParentHeight <- getEventSubscribedHeight subd
1746 newParentHeight <- getEventSubscribedHeight subd
1956 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1747 modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1957 return $ MergeSubscribedParentWithMove subscription keyRef
1748 return $ MergeSubscribedParentWithMove subscription keyRef
1958− p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey (\k q -> subscribeParent k (nt q)) p
1749+ p' <- PatchDMapWithMove.traversePatchDMapWithMoveWithKey subscribeParent p
1959 -- Collect old parents for deletion and update the keys of moved parents
1750 -- 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
1751+ let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1752 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962 Nothing -> do
1753 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1754+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1964− _mergeSubscribedParentWithMove_subscription parent
1966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1755 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1756 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968 Just toKey -> do
1757 Just toKey -> do
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1758 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970 return Nothing
1759 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1760+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1974 return (toDelete, applyAlways p' oldParents)
1761 return (toDelete, applyAlways p' oldParents)
1975− getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1762+ getInitialSubscribers :: MergeInitFunc k x (MergeSubscribedParentWithMove x k)
1976 getInitialSubscribers initialParents subscriber = do
1763 getInitialSubscribers initialParents subscriber = do
1977 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1764 subscribers <- forM (DMap.toList initialParents) $ \(k :=> e) -> do
1978 keyRef <- liftIO $ newIORef k
1765 keyRef <- liftIO $ newIORef k
1979 let s = subscriber $ liftIO $ readIORef keyRef
1766 let s = subscriber $ liftIO $ readIORef keyRef
1980− (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1767+ (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead e s
1981 height <- liftIO $ getEventSubscribedHeight parentSubd
1768 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1769+ return (fmap (\x -> k :=> Identity x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1770 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1771 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1772 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1988 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1774 destroy :: MergeDestroyFunc k (MergeSubscribedParentWithMove x k)
1989 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1775 destroy s = forM_ (DMap.toList s) $ \(_ :=> MergeSubscribedParentWithMove sub _) -> unsubscribe sub
1991−type MergeUpdateFunc k v x p s
1777+type MergeUpdateFunc k x p s
1992− = (forall a. EventM x (k a) -> Subscriber x (v a))
1778+ = (forall a. EventM x (k a) -> Subscriber x a)
1993 -> IORef HeightBag
1779 -> IORef HeightBag
1994 -> DMap k s
1780 -> DMap k s
1996 -> EventM x ([EventSubscription x], DMap k s)
1782 -> EventM x ([EventSubscription x], DMap k s)
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
2000−type MergeInitFunc k v q x s
1784+type MergeInitFunc k x s
2001− = DMap k q
1785+ = DMap k (Event x)
2002− -> (forall a. EventM x (k a) -> Subscriber x (v a))
1786+ -> (forall a. EventM x (k a) -> Subscriber x a)
2003− -> EventM x (DMap k v, [Height], DMap k s)
1787+ -> EventM x (DMap k Identity, [Height], DMap k s)
2005type MergeDestroyFunc k s
1789type MergeDestroyFunc k s
2006 = DMap k s
1790 = DMap k s
2007 -> IO ()
1791 -> IO ()
2009−data Merge x k v s = Merge
1793+data Merge x k s = Merge
2010 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
1794 { _merge_parentsRef :: {-# UNPACK #-} !(IORef (DMap k s))
2011 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
1795 , _merge_heightBagRef :: {-# UNPACK #-} !(IORef HeightBag)
2012 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
1796 , _merge_heightRef :: {-# UNPACK #-} !(IORef Height)
2013− , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k v))
1797+ , _merge_sub :: {-# UNPACK #-} !(Subscriber x (DMap k Identity))
2014− , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k v))
1798+ , _merge_accumRef :: {-# UNPACK #-} !(IORef (DMap k Identity))
2017−invalidateMergeHeight :: Merge x k v s -> IO ()
1801+invalidateMergeHeight :: Merge x k s -> IO ()
2018invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
1802invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_sub m)
2020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
1804invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021invalidateMergeHeight' heightRef sub = do
1805invalidateMergeHeight' heightRef sub = do
2022 oldHeight <- readIORef heightRef
1806 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
1807+ 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
2024− when (oldHeight /= invalidHeight) $ do
2025 writeIORef heightRef $! invalidHeight
1808 writeIORef heightRef $! invalidHeight
2026 subscriberInvalidateHeight sub oldHeight
1809 subscriberInvalidateHeight sub oldHeight
2028−revalidateMergeHeight :: Merge x k v s -> IO ()
1812+revalidateMergeHeight :: Merge x k s -> IO ()
2029revalidateMergeHeight m = do
1813revalidateMergeHeight m = do
2030 currentHeight <- readIORef $ _merge_heightRef m
1814 currentHeight <- readIORef $ _merge_heightRef m
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1815+ when (currentHeight == invalidHeight) $ do -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
2033− when (currentHeight == invalidHeight) $ do
2034 heights <- readIORef $ _merge_heightBagRef m
1816 heights <- readIORef $ _merge_heightBagRef m
2035 parents <- readIORef $ _merge_parentsRef m
1817 parents <- readIORef $ _merge_parentsRef m
2036 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
1818 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,53 +1820,44 @@ revalidateMergeHeight m = do
2038 LT -> return ()
1820 LT -> return ()
2039 EQ -> do
1821 EQ -> do
2040 let height = succHeight $ heightBagMax heights
1822 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1823+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2042 writeIORef (_merge_heightRef m) $! height
1824 writeIORef (_merge_heightRef m) $! height
2043 subscriberRecalculateHeight (_merge_sub m) height
1825 subscriberRecalculateHeight (_merge_sub m) height
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
1826 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2046−scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1828+scheduleMergeSelf :: HasSpiderTimeline x => Merge x k s -> Height -> EventM x ()
2047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
1829scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048 vals <- liftIO $ readIORef $ _merge_accumRef m
1830 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,
1831+ 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
2050− -- it'll handle subsequent subscribers, and if not, we won't get subsequent subscribers
2051− liftIO $ writeIORef (_merge_accumRef m) $! DMap.empty
2052 --TODO: Assert that m is not empty
1832 --TODO: Assert that m is not empty
2053 subscriberPropagate (_merge_sub m) vals
1833 subscriberPropagate (_merge_sub m) vals
2055−checkCycle :: HasSpiderTimeline x => EventSubscribed x -> EventM x ()
2056−checkCycle subscribed = liftIO $ do
2057− height <- readIORef (eventSubscribedHeightRef subscribed)
2059− -- currentHeight <- getCurrentHeight
2060− -- when (height <= currentHeight) $ if height /= invalidHeight
2062− -- myStack <- liftIO $ whoCreatedIORef undefined --TODO
2063− -- error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
2065− when (height == invalidHeight) $
2068− nodesInvolvedInCycle <- walkInvalidHeightParents subscribed
2069− stacks <- forM nodesInvolvedInCycle whoCreatedEventSubscribed
2070− throwIO (EventLoopException stacks)
2072− throwIO EventLoopException
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)
1835+mergeSubscriber :: forall x k s a. (HasSpiderTimeline x, GCompare k) => Merge x k s -> EventM x (k a) -> Subscriber x a
2077−mergeSubscriber subscribed m getKey = Subscriber
1836+mergeSubscriber m getKey = Subscriber
2078 { subscriberPropagate = \a -> do
1837 { subscriberPropagate = \a -> do
2079 oldM <- liftIO $ readIORef $ _merge_accumRef m
1838 oldM <- liftIO $ readIORef $ _merge_accumRef m
2080 k <- getKey
1839 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1840+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k (Identity a) oldM
2082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1841 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
2083 liftIO $ writeIORef (_merge_accumRef m) $! newM
1842 liftIO $ writeIORef (_merge_accumRef m) $! newM
2084 when (DMap.null oldM) $ do -- Only schedule the firing once
1843 when (DMap.null oldM) $ do -- Only schedule the firing once
2085 height <- liftIO $ readIORef $ _merge_heightRef m
1844 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
1845+ --TODO: assertions about height
2087−
1846+ currentHeight <- getCurrentHeight
1847+ when (height <= currentHeight) $ do
1848+ if height /= invalidHeight
1850+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1851+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1854+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1855+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1856+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1860+ error $ "Causality loop found" <> cycleInfo
2088 scheduleMergeSelf m height
1861 scheduleMergeSelf m height
2089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1862 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
2090 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
1863 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1868,30 @@ mergeSubscriber subscribed m getKey = Subscriber
2097--TODO: Be able to run as much of this as possible promptly
1870--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
1871+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k s -> MergeUpdateFunc k x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
1872+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100 where updateMe = do
1873 where updateMe = do
2101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1874 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1875+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
1876 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104 return subscriptionsToKill
1877 return subscriptionsToKill
2106−{-# INLINE mergeGCheap' #-}
1879+{-# INLINE mergeCheap' #-}
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)
1880+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)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1881+mergeCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1882 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1883 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1884 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1885 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1886 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
2115− changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2117− let subscribed = EventSubscribed
2118− { eventSubscribedHeightRef = heightRef
2119− , eventSubscribedRetained = toAny (parentsRef, changeSubdRef)
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
2129− m = Merge
1887+ let m = Merge
2130 { _merge_parentsRef = parentsRef
1888 { _merge_parentsRef = parentsRef
2131 , _merge_heightBagRef = heightBagRef
1889 , _merge_heightBagRef = heightBagRef
2132 , _merge_heightRef = heightRef
1890 , _merge_heightRef = heightRef
2133 , _merge_sub = sub
1891 , _merge_sub = sub
2134 , _merge_accumRef = accumRef
1892 , _merge_accumRef = accumRef
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1894+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1895 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138 myHeight = if invalidHeight `elem` heights
1896 myHeight = if invalidHeight `elem` heights
2139 then invalidHeight
1897 then invalidHeight
@@ -2142,57 +1900,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
2142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1900 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
2143 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
1901 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144 else (Nothing, dm)
1902 else (Nothing, dm)
1903+ unless (DMap.null accum) $ do
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1904+ scheduleMergeSelf m myHeight
2146 liftIO $ writeIORef accumRef $! accum
1905 liftIO $ writeIORef accumRef $! accum
2147 liftIO $ writeIORef heightRef $! myHeight
1906 liftIO $ writeIORef heightRef $! myHeight
2148 liftIO $ writeIORef heightBagRef $! myHeightBag
1907 liftIO $ writeIORef heightBagRef $! myHeightBag
1908+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2149 liftIO $ writeIORef parentsRef $! initialParentState
1909 liftIO $ writeIORef parentsRef $! initialParentState
2150 defer $ SomeMergeInit $ do
1910 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1911+ let s = Subscriber
2152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1912 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
1913+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1914+ defer $ updateMerge m updateFunc a
2155 , subscriberInvalidateHeight = \_ -> return ()
1915 , subscriberInvalidateHeight = \_ -> return ()
2156 , subscriberRecalculateHeight = \_ -> return ()
1916 , subscriberRecalculateHeight = \_ -> return ()
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1918+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1919+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
2160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
1920 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2161 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
1921 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162 -- its subscription.
1922 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1923+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
1924 let unsubscribeAll = destroy =<< readIORef parentsRef
1925+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parentsRef, changeSubdRef)
2166− return (EventSubscription unsubscribeAll subscribed, occ)
2169−mergeInt :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1929+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170mergeInt = cacheEvent . mergeIntCheap
1930mergeInt = cacheEvent . mergeIntCheap
2172{-# INLINABLE mergeIntCheap #-}
1932{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1933+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174mergeIntCheap d = Event $ \sub -> do
1934mergeIntCheap d = Event $ \sub -> do
2175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1935 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176 accum <- liftIO $ FastMutableIntMap.newEmpty
1936 accum <- liftIO $ FastMutableIntMap.newEmpty
2177 heightRef <- liftIO $ newIORef zeroHeight
1937 heightRef <- liftIO $ newIORef zeroHeight
2178 heightBagRef <- liftIO $ newIORef heightBagEmpty
1938 heightBagRef <- liftIO $ newIORef heightBagEmpty
2179 parents <- liftIO $ FastMutableIntMap.newEmpty
1939 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)
2185− , eventSubscribedGetParents = fmap (_eventSubscription_subscribed . snd) <$> FastMutableIntMap.toList parents
2186− , eventSubscribedHasOwnHeightRef = False
2187− , eventSubscribedWhoCreated = whoCreatedIORef heightRef
2190 let scheduleSelf = do
1940 let scheduleSelf = do
2191 height <- liftIO $ readIORef $ heightRef
1941 height <- liftIO $ readIORef $ heightRef
2192 scheduleMerge' height heightRef $ do
1942 scheduleMerge' height heightRef $ do
2193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
1943 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194 subscriberPropagate sub vals
1944 subscriberPropagate sub vals
1945+ invalidateMyHeight = do
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1946+ invalidateMergeHeight' heightRef sub
2196 recalculateMyHeight = do
1947 recalculateMyHeight = do
2197 currentHeight <- readIORef heightRef
1948 currentHeight <- readIORef heightRef
2198 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?
1949 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 +1953,12 @@ mergeIntCheap d = Event $ \sub -> do
2202 LT -> return ()
1953 LT -> return ()
2203 EQ -> do
1954 EQ -> do
2204 let height = succHeight $ heightBagMax heights
1955 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1956+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2206 writeIORef heightRef $! height
1957 writeIORef heightRef $! height
2207 subscriberRecalculateHeight sub height
1958 subscriberRecalculateHeight sub height
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
1959 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209 mySubscriber k = Subscriber
1960 mySubscriber k = Subscriber
2210 { subscriberPropagate = \a -> do
1961 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
1962 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214 liftIO $ FastMutableIntMap.insert accum k a
1963 liftIO $ FastMutableIntMap.insert accum k a
2215 when wasEmpty scheduleSelf
1964 when wasEmpty scheduleSelf
@@ -2243,6 +1992,7 @@ mergeIntCheap d = Event $ \sub -> do
2243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
1992 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2244 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
1993 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245 return Nothing
1994 return Nothing
1995+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2246 defer $ SomeMergeInit $ do
1996 defer $ SomeMergeInit $ do
2247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
1997 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
@@ -2256,39 +2006,35 @@ mergeIntCheap d = Event $ \sub -> do
2256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2006 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257 liftIO $ for_ oldParents $ \oldParent -> do
2007 liftIO $ for_ oldParents $ \oldParent -> do
2258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2008 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2260− print ("updateMe", oldParentHeight)
2261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2009 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262 return $ IntMap.elems oldParents
2010 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2011+ let s = Subscriber
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2012 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2013 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266 defer $ updateMe a
2014 defer $ updateMe a
2267 , subscriberInvalidateHeight = \_ -> return ()
2015 , subscriberInvalidateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
2016 , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2018+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2271 forM_ change $ \c -> defer $ updateMe c
2019 forM_ change $ \c -> defer $ updateMe c
2272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2020 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2273 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2021 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274 -- its subscription.
2022 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2023+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2024 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2025+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2029newtype 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) }
2284−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2031+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2285−fanG e = unsafePerformIO $ do
2032+fan e =
2286− ref <- newIORef Nothing
2287 let f = Fan
2033 let f = Fan
2288 { fanParent = e
2034 { fanParent = e
2289− , fanSubscribed = ref
2035+ , fanSubscribed = unsafeNewIORef e Nothing
2291− pure $ EventSelectorG $ \k -> eventFan k f
2037+ in EventSelector $ \k -> eventFan k f
2293runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2039runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2294runHoldInits holdInitRef dynInitRef mergeInitRef = do
2040runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2342,7 +2088,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
2342-- | Run an event action outside of a frame
2088-- | Run an event action outside of a frame
2343runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2089runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344runFrame a = SpiderHost $ do
2090runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2091+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2346 let go = do
2092 let go = do
2347 result <- a
2093 result <- a
2348 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
2094 runHoldInits (eventEnvHoldInits env) (eventEnvDynInits env) (eventEnvMergeInits env) -- This must happen before doing the assignments, in case subscribing a Hold causes existing Holds to be read by the newly-propagated events
@@ -2359,19 +2105,19 @@ runFrame a = SpiderHost $ do
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2105 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2106 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
2107 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2108+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2109 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2110 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365 writeIORef (eventEnvMergeUpdates env) []
2111 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2112+ when debugPropagate $ putStrLn "Updating merges"
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2113 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2114+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
2115 toReconnect <- readIORef toReconnectRef
2370 clearEventEnv env
2116 clearEventEnv env
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2117 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2118 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2119 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2120+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
2121 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2122 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
2123 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2131,7 @@ runFrame a = SpiderHost $ do
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
2131 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
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2133 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2134+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
2135 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
2136 EventNever -> "EventNever"
2391 _ -> "something else"
2137 _ -> "something else"
@@ -2400,7 +2146,7 @@ runFrame a = SpiderHost $ do
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
2146 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
2147 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2148 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2149+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2404 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
2150 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
2405 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2151 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
2152 unsubscribe subscription
@@ -2441,7 +2187,7 @@ invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2187 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
2188 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2189 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2190+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2192updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
2193updateSwitchHeight new subscribed = do
@@ -2449,7 +2195,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2195 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2450 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2196 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
2197 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2198+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2200recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
2201recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2204,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
2204 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
2205 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2206 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2207+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2209calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2210calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2266,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2520 {-# INLINABLE headE #-}
2266 {-# INLINABLE headE #-}
2521 headE = R.slowHeadE
2267 headE = R.slowHeadE
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2268-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2270instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527 {-# INLINABLE sample #-}
2271 {-# INLINABLE sample #-}
@@ -2543,9 +2287,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2543 {-# INLINABLE headE #-}
2287 {-# INLINABLE headE #-}
2544 headE = R.slowHeadE
2288 headE = R.slowHeadE
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2289-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2291instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
2292 {-# INLINE return #-}
@@ -2554,13 +2295,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2295 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555 {-# INLINE (>>) #-}
2296 {-# INLINE (>>) #-}
2556 (>>) = (*>)
2297 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558 {-# INLINE fail #-}
2298 {-# INLINE fail #-}
2559 fail _ = error "Dynamic does not support 'fail'"
2299 fail _ = error "Dynamic does not support 'fail'"
2562{-# INLINABLE newJoinDyn #-}
2301{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2302+newJoinDyn :: HasSpiderTimeline x => Reflex.Spider.Internal.Dynamic x (Identity (Reflex.Spider.Internal.Dynamic x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2564newJoinDyn d =
2303newJoinDyn d =
2565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2304 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2305 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2348,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2348 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610 {-# INLINABLE headE #-}
2349 {-# INLINABLE headE #-}
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2350 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2352instance 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
2353 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2364,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2628 {-# INLINABLE headE #-}
2364 {-# INLINABLE headE #-}
2629 headE = R.slowHeadE
2365 headE = R.slowHeadE
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2366-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2368instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2369 {-# INLINABLE sample #-}
@@ -2650,8 +2384,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2384 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651 {-# INLINABLE headE #-}
2385 {-# INLINABLE headE #-}
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2386 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2656--------------------------------------------------------------------------------
2388--------------------------------------------------------------------------------
2657-- Deprecated items
2389-- Deprecated items
@@ -2689,13 +2421,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
2690 return result
2422 return result
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2424+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2425 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694 newFanEventWithTrigger f = SpiderHost $ do
2426 newFanEventWithTrigger f = SpiderHost $ do
2695 es <- newFanEventWithTriggerIO f
2427 es <- newFanEventWithTriggerIO f
2696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2428 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2430+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2431 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2432 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701 es <- newFanEventWithTriggerIO f
2433 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2449,7 @@ unsafeNewSpiderTimelineEnv = do
2717#ifdef DEBUG
2449#ifdef DEBUG
2718 depthRef <- newIORef 0
2450 depthRef <- newIORef 0
2720− return $ STE $ SpiderTimelineEnv
2452+ return $ SpiderTimelineEnv
2721 { _spiderTimeline_lock = lock
2453 { _spiderTimeline_lock = lock
2722 , _spiderTimeline_eventEnv = env
2454 , _spiderTimeline_eventEnv = env
2723#ifdef DEBUG
2455#ifdef DEBUG
@@ -2729,17 +2461,17 @@ unsafeNewSpiderTimelineEnv = do
2729newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2461newSpiderTimeline :: IO (Some SpiderTimelineEnv)
2730newSpiderTimeline = withSpiderTimeline (pure . Some)
2462newSpiderTimeline = withSpiderTimeline (pure . Some)
2732−data LocalSpiderTimeline (x :: Type) s
2464+data LocalSpiderTimeline x s
2734instance Reifies s (SpiderTimelineEnv x) =>
2466instance Reifies s (SpiderTimelineEnv x) =>
2735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2467 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2468+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2738localSpiderTimeline
2470localSpiderTimeline
2739− :: proxy s
2471+ :: Proxy s
2740 -> SpiderTimelineEnv x
2472 -> SpiderTimelineEnv x
2741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2473 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2474+localSpiderTimeline _ = unsafeCoerce
2744-- | Pass a new timeline to the given function.
2476-- | Pass a new timeline to the given function.
2745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2477withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2747,18 +2479,18 @@ withSpiderTimeline k = do
2747 env <- unsafeNewSpiderTimelineEnv
2479 env <- unsafeNewSpiderTimelineEnv
2748 reify env $ \s -> k $ localSpiderTimeline s env
2480 reify env $ \s -> k $ localSpiderTimeline s env
2750−newtype SpiderPullM (x :: Type) a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2482+newtype SpiderPullM x a = SpiderPullM (BehaviorM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2752type ComputeM = EventM
2484type ComputeM = EventM
2754−newtype SpiderPushM (x :: Type) a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2486+newtype SpiderPushM x a = SpiderPushM (ComputeM x a) deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
2756instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2488instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2489 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2490 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2491 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)
2492+ newtype Dynamic (SpiderTimeline x) a = SpiderDynamic { unSpiderDynamic :: Dynamic x (Identity a) } -- deriving (Functor, Applicative, Monad)
2761− newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: DynamicS x p }
2493+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
2762 type PullM (SpiderTimeline x) = SpiderPullM x
2494 type PullM (SpiderTimeline x) = SpiderPullM x
2763 type PushM (SpiderTimeline x) = SpiderPushM x
2495 type PushM (SpiderTimeline x) = SpiderPushM x
2764 {-# INLINABLE never #-}
2496 {-# INLINABLE never #-}
@@ -2771,15 +2503,10 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2771 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2503 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2772 {-# INLINABLE pull #-}
2504 {-# INLINABLE pull #-}
2773 pull = SpiderBehavior . pull . coerce
2505 pull = SpiderBehavior . pull . coerce
2774− {-# INLINABLE fanG #-}
2506+ {-# INLINABLE merge #-}
2775− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2507+ merge = SpiderEvent . merge . dynamicConst . (coerce :: DMap k (R.Event (SpiderTimeline x)) -> DMap k (Event x))
2776− {-# INLINABLE mergeG #-}
2508+ {-# INLINABLE fan #-}
2777− mergeG
2509+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779− => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2781− -> R.Event (SpiderTimeline x) (DMap k v)
2782− mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2783 {-# INLINABLE switch #-}
2510 {-# INLINABLE switch #-}
2784 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2511 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2785 {-# INLINABLE coincidence #-}
2512 {-# INLINABLE coincidence #-}
@@ -2787,15 +2514,15 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2787 {-# INLINABLE current #-}
2514 {-# INLINABLE current #-}
2788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2515 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789 {-# INLINABLE updated #-}
2516 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2517+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2791 {-# INLINABLE unsafeBuildDynamic #-}
2518 {-# INLINABLE unsafeBuildDynamic #-}
2792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2519 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793 {-# INLINABLE unsafeBuildIncremental #-}
2520 {-# INLINABLE unsafeBuildIncremental #-}
2794 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2521 unsafeBuildIncremental readV0 dv = SpiderIncremental $ dynamicDyn $ unsafeBuildDynamic (coerce readV0) $ unSpiderEvent dv
2795− {-# INLINABLE mergeIncrementalG #-}
2522+ {-# INLINABLE mergeIncremental #-}
2796− mergeIncrementalG nt = SpiderEvent #. mergeG (coerce #. nt) .# unSpiderIncremental
2523+ mergeIncremental = SpiderEvent . merge . (unsafeCoerce :: Dynamic x (PatchDMap k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMap k (Event x))) . unSpiderIncremental
2797− {-# INLINABLE mergeIncrementalWithMoveG #-}
2524+ {-# INLINABLE mergeIncrementalWithMove #-}
2798− mergeIncrementalWithMoveG nt = SpiderEvent #. mergeWithMove (coerce #. nt) .# unSpiderIncremental
2525+ mergeIncrementalWithMove = SpiderEvent . mergeWithMove . (unsafeCoerce :: Dynamic x (PatchDMapWithMove k (R.Event (SpiderTimeline x))) -> Dynamic x (PatchDMapWithMove k (Event x))) . unSpiderIncremental
2799 {-# INLINABLE currentIncremental #-}
2526 {-# INLINABLE currentIncremental #-}
2800 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2527 currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
2801 {-# INLINABLE updatedIncremental #-}
2528 {-# INLINABLE updatedIncremental #-}
@@ -2806,10 +2533,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2533 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807 eventCoercion Coercion = Coercion
2534 eventCoercion Coercion = Coercion
2808 behaviorCoercion Coercion = Coercion
2535 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2536+ dynamicCoercion = unsafeCoerce --TODO: How can we avoid this unsafeCoerce? This is safe only because we know how Identity works as a Patch instance
2810− incrementalCoercion Coercion Coercion = Coercion
2811 {-# INLINABLE mergeIntIncremental #-}
2537 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2538+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2813 {-# INLINABLE fanInt #-}
2539 {-# INLINABLE fanInt #-}
2814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2540 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
@@ -2834,7 +2560,7 @@ instance MonadAtomicRef (EventM x) where
2834 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2560 atomicModifyRef r f = liftIO $ atomicModifyRef r f
2836-- | The monad for actions that manipulate a Spider timeline identified by @x@
2562-- | 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)
2563+newtype SpiderHost x a = SpiderHost { unSpiderHost :: IO a } deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2839instance Monad (SpiderHost x) where
2565instance Monad (SpiderHost x) where
2840 {-# INLINABLE (>>=) #-}
2566 {-# INLINABLE (>>=) #-}
@@ -2843,14 +2569,8 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2569 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2570 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2571 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847 {-# INLINABLE fail #-}
2572 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2573+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2575-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2576-- a mutex for that timeline
@@ -2862,7 +2582,7 @@ runSpiderHost (SpiderHost a) = a
2862runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2582runSpiderHostForTimeline :: SpiderHost x a -> SpiderTimelineEnv x -> IO a
2863runSpiderHostForTimeline (SpiderHost a) _ = a
2583runSpiderHostForTimeline (SpiderHost a) _ = a
2865−newtype SpiderHostFrame (x :: Type) a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2585+newtype SpiderHostFrame x a = SpiderHostFrame { runSpiderHostFrame :: EventM x a }
2866 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2586 deriving (Functor, Applicative, MonadFix, MonadIO, MonadException, MonadAsyncException)
2868instance Monad (SpiderHostFrame x) where
2588instance Monad (SpiderHostFrame x) where
@@ -2872,21 +2592,19 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2592 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2593 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2594 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2595 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2596 fail s = SpiderHostFrame $ fail s
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2598instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881 notReadyUntil _ = pure ()
2599 notReadyUntil _ = pure ()
2882 notReady = pure ()
2600 notReady = pure ()
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2602+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2603newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2604 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2605 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2607+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2608newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2609 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2610 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2638,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2638instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2639 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2640 primitive = SpiderHostFrame . EventM . primitive
2924−instance NotReady (SpiderTimeline x) (SpiderHost x) where
2925− notReadyUntil _ = return ()
2926− notReady = return ()
2928−instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2929− notReadyUntil _ = return ()
2930− notReady = return ()