@@ -9,6 +9,8 @@
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 #-}
@@ -16,10 +18,7 @@
16{-# LANGUAGE TypeOperators #-}
18{-# LANGUAGE TypeOperators #-}
17{-# LANGUAGE UndecidableInstances #-}
19{-# LANGUAGE UndecidableInstances #-}
18{-# LANGUAGE PolyKinds #-}
20{-# LANGUAGE PolyKinds #-}
19−{-# LANGUAGE DeriveFunctor #-}
20−{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE InstanceSigs #-}
21{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
24#ifdef USE_REFLEX_OPTIMIZER
23#ifdef USE_REFLEX_OPTIMIZER
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
24{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -38,17 +37,12 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
38import Control.Monad.Exception
37import Control.Monad.Exception
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
38import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
40import Control.Monad.Primitive
39import Control.Monad.Primitive
41−import Control.Monad.Reader.Class
40+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
42−import Control.Monad.IO.Class
43−import Control.Monad.ReaderIO
44import Control.Monad.Ref
41import Control.Monad.Ref
45−import Control.Monad.Fail (MonadFail)
46−import qualified Control.Monad.Fail as MonadFail
47import Data.Align
42import Data.Align
48import Data.Coerce
43import Data.Coerce
49−import Data.Dependent.Map (DMap)
44+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
45import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
46import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53import qualified Data.FastMutableIntMap as FastMutableIntMap
47import qualified Data.FastMutableIntMap as FastMutableIntMap
54import Data.Foldable hiding (concat, elem, sequence_)
48import Data.Foldable hiding (concat, elem, sequence_)
@@ -61,13 +55,12 @@ import qualified Data.IntMap.Strict as IntMap
61import Data.IORef
55import Data.IORef
62import Data.Kind (Type)
56import Data.Kind (Type)
63import Data.Maybe hiding (mapMaybe)
57import Data.Maybe hiding (mapMaybe)
64−import Data.Monoid (mempty, (<>))
58+import Data.Monoid ((<>))
65import Data.Proxy
59import Data.Proxy
66import Data.These
60import Data.These
67import Data.Traversable
61import Data.Traversable
68−import Data.Type.Equality ((:~:)(Refl))
69import Data.Witherable (Filterable, mapMaybe)
62import Data.Witherable (Filterable, mapMaybe)
70−import GHC.Exts hiding (toList)
63+import GHC.Exts
71import GHC.IORef (IORef (..))
64import GHC.IORef (IORef (..))
72import GHC.Stack
65import GHC.Stack
73import Reflex.FastWeak
66import Reflex.FastWeak
@@ -75,27 +68,22 @@ import System.IO.Unsafe
75import System.Mem.Weak
68import System.Mem.Weak
76import Unsafe.Coerce
69import Unsafe.Coerce
78−#ifdef MIN_VERSION_semialign
71+#if defined(MIN_VERSION_semialign)
79#if MIN_VERSION_these(0,8,0)
72#if MIN_VERSION_these(0,8,0)
80import Data.These.Combinators (justThese)
73import Data.These.Combinators (justThese)
82−#if MIN_VERSION_semialign(1,1,0)
83−import Data.Zip (Zip (..))
87#ifdef DEBUG_CYCLES
77#ifdef DEBUG_CYCLES
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
78import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
91import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
79import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
92import qualified Data.List.NonEmpty as NonEmpty
80import qualified Data.List.NonEmpty as NonEmpty
81+import Data.Monoid (mempty)
93import Data.Tree (Forest, Tree (..), drawForest)
82import Data.Tree (Forest, Tree (..), drawForest)
94−import Data.List (isPrefixOf)
83+#endif
96−import Data.FastWeakBag (FastWeakBag, FastWeakBagTicket)
85+import Data.FastWeakBag (FastWeakBag)
97import qualified Data.FastWeakBag as FastWeakBag
86import qualified Data.FastWeakBag as FastWeakBag
99import Data.Reflection
87import Data.Reflection
100import Data.Some (Some(Some))
88import Data.Some (Some(Some))
101import Data.Type.Coercion
89import Data.Type.Coercion
@@ -106,26 +94,20 @@ import qualified Reflex.Class
106import qualified Reflex.Class as R
94import qualified Reflex.Class as R
107import qualified Reflex.Host.Class
95import qualified Reflex.Host.Class
108import Reflex.NotReady.Class
96import Reflex.NotReady.Class
109−import Data.Patch
97+import Reflex.Patch
110−import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
98+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
111−import Reflex.PerformEvent.Base (PerformEventT)
113#ifdef DEBUG_TRACE_EVENTS
100#ifdef DEBUG_TRACE_EVENTS
114import qualified Data.ByteString.Char8 as BS8
101import qualified Data.ByteString.Char8 as BS8
115import System.IO (stderr)
102import 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
105#ifdef DEBUG_TRACE_EVENTS
124withStackOneLine :: (BS8.ByteString -> a) -> a
107withStackOneLine :: (BS8.ByteString -> a) -> a
125withStackOneLine expr = unsafePerformIO $ do
108withStackOneLine expr = unsafePerformIO $ do
126 stack <- currentCallStack
109 stack <- currentCallStack
127− return (expr . BS8.pack . unwords . dropInternal . reverse $ stack)
110+ return (expr (BS8.pack (unwords (reverse stack))))
128− where dropInternal = filterStack "Reflex.Spider.Internal"
@@ -136,42 +118,28 @@ debugInvalidateHeight :: Bool
136debugInvalidate :: Bool
118debugInvalidate :: Bool
138#ifdef DEBUG
120#ifdef DEBUG
139#define DEBUG_NODEIDS
122#define DEBUG_NODEIDS
141−#ifdef DEBUG_TRACE_PROPAGATION
142debugPropagate = True
124debugPropagate = True
144−debugPropagate = False
147−#ifdef DEBUG_TRACE_HEIGHT
148−debugInvalidateHeight = True
150debugInvalidateHeight = False
126debugInvalidateHeight = False
153−#ifdef DEBUG_TRACE_INVALIDATION
154debugInvalidate = True
128debugInvalidate = True
156−debugInvalidate = False
159class HasNodeId a where
130class HasNodeId a where
160 getNodeId :: a -> Int
131 getNodeId :: a -> Int
162−instance HasNodeId (CacheSubscribed x a) where
133+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
134 getNodeId = holdNodeId
136+instance HasNodeId (PushSubscribed x a b) where
137+ getNodeId = pushSubscribedNodeId
171instance HasNodeId (SwitchSubscribed x a) where
139instance HasNodeId (SwitchSubscribed x a) where
172 getNodeId = switchSubscribedNodeId
140 getNodeId = switchSubscribedNodeId
174−instance HasNodeId (FanSubscribed x v a) where
142+instance HasNodeId (FanSubscribed x a) where
175 getNodeId = fanSubscribedNodeId
143 getNodeId = fanSubscribedNodeId
177instance HasNodeId (CoincidenceSubscribed x a) where
145instance HasNodeId (CoincidenceSubscribed x a) where
@@ -185,16 +153,41 @@ instance HasNodeId (Pull x a) where
186{-# INLINE showNodeId #-}
154{-# INLINE showNodeId #-}
187showNodeId :: HasNodeId a => a -> String
155showNodeId :: HasNodeId a => a -> String
188−showNodeId = showNodeId' . getNodeId
156+showNodeId = ("#"<>) . show . getNodeId
190−showNodeId' :: Int -> String
158+showSubscriberType :: Subscriber x a -> String
191−showNodeId' = ("#"<>) . show
159+showSubscriberType = \case
192−
160+ SubscriberPush _ _ -> "SubscriberPush"
161+ SubscriberMerge _ _ -> "SubscriberMerge"
162+ SubscriberFan _ -> "SubscriberFan"
163+ SubscriberMergeChange _ -> "SubscriberMergeChange"
164+ SubscriberHold _ -> "SubscriberHold"
165+ SubscriberHoldIdentity _ -> "SubscriberHoldIdentity"
166+ SubscriberSwitch _ -> "SubscriberSwitch"
167+ SubscriberCoincidenceOuter _ -> "SubscriberCoincidenceOuter"
168+ SubscriberCoincidenceInner _ -> "SubscriberCoincidenceInner"
169+ SubscriberHandle -> "SubscriberHandle"
171+showEventType :: Event x a -> String
172+showEventType = \case
173+ EventRoot _ _ -> "EventRoot"
174+ EventNever -> "EventNever"
175+ EventPush _ -> "EventPush"
176+ EventMerge _ -> "EventMerge"
177+ EventFan _ _ -> "EventFan"
178+ EventSwitch _ -> "EventSwitch"
179+ EventCoincidence _ -> "EventCoincidence"
180+ EventHold _ -> "EventHold"
181+ EventDyn _ -> "EventDyn"
182+ EventHoldIdentity _ -> "EventHoldIdentity"
183+ EventDynIdentity _ -> "EventDynIdentity"
196debugPropagate = False
187debugPropagate = False
197debugInvalidateHeight = False
189debugInvalidateHeight = False
198debugInvalidate = False
191debugInvalidate = False
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
193-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
@@ -202,10 +195,6 @@ debugInvalidate = False
202showNodeId :: a -> String
195showNodeId :: a -> String
203showNodeId _ = ""
196showNodeId _ = ""
205−{-# INLINE showNodeId' #-}
206−showNodeId' :: Int -> String
211#ifdef DEBUG_NODEIDS
200#ifdef DEBUG_NODEIDS
@@ -251,9 +240,9 @@ subscribeAndRead = unEvent
251-- caching; if the computation function is very cheap, this is (much) more
240-- caching; if the computation function is very cheap, this is (much) more
252-- efficient than 'push'
241-- efficient than 'push'
253{-# INLINE [1] pushCheap #-}
242{-# INLINE [1] pushCheap #-}
254−pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
243+pushCheap :: (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
255pushCheap !f e = Event $ \sub -> do
244pushCheap !f e = Event $ \sub -> do
256− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
245+ (subscription, occ) <- subscribeAndRead e $ sub
257 { subscriberPropagate = \a -> do
246 { subscriberPropagate = \a -> do
258 mb <- f a
247 mb <- f a
259 mapM_ (subscriberPropagate sub) mb
248 mapM_ (subscriberPropagate sub) mb
@@ -272,10 +261,10 @@ terminalSubscriber p = Subscriber
273-- | Subscribe to an Event only for the duration of one occurrence
262-- | Subscribe to an Event only for the duration of one occurrence
274{-# INLINE subscribeAndReadHead #-}
263{-# INLINE subscribeAndReadHead #-}
275−subscribeAndReadHead :: HasSpiderTimeline x => Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
264+subscribeAndReadHead :: Event x a -> Subscriber x a -> EventM x (EventSubscription x, Maybe a)
276subscribeAndReadHead e sub = do
265subscribeAndReadHead e sub = do
277 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
266 subscriptionRef <- liftIO $ newIORef $ error "subscribeAndReadHead: not initialized"
278− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "head" $ sub
267+ (subscription, occ) <- subscribeAndRead e $ sub
279 { subscriberPropagate = \a -> do
268 { subscriberPropagate = \a -> do
280 liftIO $ unsubscribe =<< readIORef subscriptionRef
269 liftIO $ unsubscribe =<< readIORef subscriptionRef
281 subscriberPropagate sub a
270 subscriberPropagate sub a
@@ -286,42 +275,24 @@ subscribeAndReadHead e sub = do
286 return (subscription, occ)
275 return (subscription, occ)
288--TODO: Make this lazy in its input event
277--TODO: Make this lazy in its input event
289−headE :: (MonadIO m, Defer (SomeMergeInit x) m, HasSpiderTimeline x) => Event x a -> m (Event x a)
278+headE :: (MonadIO m, Defer (SomeMergeInit x) m) => Event x a -> m (Event x a)
290headE originalE = do
279headE originalE = do
291 parent <- liftIO $ newIORef $ Just originalE
280 parent <- liftIO $ newIORef $ Just originalE
292 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
281 defer $ SomeMergeInit $ do --TODO: Rename SomeMergeInit appropriately
293 let clearParent = liftIO $ writeIORef parent Nothing
282 let clearParent = liftIO $ writeIORef parent Nothing
294− (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ const clearParent
283+ (_, occ) <- subscribeAndReadHead originalE $ terminalSubscriber $ \_ -> clearParent
295 when (isJust occ) clearParent
284 when (isJust occ) clearParent
296− return $ Event $ \sub ->
285+ return $ Event $ \sub -> do
297 liftIO (readIORef parent) >>= \case
286 liftIO (readIORef parent) >>= \case
298− Nothing -> subscribeAndReadNever
287+ Nothing -> return (EventSubscription (return ()) $ EventSubscribed zeroRef $ toAny (), Nothing)
299 Just e -> subscribeAndReadHead e sub
288 Just e -> subscribeAndReadHead e sub
301data CacheSubscribed x a
290data CacheSubscribed x a
302 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
291 = CacheSubscribed { _cacheSubscribed_subscribers :: {-# UNPACK #-} !(FastWeakBag (Subscriber x a))
303 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
292 , _cacheSubscribed_parent :: {-# UNPACK #-} !(EventSubscription x)
304 , _cacheSubscribed_occurrence :: {-# UNPACK #-} !(IORef (Maybe a))
293 , _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
296-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
297-- repeatedly
@@ -346,23 +317,18 @@ cacheEvent e =
346 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
317 subscribedTicket <- liftIO (readIORef mSubscribedRef >>= getFastWeakTicket) >>= \case
347 Just subscribedTicket -> return subscribedTicket
318 Just subscribedTicket -> return subscribedTicket
348 Nothing -> do
319 Nothing -> do
350− nodeId <- liftIO newNodeId
352 subscribers <- liftIO FastWeakBag.empty
320 subscribers <- liftIO FastWeakBag.empty
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
321 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
322 (parentSub, occ) <- subscribeAndRead e $ Subscriber
359− { subscriberPropagate = \a -> do
323+ { subscriberPropagate = \a -> do
360− liftIO $ writeIORef occRef (Just a)
324+ liftIO $ writeIORef occRef $ Just a
361− scheduleClear occRef
325+ scheduleClear occRef
362− propagateFast a subscribers
326+ propagateFast a subscribers
327+ , subscriberInvalidateHeight = \old -> do
363− , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
328+ FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
329+ , subscriberRecalculateHeight = \new -> do
364− , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
330+ FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
366 when (isJust occ) $ do
332 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
333 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
368 scheduleClear occRef
334 scheduleClear occRef
@@ -370,45 +336,29 @@ cacheEvent e =
370 { _cacheSubscribed_subscribers = subscribers
336 { _cacheSubscribed_subscribers = subscribers
371 , _cacheSubscribed_parent = parentSub
337 , _cacheSubscribed_parent = parentSub
372 , _cacheSubscribed_occurrence = occRef
338 , _cacheSubscribed_occurrence = occRef
374− , _cacheSubscribed_nodeId = nodeId
377 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
340 subscribedTicket <- liftIO $ mkFastWeakTicket subscribed
378 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
341 liftIO $ writeIORef mSubscribedRef =<< getFastWeakTicketWeak subscribedTicket
379 return subscribedTicket
342 return subscribedTicket
380− liftIO $ cacheSubscription sub mSubscribedRef subscribedTicket
343+ 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
344+ subscribed <- getFastWeakTicketValue subscribedTicket
386− ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
345+ ticket <- FastWeakBag.insert sub $ _cacheSubscribed_subscribers subscribed
387− occ <- readIORef $ _cacheSubscribed_occurrence subscribed
346+ occ <- readIORef $ _cacheSubscribed_occurrence subscribed
389− let parentSub = _cacheSubscribed_parent subscribed
390− es = EventSubscription
347+ let es = EventSubscription
391− { _eventSubscription_unsubscribe = do
348+ { _eventSubscription_unsubscribe = do
392− FastWeakBag.remove ticket
349+ FastWeakBag.remove ticket
394− isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
350+ isEmpty <- FastWeakBag.isEmpty $ _cacheSubscribed_subscribers subscribed
395− when isEmpty $ do
351+ when isEmpty $ do
396− writeIORef mSubscribedRef emptyFastWeak
352+ writeIORef mSubscribedRef emptyFastWeak
397− unsubscribe parentSub
353+ unsubscribe $ _cacheSubscribed_parent subscribed
398− touch ticket
354+ touch ticket
399− touch subscribedTicket
355+ touch subscribedTicket
400− , _eventSubscription_subscribed = EventSubscribed
356+ , _eventSubscription_subscribed = EventSubscribed
401− { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed parentSub
357+ { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ _cacheSubscribed_parent subscribed
402− , eventSubscribedRetained = toAny subscribedTicket
358+ , eventSubscribedRetained = toAny subscribedTicket
404− , eventSubscribedGetParents = return [_eventSubscription_subscribed parentSub]
405− , eventSubscribedHasOwnHeightRef = False
406− , eventSubscribedWhoCreated = whoCreatedIORef mSubscribedRef
410− return (es, occ)
361+ return (es, occ)
413subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
363subscribe :: Event x a -> Subscriber x a -> EventM x (EventSubscription x)
414subscribe e s = fst <$> subscribeAndRead e s
364subscribe e s = fst <$> subscribeAndRead e s
@@ -420,14 +370,11 @@ wrap tag getSpecificSubscribed sub = do
420 let es = tag subd
370 let es = tag subd
421 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
371 return (EventSubscription (WeakBag.remove sln >> touch sln) es, occ)
423−eventRoot :: (GCompare k, HasSpiderTimeline x) => k a -> Root x k -> Event x a
373+eventRoot :: GCompare k => k a -> Root x k -> Event x a
424eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed k r
374eventRoot !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
376eventNever :: Event x a
430−eventNever = Event $ const subscribeAndReadNever
377+eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
432eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
379eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
433eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
380eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
@@ -464,6 +411,16 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
411 , subscriberRecalculateHeight :: !(Height -> IO ())
414+--TODO: Move this comment to WeakBag
415+-- These function are constructor functions that are marked NOINLINE so they are
416+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
417+-- so any weak references that are attached to the constructors will have their
418+-- finalizer run. Using the opaque constructor, does not see the
419+-- constructor application, so it behaves like an IORef and cannot be fused away.
421+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
422+-- the weak pointer to it in some cases.
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
424newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
425newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
426 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -472,10 +429,10 @@ newSubscriberHold h = return $ Subscriber
474newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
431newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
475−newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId subscribed) $ Subscriber
432+newSubscriberFan subscribed = return $ Subscriber
476 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
433 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
477 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
434 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
478− tracePropagate (Proxy :: Proxy x) $ show (DMap.size subs) <> " keys subscribed, " <> show (DMap.size a) <> " keys firing"
435+ 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
436 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
480 scheduleClear $ fanSubscribedOccurrence subscribed
437 scheduleClear $ fanSubscribedOccurrence subscribed
481 let f _ (Pair v subsubs) = do
438 let f _ (Pair v subsubs) = do
@@ -484,55 +441,72 @@ newSubscriberFan subscribed = debugSubscriber ("SubscriberFan " <> showNodeId su
484 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
441 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
485 return ()
442 return ()
486 , subscriberInvalidateHeight = \old -> do
443 , subscriberInvalidateHeight = \old -> do
444+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
487 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
445 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
488− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
446+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ invalidateSubscriberHeight old
447+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
489 , subscriberRecalculateHeight = \new -> do
448 , subscriberRecalculateHeight = \new -> do
449+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed
490 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
450 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
491− forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse_ (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
451+ forM_ (DMap.toList subscribers) $ \(_ :=> v) -> WeakBag.traverse (_fanSubscribedChildren_list v) $ recalculateSubscriberHeight new
452+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberFan" <> showNodeId subscribed <> " done"
494newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
455newSubscriberSwitch :: forall x a. HasSpiderTimeline x => SwitchSubscribed x a -> IO (Subscriber x a)
495−newSubscriberSwitch subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
456+newSubscriberSwitch subscribed = return $ Subscriber
496 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
457 { subscriberPropagate = \a -> {-# SCC "traverseSwitch" #-} do
458+ tracePropagate (Proxy :: Proxy x) $ "SubscriberSwitch" <> showNodeId subscribed
497 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
459 liftIO $ writeIORef (switchSubscribedOccurrence subscribed) $ Just a
498 scheduleClear $ switchSubscribedOccurrence subscribed
460 scheduleClear $ switchSubscribedOccurrence subscribed
499 propagate a $ switchSubscribedSubscribers subscribed
461 propagate a $ switchSubscribedSubscribers subscribed
500 , subscriberInvalidateHeight = \_ -> do
462 , subscriberInvalidateHeight = \_ -> do
463+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
501 oldHeight <- readIORef $ switchSubscribedHeight subscribed
464 oldHeight <- readIORef $ switchSubscribedHeight subscribed
502 when (oldHeight /= invalidHeight) $ do
465 when (oldHeight /= invalidHeight) $ do
503 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
466 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
504− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
467+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
468+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
469+ , subscriberRecalculateHeight = \new -> do
470+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed
505− , subscriberRecalculateHeight = (`updateSwitchHeight` subscribed)
471+ updateSwitchHeight new subscribed
472+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberSwitch" <> showNodeId subscribed <> " done"
508newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
475newSubscriberCoincidenceOuter :: forall x b. HasSpiderTimeline x => CoincidenceSubscribed x b -> IO (Subscriber x (Event x b))
509−newSubscriberCoincidenceOuter subscribed = debugSubscriber ("SubscriberCoincidenceOuter" <> showNodeId subscribed) $ Subscriber
476+newSubscriberCoincidenceOuter subscribed = return $ Subscriber
510 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
477 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceOuter" #-} do
478+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceOuter" <> showNodeId subscribed
511 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
479 outerHeight <- liftIO $ readIORef $ coincidenceSubscribedHeight subscribed
512 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
480 tracePropagate (Proxy :: Proxy x) $ " outerHeight = " <> show outerHeight
513 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
481 (occ, innerHeight, innerSubd) <- subscribeCoincidenceInner a outerHeight subscribed
514 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
482 tracePropagate (Proxy :: Proxy x) $ " isJust occ = " <> show (isJust occ)
515 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
483 tracePropagate (Proxy :: Proxy x) $ " innerHeight = " <> show innerHeight
517 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
484 liftIO $ writeIORef (coincidenceSubscribedInnerParent subscribed) $ Just innerSubd
518 scheduleClear $ coincidenceSubscribedInnerParent subscribed
485 scheduleClear $ coincidenceSubscribedInnerParent subscribed
519 case occ of
486 case occ of
520− Nothing ->
487+ Nothing -> do
521 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
488 when (innerHeight > outerHeight) $ liftIO $ do -- If the event fires, it will fire at a later height
522 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
489 writeIORef (coincidenceSubscribedHeight subscribed) $! innerHeight
523− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
490+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight outerHeight
524− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
491+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight innerHeight
525 Just o -> do -- Since it's already firing, no need to adjust height
492 Just o -> do -- Since it's already firing, no need to adjust height
526 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
493 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) occ
527 scheduleClear $ coincidenceSubscribedOccurrence subscribed
494 scheduleClear $ coincidenceSubscribedOccurrence subscribed
528 propagate o $ coincidenceSubscribedSubscribers subscribed
495 propagate o $ coincidenceSubscribedSubscribers subscribed
496+ , subscriberInvalidateHeight = \_ -> do
497+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
529− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
498+ invalidateCoincidenceHeight subscribed
499+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
500+ , subscriberRecalculateHeight = \_ -> do
501+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed
530− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
502+ recalculateCoincidenceHeight subscribed
503+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceOuter" <> showNodeId subscribed <> " done"
533newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
506newSubscriberCoincidenceInner :: forall x a. HasSpiderTimeline x => CoincidenceSubscribed x a -> IO (Subscriber x a)
534−newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoincidenceInner" <> showNodeId subscribed) $ Subscriber
507+newSubscriberCoincidenceInner subscribed = return $ Subscriber
535 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
508 { subscriberPropagate = \a -> {-# SCC "traverseCoincidenceInner" #-} do
509+ tracePropagate (Proxy :: Proxy x) $ "SubscriberCoincidenceInner" <> showNodeId subscribed
536 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
510 occ <- liftIO $ readIORef $ coincidenceSubscribedOccurrence subscribed
537 case occ of
511 case occ of
538 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
512 Just _ -> return () -- SubscriberCoincidenceOuter must have already propagated this event
@@ -540,8 +514,14 @@ newSubscriberCoincidenceInner subscribed = debugSubscriber ("SubscriberCoinciden
540 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
514 liftIO $ writeIORef (coincidenceSubscribedOccurrence subscribed) $ Just a
541 scheduleClear $ coincidenceSubscribedOccurrence subscribed
515 scheduleClear $ coincidenceSubscribedOccurrence subscribed
542 propagate a $ coincidenceSubscribedSubscribers subscribed
516 propagate a $ coincidenceSubscribedSubscribers subscribed
517+ , subscriberInvalidateHeight = \_ -> do
518+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
543− , subscriberInvalidateHeight = \_ -> invalidateCoincidenceHeight subscribed
519+ invalidateCoincidenceHeight subscribed
520+ when debugInvalidateHeight $ putStrLn $ "invalidateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
521+ , subscriberRecalculateHeight = \_ -> do
522+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed
544− , subscriberRecalculateHeight = \_ -> recalculateCoincidenceHeight subscribed
523+ recalculateCoincidenceHeight subscribed
524+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: SubscriberCoincidenceInner" <> showNodeId subscribed <> " done"
547invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
527invalidateSubscriberHeight :: Height -> Subscriber x a -> IO ()
@@ -551,18 +531,18 @@ recalculateSubscriberHeight :: Height -> Subscriber x a -> IO ()
551recalculateSubscriberHeight = flip subscriberRecalculateHeight
531recalculateSubscriberHeight = flip subscriberRecalculateHeight
553-- | Propagate everything at the current height
533-- | Propagate everything at the current height
554−propagate :: forall x a. HasSpiderTimeline x => a -> WeakBag (Subscriber x a) -> EventM x ()
534+propagate :: a -> WeakBag (Subscriber x a) -> EventM x ()
555−propagate a subscribers = withIncreasedDepth (Proxy::Proxy x) $
535+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
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
557 --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
558− WeakBag.traverse_ subscribers $ \s -> subscriberPropagate s a
538+ WeakBag.traverse subscribers $ \s -> subscriberPropagate s a
560-- | Propagate everything at the current height
540-- | Propagate everything at the current height
561−propagateFast :: forall x a. HasSpiderTimeline x => a -> FastWeakBag (Subscriber x a) -> EventM x ()
541+propagateFast :: a -> FastWeakBag (Subscriber x a) -> EventM x ()
562−propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
542+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
543 -- 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
544 --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
545+ FastWeakBag.traverse subscribers $ \s -> subscriberPropagate s a
567--------------------------------------------------------------------------------
547--------------------------------------------------------------------------------
568-- EventSubscribed
548-- EventSubscribed
@@ -571,16 +551,11 @@ propagateFast a subscribers = withIncreasedDepth (Proxy::Proxy x) $
571toAny :: a -> Any
551toAny :: a -> Any
572toAny = unsafeCoerce
552toAny = 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
554data EventSubscribed x = EventSubscribed
580 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
555 { eventSubscribedHeightRef :: {-# UNPACK #-} !(IORef Height)
581 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
556 , eventSubscribedRetained :: {-# NOUNPACK #-} !Any
582#ifdef DEBUG_CYCLES
557#ifdef DEBUG_CYCLES
583− , eventSubscribedGetParents :: !(IO [EventSubscribed x]) -- For debugging loops
558+ , eventSubscribedGetParents :: !(IO [Some (EventSubscribed x)]) -- For debugging loops
584 , eventSubscribedHasOwnHeightRef :: !Bool
559 , eventSubscribedHasOwnHeightRef :: !Bool
585 , eventSubscribedWhoCreated :: !(IO [String])
560 , eventSubscribedWhoCreated :: !(IO [String])
@@ -607,23 +582,13 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
582 , 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"]
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
586eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
587eventSubscribedFan !subscribed = EventSubscribed
623 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
588 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
624 , eventSubscribedRetained = toAny subscribed
589 , eventSubscribedRetained = toAny subscribed
625#ifdef DEBUG_CYCLES
590#ifdef DEBUG_CYCLES
626− , eventSubscribedGetParents = return [_eventSubscription_subscribed $ fanSubscribedParent subscribed]
591+ , eventSubscribedGetParents = return [Some $ _eventSubscription_subscribed $ fanSubscribedParent subscribed]
627 , eventSubscribedHasOwnHeightRef = False
592 , eventSubscribedHasOwnHeightRef = False
628 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
593 , eventSubscribedWhoCreated = whoCreatedIORef $ fanSubscribedCachedSubscribed subscribed
@@ -636,7 +601,7 @@ eventSubscribedSwitch !subscribed = EventSubscribed
636#ifdef DEBUG_CYCLES
601#ifdef DEBUG_CYCLES
637 , eventSubscribedGetParents = do
602 , eventSubscribedGetParents = do
638 s <- readIORef $ switchSubscribedCurrentParent subscribed
603 s <- readIORef $ switchSubscribedCurrentParent subscribed
639− return [_eventSubscription_subscribed s]
604+ return [Some $ _eventSubscription_subscribed s]
640 , eventSubscribedHasOwnHeightRef = True
605 , eventSubscribedHasOwnHeightRef = True
641 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
606 , eventSubscribedWhoCreated = whoCreatedIORef $ switchSubscribedCachedSubscribed subscribed
@@ -649,8 +614,8 @@ eventSubscribedCoincidence !subscribed = EventSubscribed
649#ifdef DEBUG_CYCLES
614#ifdef DEBUG_CYCLES
650 , eventSubscribedGetParents = do
615 , eventSubscribedGetParents = do
651 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
616 innerSubscription <- readIORef $ coincidenceSubscribedInnerParent subscribed
652− let outerParent = _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
617+ let outerParent = Some $ _eventSubscription_subscribed $ coincidenceSubscribedOuterParent subscribed
653− innerParents = maybeToList $ innerSubscription
618+ innerParents = maybeToList $ fmap Some innerSubscription
654 return $ outerParent : innerParents
619 return $ outerParent : innerParents
655 , eventSubscribedHasOwnHeightRef = True
620 , eventSubscribedHasOwnHeightRef = True
656 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
621 , eventSubscribedWhoCreated = whoCreatedIORef $ coincidenceSubscribedCachedSubscribed subscribed
@@ -664,15 +629,15 @@ getEventSubscribedHeight es = readIORef $ eventSubscribedHeightRef es
664whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
629whoCreatedEventSubscribed :: EventSubscribed x -> IO [String]
665whoCreatedEventSubscribed = eventSubscribedWhoCreated
630whoCreatedEventSubscribed = eventSubscribedWhoCreated
667−walkInvalidHeightParents :: EventSubscribed x -> IO [EventSubscribed x]
632+walkInvalidHeightParents :: EventSubscribed x -> IO [Some (EventSubscribed x)]
668walkInvalidHeightParents s0 = do
633walkInvalidHeightParents s0 = do
669− subscribers <- flip execStateT mempty $ ($ s0) $ fix $ \loop s -> do
634+ subscribers <- flip execStateT mempty $ ($ Some s0) $ fix $ \loop (Some s) -> do
670 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
635 h <- liftIO $ readIORef $ eventSubscribedHeightRef s
671 when (h == invalidHeight) $ do
636 when (h == invalidHeight) $ do
672 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
637 when (eventSubscribedHasOwnHeightRef s) $ liftIO $ writeIORef (eventSubscribedHeightRef s) $! invalidHeightBeingTraversed
673− modify (s :)
638+ modify (Some s :)
674 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
639 mapM_ loop =<< liftIO (eventSubscribedGetParents s)
675− forM_ subscribers $ \s -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
640+ forM_ subscribers $ \(Some s) -> writeIORef (eventSubscribedHeightRef s) $! invalidHeight
676 return subscribers
641 return subscribers
@@ -709,7 +674,7 @@ behaviorPull !p = Behavior $ do
709 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
674 wi <- liftIO $ mkWeakPtrWithDebug i "InvalidatorPull"
710 parentsRef <- liftIO $ newIORef []
675 parentsRef <- liftIO $ newIORef []
711 holdInits <- askBehaviorHoldInits
676 holdInits <- askBehaviorHoldInits
712− a <- liftIO $ runReaderIO (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
677+ a <- liftIO $ runReaderT (unBehaviorM $ pullCompute p) (Just (wi, parentsRef), holdInits)
713 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
678 invsRef <- liftIO . newIORef . maybeToList =<< askInvalidator
714 parents <- liftIO $ readIORef parentsRef
679 parents <- liftIO $ readIORef parentsRef
715 let subscribed = PullSubscribed
680 let subscribed = PullSubscribed
@@ -744,46 +709,42 @@ readBehaviorUntracked b = do
744-- Dynamic
709-- Dynamic
745--------------------------------------------------------------------------------
710--------------------------------------------------------------------------------
747−type DynamicS x p = Dynamic x (PatchTarget p) p
749−data Dynamic x target p = Dynamic
712+data Dynamic x p = Dynamic
750− { dynamicCurrent :: !(Behavior x target)
713+ { 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`?
714 , 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
717+dynamicHold :: Hold x p -> Dynamic x p
760dynamicHold !h = Dynamic
718dynamicHold !h = Dynamic
761 { dynamicCurrent = behaviorHold h
719 { dynamicCurrent = behaviorHold h
762 , dynamicUpdated = eventHold h
720 , dynamicUpdated = eventHold h
765−dynamicHoldIdentity :: Hold x (Identity a) -> DynamicS x (Identity a)
723+dynamicHoldIdentity :: Hold x (Identity a) -> Dynamic x (Identity a)
766dynamicHoldIdentity = dynamicHold
724dynamicHoldIdentity = dynamicHold
768−dynamicConst :: PatchTarget p -> DynamicS x p
726+dynamicConst :: PatchTarget p -> Dynamic x p
769dynamicConst !a = Dynamic
727dynamicConst !a = Dynamic
770 { dynamicCurrent = behaviorConst a
728 { dynamicCurrent = behaviorConst a
771 , dynamicUpdated = eventNever
729 , dynamicUpdated = eventNever
774−dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> DynamicS x p
732+dynamicDyn :: (HasSpiderTimeline x, Patch p) => Dyn x p -> Dynamic x p
775dynamicDyn !d = Dynamic
733dynamicDyn !d = Dynamic
776 { dynamicCurrent = behaviorDyn d
734 { dynamicCurrent = behaviorDyn d
777 , dynamicUpdated = eventDyn d
735 , dynamicUpdated = eventDyn d
780−dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> DynamicS x (Identity a)
738+dynamicDynIdentity :: HasSpiderTimeline x => Dyn x (Identity a) -> Dynamic x (Identity a)
781dynamicDynIdentity = dynamicDyn
739dynamicDynIdentity = dynamicDyn
783--------------------------------------------------------------------------------
741--------------------------------------------------------------------------------
784-- Combinators
742-- Combinators
785--------------------------------------------------------------------------------
743--------------------------------------------------------------------------------
745+--TODO: Figure out why certain things are not 'representational', then make them
746+--representational so we can use coerce
787--type role Hold representational
748--type role Hold representational
788data Hold x p
749data Hold x p
789 = Hold { holdValue :: !(IORef (PatchTarget p))
750 = Hold { holdValue :: !(IORef (PatchTarget p))
@@ -804,25 +765,20 @@ globalSpiderTimelineEnv = unsafePerformIO unsafeNewSpiderTimelineEnv
805-- | Stores all global data relevant to a particular Spider timeline; only one
766-- | Stores all global data relevant to a particular Spider timeline; only one
806-- value should exist for each type @x@
767-- 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
768+data SpiderTimelineEnv x = SpiderTimelineEnv
813 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
769 { _spiderTimeline_lock :: {-# UNPACK #-} !(MVar ())
814 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
770 , _spiderTimeline_eventEnv :: {-# UNPACK #-} !(EventEnv x)
815#ifdef DEBUG
771#ifdef DEBUG
816 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
772 , _spiderTimeline_depth :: {-# UNPACK #-} !(IORef Int)
819−type role SpiderTimelineEnv' phantom
775+type role SpiderTimelineEnv nominal
821instance Eq (SpiderTimelineEnv x) where
777instance Eq (SpiderTimelineEnv x) where
822 _ == _ = True -- Since only one exists of each type
778 _ == _ = True -- Since only one exists of each type
824instance GEq SpiderTimelineEnv where
780instance GEq SpiderTimelineEnv where
825− a `geq` b = if _spiderTimeline_lock (unSTE a) == _spiderTimeline_lock (unSTE b)
781+ 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
782 then Just $ unsafeCoerce Refl -- This unsafeCoerce is safe because the same SpiderTimelineEnv can't have two different 'x' arguments
827 else Nothing
783 else Nothing
@@ -845,7 +801,7 @@ runEventM :: EventM x a -> IO a
845runEventM = unEventM
801runEventM = unEventM
847asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
803asksEventEnv :: forall x a. HasSpiderTimeline x => (EventEnv x -> a) -> EventM x a
848−asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (unSTE (spiderTimeline :: SpiderTimelineEnv x))
804+asksEventEnv f = return $ f $ _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
850class MonadIO m => Defer a m where
806class MonadIO m => Defer a m where
851 getDeferralQueue :: m (IORef [a])
807 getDeferralQueue :: m (IORef [a])
@@ -983,9 +939,9 @@ getHoldEventSubscription h = do
984type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
940type BehaviorEnv x = (Maybe (Weak (Invalidator x), IORef [SomeBehaviorSubscribed x]), IORef [SomeHoldInit x])
942+--type role BehaviorM representational
986-- BehaviorM can sample behaviors
943-- BehaviorM can sample behaviors
987−newtype BehaviorM x a = BehaviorM { unBehaviorM :: ReaderIO (BehaviorEnv x) a }
944+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
946instance Monad (BehaviorM x) where
991 {-# INLINE (>>=) #-}
947 {-# INLINE (>>=) #-}
@@ -994,10 +950,8 @@ instance Monad (BehaviorM x) where
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
950 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
995 {-# INLINE return #-}
951 {-# INLINE return #-}
996 return x = BehaviorM $ return x
952 return x = BehaviorM $ return x
997−#if !MIN_VERSION_base(4,13,0)
998 {-# INLINE fail #-}
953 {-# INLINE fail #-}
999 fail s = BehaviorM $ fail s
954 fail s = BehaviorM $ fail s
1002data BehaviorSubscribed x a
956data BehaviorSubscribed x a
1003 = forall p. BehaviorSubscribedHold (Hold x p)
957 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1057,7 +1011,7 @@ data SomeMergeUpdate x = SomeMergeUpdate
1057newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1011newtype SomeMergeInit x = SomeMergeInit { unSomeMergeInit :: EventM x () }
1059-- EventM can do everything BehaviorM can, plus create holds
1013-- 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)
1014+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 }
1016newtype MergeSubscribedParent x a = MergeSubscribedParent { unMergeSubscribedParent :: EventSubscription x }
@@ -1082,8 +1036,7 @@ heightBagFromList :: [Height] -> HeightBag
1082heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1036heightBagFromList heights = heightBagVerify $ foldl' (flip heightBagAdd) heightBagEmpty heights
1084heightBagAdd :: Height -> HeightBag -> HeightBag
1038heightBagAdd :: Height -> HeightBag -> HeightBag
1085−heightBagAdd (Height h) (HeightBag s c) = heightBagVerify $ HeightBag (succ s) $
1039+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
1041heightBagRemove :: Height -> HeightBag -> HeightBag
1089heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
1042heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.lookup h c of
@@ -1092,13 +1045,6 @@ heightBagRemove (Height h) b@(HeightBag s c) = heightBagVerify $ case IntMap.loo
1092 0 -> IntMap.delete h c
1045 0 -> IntMap.delete h c
1093 _ -> IntMap.insert h (pred old) c
1046 _ -> 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
1048heightBagMax :: HeightBag -> Height
1103heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1049heightBagMax (HeightBag _ c) = case IntMap.maxViewWithKey c of
1104 Just ((h, _), _) -> Height h
1050 Just ((h, _), _) -> Height h
@@ -1199,10 +1145,7 @@ instance HasSpiderTimeline x => Semialign (Event x) where
1199 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1145 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
1200 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1146 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1202−#ifdef MIN_VERSION_semialign
1148+#if defined(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
1149 zip x y = mapMaybe justThese $ align x y
@@ -1212,11 +1155,11 @@ data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1213newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1156newtype Dyn (x :: Type) p = Dyn { unDyn :: IORef (DynType x p) }
1215−newMapDyn :: HasSpiderTimeline x => (a -> b) -> DynamicS x (Identity a) -> DynamicS x (Identity b)
1158+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)
1159newMapDyn f d = dynamicDynIdentity $ unsafeBuildDynamic (fmap f $ readBehaviorTracked $ dynamicCurrent d) (Identity . f . runIdentity <$> dynamicUpdated d)
1218--TODO: Avoid the duplication between this and R.zipDynWith
1161--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)
1162+zipDynWith :: HasSpiderTimeline x => (a -> b -> c) -> Dynamic x (Identity a) -> Dynamic x (Identity b) -> Dynamic x (Identity c)
1220zipDynWith f da db =
1163zipDynWith f da db =
1221 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1164 let eab = align (dynamicUpdated da) (dynamicUpdated db)
1222 ec = flip push eab $ \o -> do
1165 ec = flip push eab $ \o -> do
@@ -1292,7 +1235,7 @@ run :: forall x b. HasSpiderTimeline x => [DSum (RootTrigger x) Identity] -> Res
1292run roots after = do
1235run roots after = do
1293 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1236 tracePropagate (Proxy :: Proxy x) $ "Running an event frame with " <> show (length roots) <> " events"
1294 let t = spiderTimeline :: SpiderTimelineEnv x
1237 let t = spiderTimeline :: SpiderTimelineEnv x
1295− result <- SpiderHost $ withMVar (_spiderTimeline_lock (unSTE t)) $ \_ -> unSpiderHost $ runFrame $ do
1238+ result <- SpiderHost $ withMVar (_spiderTimeline_lock t) $ \_ -> unSpiderHost $ runFrame $ do
1296 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1239 rootsToPropagate <- forM roots $ \r@(RootTrigger (_, occRef, k) :=> a) -> do
1297 occBefore <- liftIO $ do
1240 occBefore <- liftIO $ do
1298 occBefore <- readIORef occRef
1241 occBefore <- readIORef occRef
@@ -1346,110 +1289,55 @@ mkWeakPtrWithDebug x debugNote = do
1346 x' <- evaluate x
1289 x' <- evaluate x
1347 mkWeakPtr x' $
1290 mkWeakPtr x' $
1348 if debugFinalize
1291 if debugFinalize
1349− then Just $ debugStrLn $ "finalizing: " ++ debugNote
1292+ then Just $ putStrLn $ "finalizing: " ++ debugNote
1350 else Nothing
1293 else Nothing
1352type WeakList a = [Weak a]
1295type 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 #-}
1297{-# INLINE withIncreasedDepth #-}
1382−withIncreasedDepth :: forall proxy x m a. CanTrace x m => proxy x -> m a -> m a
1299+withIncreasedDepth :: CanTrace x m => m a -> m a
1383−withIncreasedDepth _ a = do
1300+withIncreasedDepth a = do
1301+ spiderTimeline <- askSpiderTimelineEnv
1384− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) succ
1302+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) succ
1385 result <- a
1303 result <- a
1386− liftIO $ modifyIORef' (_spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)) pred
1304+ liftIO $ modifyIORef' (_spiderTimeline_depth spiderTimeline) pred
1387 return result
1305 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
1307+withIncreasedDepth :: m a -> m a
1308+withIncreasedDepth = id
1414−{-# INLINE withIncreasedDepth #-}
1311+type CanTrace x m = (HasSpiderTimeline x, MonadIO m)
1415−withIncreasedDepth :: proxy x -> m a -> m a
1416−withIncreasedDepth _ = id
1418{-# INLINE tracePropagate #-}
1313{-# INLINE tracePropagate #-}
1419tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1314tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1420−tracePropagate _ _ = return ()
1315+tracePropagate p = traceWhen p debugPropagate
1422{-# INLINE traceInvalidate #-}
1317{-# INLINE traceInvalidate #-}
1423traceInvalidate :: String -> IO ()
1318traceInvalidate :: String -> IO ()
1424−traceInvalidate _ = return ()
1319+traceInvalidate = when debugInvalidate . liftIO . putStrLn
1426−{-# INLINE traceInvalidateHeight #-}
1427−traceInvalidateHeight :: String -> IO ()
1428−traceInvalidateHeight _ = return ()
1430−{-# INLINE debugSubscriber #-}
1321+{-# INLINE traceWhen #-}
1431−debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1432−debugSubscriber _ = return
1434−{-# INLINE debugSubscriber' #-}
1435−debugSubscriber' :: String -> Subscriber x a -> Subscriber x a
1436−debugSubscriber' _ = id
1440−{-# INLINE trace #-}
1441−trace :: (CanTrace x m) => proxy x -> String -> m ()
1322+traceWhen :: (CanTrace x m) => proxy x -> Bool -> String -> m ()
1442−trace _ _ = return ()
1323+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 ()
1325+{-# INLINE traceMWhen #-}
1326+traceMWhen :: (CanTrace x m) => proxy x -> Bool -> m String -> m ()
1327+traceMWhen _ b getMessage = when b $ do
1328+ message <- getMessage
1330+ spiderTimeline <- askSpiderTimelineEnv
1331+ d <- liftIO $ readIORef $ _spiderTimeline_depth spiderTimeline
1335+ liftIO $ putStrLn $ replicate d ' ' <> message
1450whoCreatedIORef :: IORef a -> IO [String]
1337whoCreatedIORef :: IORef a -> IO [String]
1451whoCreatedIORef (IORef a) = whoCreated $! a
1338whoCreatedIORef (IORef a) = whoCreated $! a
1453groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1341groupByHead :: Eq a => [NonEmpty a] -> [(a, NonEmpty [a])]
1454groupByHead = \case
1342groupByHead = \case
1455 [] -> []
1343 [] -> []
@@ -1460,54 +1348,20 @@ groupByHead = \case
1460 | otherwise -> (x, xs :| []) : l
1348 | otherwise -> (x, xs :| []) : l
1462listsToForest :: Eq a => [[a]] -> Forest a
1350listsToForest :: Eq a => [[a]] -> Forest a
1463−listsToForest lists = buildForest <$> groupByHead (mapMaybe nonEmpty lists)
1351+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 #-}
1354{-# INLINE propagateSubscriberHold #-}
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1355propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1500propagateSubscriberHold h a = do
1356propagateSubscriberHold h a = do
1501− {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1357+ {-# SCC "trace" #-} traceMWhen (Proxy :: Proxy x) debugPropagate $ liftIO $ do
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1358 invalidators <- liftIO $ readIORef $ holdInvalidators h
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1359 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1505 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1360 v <- {-# SCC "read" #-} liftIO $ readIORef $ holdValue h
1506 case {-# SCC "apply" #-} apply a v of
1361 case {-# SCC "apply" #-} apply a v of
1507 Nothing -> return ()
1362 Nothing -> return ()
1508 Just v' -> do
1363 Just v' -> do
1509− {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1510− tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1364+ {-# SCC "trace2" #-} withIncreasedDepth $ tracePropagate (Proxy :: Proxy x) $ "propagateSubscriberHold: assigning Hold" <> showNodeId h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1365 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1366 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1513 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
1367 defer $ {-# SCC "assignment" #-} SomeAssignment vRef iRef v'
@@ -1515,25 +1369,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
1369data 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
1371runBehaviorM :: 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)
1372+runBehaviorM a mwi holdInits = runReaderT (unBehaviorM a) (mwi, holdInits)
1520askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1374askInvalidator :: BehaviorM x (Maybe (Weak (Invalidator x)))
1521askInvalidator = do
1375askInvalidator = do
1522− (!m, _) <- ask
1376+ (!m, _) <- BehaviorM ask
1523 case m of
1377 case m of
1524 Nothing -> return Nothing
1378 Nothing -> return Nothing
1525 Just (!wi, _) -> return $ Just wi
1379 Just (!wi, _) -> return $ Just wi
1527askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1381askParentsRef :: BehaviorM x (Maybe (IORef [SomeBehaviorSubscribed x]))
1528askParentsRef = do
1382askParentsRef = do
1529− (!m, _) <- ask
1383+ (!m, _) <- BehaviorM ask
1530 case m of
1384 case m of
1531 Nothing -> return Nothing
1385 Nothing -> return Nothing
1532 Just (_, !p) -> return $ Just p
1386 Just (_, !p) -> return $ Just p
1534askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1388askBehaviorHoldInits :: BehaviorM x (IORef [SomeHoldInit x])
1535askBehaviorHoldInits = do
1389askBehaviorHoldInits = do
1536− (_, !his) <- ask
1390+ (_, !his) <- BehaviorM ask
1537 return his
1391 return his
1539{-# INLINE getDynHold #-}
1393{-# INLINE getDynHold #-}
@@ -1561,7 +1415,7 @@ getDynHold d = do
1561zeroRef :: IORef Height
1415zeroRef :: IORef Height
1562zeroRef = unsafePerformIO $ newIORef zeroHeight
1416zeroRef = 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)
1418+getRootSubscribed :: GCompare k => k a -> Root x k -> Subscriber x a -> IO (WeakBagTicket, RootSubscribed x a, Maybe a)
1565getRootSubscribed k r sub = do
1419getRootSubscribed k r sub = do
1566 mSubscribed <- readIORef $ rootSubscribed r
1420 mSubscribed <- readIORef $ rootSubscribed r
1567 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
1421 let getOcc = fmap (coerce . DMap.lookup k) $ readIORef $ rootOccurrence r
@@ -1575,9 +1429,7 @@ getRootSubscribed k r sub = do
1575 let !cached = rootSubscribed r
1429 let !cached = rootSubscribed r
1576 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1430 uninitRef <- newIORef $ error "getRootsubscribed: uninitRef not initialized"
1577 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1431 (subs, sln) <- WeakBag.singleton sub weakSelf cleanupRootSubscribed
1579− tracePropagate (Proxy::Proxy x) $ "getRootSubscribed: calling rootInit"
1432+ when debugPropagate $ putStrLn $ "getRootSubscribed: calling rootInit"
1581 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1433 uninit <- rootInit r k $ RootTrigger (subs, rootOccurrence r, k)
1582 writeIORef uninitRef $! uninit
1434 writeIORef uninitRef $! uninit
1583#ifdef DEBUG_NODEIDS
1435#ifdef DEBUG_NODEIDS
@@ -1627,9 +1479,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
1479 { _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
1480 , _fanInt_subscriptionRef :: {-# UNPACK #-} !(IORef (EventSubscription x)) -- This should have a valid subscription iff subscribers is non-empty
1629 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1481 , _fanInt_occRef :: {-# UNPACK #-} !(IORef (IntMap a))
1630−#ifdef DEBUG_NODEIDS
1631− , _fanInt_nodeId :: {-# UNPACK #-} !Int
1635newFanInt :: IO (FanInt x a)
1484newFanInt :: IO (FanInt x a)
@@ -1637,16 +1486,10 @@ 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
1486 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"
1487 subscriptionRef <- newIORef $ error "fanInt: no subscription"
1639 occRef <- newIORef $ error "fanInt: no occurrence"
1488 occRef <- newIORef $ error "fanInt: no occurrence"
1640−#ifdef DEBUG_NODEIDS
1641− nodeId <- newNodeId
1643 return $ FanInt
1489 return $ FanInt
1644 { _fanInt_subscribers = subscribers
1490 { _fanInt_subscribers = subscribers
1645 , _fanInt_subscriptionRef = subscriptionRef
1491 , _fanInt_subscriptionRef = subscriptionRef
1646 , _fanInt_occRef = occRef
1492 , _fanInt_occRef = occRef
1647−#ifdef DEBUG_NODEIDS
1648− , _fanInt_nodeId = nodeId
1652fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1495fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
@@ -1655,21 +1498,20 @@ fanInt p = unsafePerformIO $ do
1655 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1498 pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1656 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1499 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1657 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1500 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
1501+ (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1660 { subscriberPropagate = \m -> do
1502 { subscriberPropagate = \m -> do
1661 liftIO $ writeIORef (_fanInt_occRef self) m
1503 liftIO $ writeIORef (_fanInt_occRef self) m
1662 scheduleIntClear $ _fanInt_occRef self
1504 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?
1505+ 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 ->
1506+ FastWeakBag.traverse b $ \s -> do
1665 subscriberPropagate s v
1507 subscriberPropagate s v
1666− , subscriberInvalidateHeight = \old ->
1508+ , subscriberInvalidateHeight = \old -> do
1667− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1509+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1668− FastWeakBag.traverse_ b $ \s ->
1510+ FastWeakBag.traverse b $ \s -> do
1669 subscriberInvalidateHeight s old
1511 subscriberInvalidateHeight s old
1670− , subscriberRecalculateHeight = \new ->
1512+ , subscriberRecalculateHeight = \new -> do
1671− FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b ->
1513+ FastMutableIntMap.for_ (_fanInt_subscribers self) $ \b -> do
1672− FastWeakBag.traverse_ b $ \s ->
1514+ FastWeakBag.traverse b $ \s -> do
1673 subscriberRecalculateHeight s new
1515 subscriberRecalculateHeight s new
1675 liftIO $ do
1517 liftIO $ do
@@ -1683,25 +1525,10 @@ fanInt p = unsafePerformIO $ do
1683 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1525 FastMutableIntMap.insert (_fanInt_subscribers self) k b
1684 return b
1526 return b
1685 Just b -> return b
1527 Just b -> return b
1686− ticket <- liftIO $ FastWeakBag.insert sub b
1528+ t <- liftIO $ FastWeakBag.insert sub b
1687 currentOcc <- readIORef (_fanInt_occRef self)
1529 currentOcc <- readIORef (_fanInt_occRef self)
1688−
1530+ (EventSubscription _ (EventSubscribed !heightRef _)) <- readIORef (_fanInt_subscriptionRef self)
1689− subscribed <- fanIntSubscribed ticket self
1690− return (EventSubscription (FastWeakBag.remove ticket) subscribed, IntMap.lookup k currentOcc)
1531+ 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 #-}
1533{-# INLINABLE getFanSubscribed #-}
1707getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1534getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
@@ -1884,22 +1711,22 @@ subscribeCoincidenceSubscribed subscribed sub = WeakBag.insert sub (coincidenceS
1884{-# INLINE mergeG #-}
1711{-# INLINE mergeG #-}
1885mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1712mergeG :: forall k q x v. (HasSpiderTimeline x, GCompare k)
1886 => (forall a. q a -> Event x (v a))
1713 => (forall a. q a -> Event x (v a))
1887− -> DynamicS x (PatchDMap k q) -> Event x (DMap k v)
1714+ -> Dynamic x (PatchDMap k q) -> Event x (DMap k v)
1888mergeG nt d = cacheEvent (mergeCheap nt d)
1715mergeG nt d = cacheEvent (mergeCheap nt d)
1890{-# INLINE mergeWithMove #-}
1717{-# INLINE mergeWithMove #-}
1891mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1718mergeWithMove :: forall k v q x. (HasSpiderTimeline x, GCompare k)
1892 => (forall a. q a -> Event x (v a))
1719 => (forall a. q a -> Event x (v a))
1893− -> DynamicS x (PatchDMapWithMove k q) -> Event x (DMap k v)
1720+ -> Dynamic x (PatchDMapWithMove k q) -> Event x (DMap k v)
1894mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1721mergeWithMove nt d = cacheEvent (mergeCheapWithMove nt d)
1896{-# INLINE [1] mergeCheap #-}
1723{-# INLINE [1] mergeCheap #-}
1897mergeCheap
1724mergeCheap
1898 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1725 :: forall k x q v. (HasSpiderTimeline x, GCompare k)
1899 => (forall a. q a -> Event x (v a))
1726 => (forall a. q a -> Event x (v a))
1900− -> DynamicS x (PatchDMap k q)
1727+ -> Dynamic x (PatchDMap k q)
1901 -> Event x (DMap k v)
1728 -> Event x (DMap k v)
1902−mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updateMe destroy
1729+mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
1904 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1731 updateMe :: MergeUpdateFunc k v x (PatchDMap k q) (MergeSubscribedParent x)
1905 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
1732 updateMe subscriber heightBagRef oldParents (PatchDMap p) = do
@@ -1914,9 +1741,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
1914 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1741 liftIO $ modifyIORef' heightBagRef $ heightBagAdd newParentHeight
1915 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1742 return $ DMap.insertLookupWithKey' (\_ new _ -> new) k newParent ps
1916 forM_ mOldSubd $ \oldSubd -> do
1743 forM_ mOldSubd $ \oldSubd -> do
1917− oldHeight <- liftIO $ getEventSubscribedHeight $
1918− _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1744+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ unMergeSubscribedParent oldSubd
1920 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1745 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1921 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1746 return (maybeToList (unMergeSubscribedParent <$> mOldSubd) ++ subscriptionsToKill, newPs)
1922 foldM f ([], oldParents) $ DMap.toList p
1747 foldM f ([], oldParents) $ DMap.toList p
@@ -1927,7 +1752,7 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
1927 let s = subscriber $ return k
1752 let s = subscriber $ return k
1928 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1753 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1929 height <- liftIO $ getEventSubscribedHeight parentSubd
1754 height <- liftIO $ getEventSubscribedHeight parentSubd
1930− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
1755+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
1931 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1756 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1932 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1757 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1933 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1758 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1939,9 +1764,9 @@ mergeCheap nt = mergeGCheap' unMergeSubscribedParent getInitialSubscribers updat
1939{-# INLINE [1] mergeCheapWithMove #-}
1764{-# INLINE [1] mergeCheapWithMove #-}
1940mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1765mergeCheapWithMove :: forall k x v q. (HasSpiderTimeline x, GCompare k)
1941 => (forall a. q a -> Event x (v a))
1766 => (forall a. q a -> Event x (v a))
1942− -> DynamicS x (PatchDMapWithMove k q)
1767+ -> Dynamic x (PatchDMapWithMove k q)
1943 -> Event x (DMap k v)
1768 -> Event x (DMap k v)
1944−mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription getInitialSubscribers updateMe destroy
1769+mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
1946 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1771 updateMe :: MergeUpdateFunc k v x (PatchDMapWithMove k q) (MergeSubscribedParentWithMove x k)
1947 updateMe subscriber heightBagRef oldParents p = do
1772 updateMe subscriber heightBagRef oldParents p = do
@@ -1960,17 +1785,13 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1960 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1785 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k q a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1961 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1786 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1962 Nothing -> do
1787 Nothing -> do
1963− oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $
1788+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1964− _mergeSubscribedParentWithMove_subscription parent
1966 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1789 liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1967 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1790 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1968 Just toKey -> do
1791 Just toKey -> do
1969 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1792 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1970 return Nothing
1793 return Nothing
1971− toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $
1972− DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1794+ toDelete <- fmap catMaybes $ mapM (\(_ :=> v) -> getConstant v) $ DMap.toList $ DMap.intersectionWithKey moveOrDelete (unPatchDMapWithMove p) oldParents
1974 return (toDelete, applyAlways p' oldParents)
1795 return (toDelete, applyAlways p' oldParents)
1975 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1796 getInitialSubscribers :: MergeInitFunc k v q x (MergeSubscribedParentWithMove x k)
1976 getInitialSubscribers initialParents subscriber = do
1797 getInitialSubscribers initialParents subscriber = do
@@ -1979,7 +1800,7 @@ mergeCheapWithMove nt = mergeGCheap' _mergeSubscribedParentWithMove_subscription
1979 let s = subscriber $ liftIO $ readIORef keyRef
1800 let s = subscriber $ liftIO $ readIORef keyRef
1980 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1801 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
1981 height <- liftIO $ getEventSubscribedHeight parentSubd
1802 height <- liftIO $ getEventSubscribedHeight parentSubd
1982− return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1803+ return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
1983 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1804 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
1984 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1805 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
1985 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
1806 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@@ -1995,8 +1816,6 @@ type MergeUpdateFunc k v x p s
1996 -> EventM x ([EventSubscription x], DMap k s)
1817 -> EventM x ([EventSubscription x], DMap k s)
1998−type MergeGetSubscription x s = forall a. s a -> EventSubscription x
2000type MergeInitFunc k v q x s
1819type MergeInitFunc k v q x s
2001 = DMap k q
1820 = DMap k q
2002 -> (forall a. EventM x (k a) -> Subscriber x (v a))
1821 -> (forall a. EventM x (k a) -> Subscriber x (v a))
@@ -2020,17 +1839,14 @@ invalidateMergeHeight m = invalidateMergeHeight' (_merge_heightRef m) (_merge_su
2020invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
1839invalidateMergeHeight' :: IORef Height -> Subscriber x a -> IO ()
2021invalidateMergeHeight' heightRef sub = do
1840invalidateMergeHeight' heightRef sub = do
2022 oldHeight <- readIORef heightRef
1841 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
1842+ 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
1843 writeIORef heightRef $! invalidHeight
2026 subscriberInvalidateHeight sub oldHeight
1844 subscriberInvalidateHeight sub oldHeight
2028revalidateMergeHeight :: Merge x k v s -> IO ()
1846revalidateMergeHeight :: Merge x k v s -> IO ()
2029revalidateMergeHeight m = do
1847revalidateMergeHeight m = do
2030 currentHeight <- readIORef $ _merge_heightRef m
1848 currentHeight <- readIORef $ _merge_heightRef m
2032− -- revalidateMergeHeight may be called multiple times; perhaps the's a way to finesse it to avoid this check
1849+ 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
1850 heights <- readIORef $ _merge_heightBagRef m
2035 parents <- readIORef $ _merge_parentsRef m
1851 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
1852 -- When the number of heights in the bag reaches the number of parents, we should have a valid height
@@ -2038,7 +1854,7 @@ revalidateMergeHeight m = do
2038 LT -> return ()
1854 LT -> return ()
2039 EQ -> do
1855 EQ -> do
2040 let height = succHeight $ heightBagMax heights
1856 let height = succHeight $ heightBagMax heights
2041− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1857+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2042 writeIORef (_merge_heightRef m) $! height
1858 writeIORef (_merge_heightRef m) $! height
2043 subscriberRecalculateHeight (_merge_sub m) height
1859 subscriberRecalculateHeight (_merge_sub m) height
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
1860 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2046,45 +1862,36 @@ revalidateMergeHeight m = do
2046scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
1862scheduleMergeSelf :: HasSpiderTimeline x => Merge x k v s -> Height -> EventM x ()
2047scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
1863scheduleMergeSelf m height = scheduleMerge' height (_merge_heightRef m) $ do
2048 vals <- liftIO $ readIORef $ _merge_accumRef m
1864 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,
1865+ 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
1866 --TODO: Assert that m is not empty
2053 subscriberPropagate (_merge_sub m) vals
1867 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)
1869+mergeSubscriber :: forall x k v s a. (HasSpiderTimeline x, GCompare k) => Merge x k v s -> EventM x (k a) -> Subscriber x (v a)
2077−mergeSubscriber subscribed m getKey = Subscriber
1870+mergeSubscriber m getKey = Subscriber
2078 { subscriberPropagate = \a -> do
1871 { subscriberPropagate = \a -> do
2079 oldM <- liftIO $ readIORef $ _merge_accumRef m
1872 oldM <- liftIO $ readIORef $ _merge_accumRef m
2080 k <- getKey
1873 k <- getKey
2081− let newM = DMap.insertWith (error "Same key fired multiple times for Merge") k a oldM
1874+ let newM = DMap.insertWith (error $ "Same key fired multiple times for Merge") k a oldM
2082 tracePropagate (Proxy :: Proxy x) $ " DMap.size oldM = " <> show (DMap.size oldM) <> "; DMap.size newM = " <> show (DMap.size newM)
1875 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
1876 liftIO $ writeIORef (_merge_accumRef m) $! newM
2084 when (DMap.null oldM) $ do -- Only schedule the firing once
1877 when (DMap.null oldM) $ do -- Only schedule the firing once
2085 height <- liftIO $ readIORef $ _merge_heightRef m
1878 height <- liftIO $ readIORef $ _merge_heightRef m
2086− checkCycle subscribed
1879+ --TODO: assertions about height
2087−
1880+ currentHeight <- getCurrentHeight
1881+ when (height <= currentHeight) $ do
1882+ if height /= invalidHeight
1884+ myStack <- liftIO $ whoCreatedIORef undefined --TODO
1885+ error $ "Height (" ++ show height ++ ") is not greater than current height (" ++ show currentHeight ++ ")\n" ++ unlines (reverse myStack)
1888+ nodesInvolvedInCycle <- walkInvalidHeightParents $ eventSubscribedMerge subscribed
1889+ stacks <- forM nodesInvolvedInCycle $ \(Some es) -> whoCreatedEventSubscribed es
1890+ let cycleInfo = ":\n" <> drawForest (listsToForest stacks)
1894+ error $ "Causality loop found" <> cycleInfo
2088 scheduleMergeSelf m height
1895 scheduleMergeSelf m height
2089 , subscriberInvalidateHeight = \old -> do --TODO: When removing a parent doesn't actually change the height, maybe we can avoid invalidating
1896 , 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
1897 modifyIORef' (_merge_heightBagRef m) $ heightBagRemove old
@@ -2095,45 +1902,31 @@ mergeSubscriber subscribed m getKey = Subscriber
2097--TODO: Be able to run as much of this as possible promptly
1904--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
1905+updateMerge :: (HasSpiderTimeline x, GCompare k) => Merge x k v s -> MergeUpdateFunc k v x p s -> p -> SomeMergeUpdate x
2099−updateMerge subscribed m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
1906+updateMerge m updateFunc p = SomeMergeUpdate updateMe (invalidateMergeHeight m) (revalidateMergeHeight m)
2100 where updateMe = do
1907 where updateMe = do
2101 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
1908 oldParents <- liftIO $ readIORef $ _merge_parentsRef m
2102− (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber subscribed m) (_merge_heightBagRef m) oldParents p
1909+ (subscriptionsToKill, newParents) <- updateFunc (mergeSubscriber m) (_merge_heightBagRef m) oldParents p
2103 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
1910 liftIO $ writeIORef (_merge_parentsRef m) $! newParents
2104 return subscriptionsToKill
1911 return subscriptionsToKill
2106{-# INLINE mergeGCheap' #-}
1913{-# INLINE mergeGCheap' #-}
2107mergeGCheap' :: forall k v x p s q. (HasSpiderTimeline x, GCompare k, PatchTarget p ~ DMap k q)
1914mergeGCheap' :: 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)
1915+ => MergeInitFunc k v q x s -> MergeUpdateFunc k v x p s -> MergeDestroyFunc k s -> Dynamic x p -> Event x (DMap k v)
2109−mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
1916+mergeGCheap' getInitialSubscribers updateFunc destroy d = Event $ \sub -> do
2110 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1917 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2111 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
1918 accumRef <- liftIO $ newIORef $ error "merge: accumRef not yet initialized"
2112 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
1919 heightRef <- liftIO $ newIORef $ error "merge: heightRef not yet initialized"
2113 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
1920 heightBagRef <- liftIO $ newIORef $ error "merge: heightBagRef not yet initialized"
2114 parentsRef :: IORef (DMap k s) <- liftIO $ newIORef $ error "merge: parentsRef not yet initialized"
1921 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
1922+ let m = Merge
2130 { _merge_parentsRef = parentsRef
1923 { _merge_parentsRef = parentsRef
2131 , _merge_heightBagRef = heightBagRef
1924 , _merge_heightBagRef = heightBagRef
2132 , _merge_heightRef = heightRef
1925 , _merge_heightRef = heightRef
2133 , _merge_sub = sub
1926 , _merge_sub = sub
2134 , _merge_accumRef = accumRef
1927 , _merge_accumRef = accumRef
2136− (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber subscribed m
1929+ (dm, heights, initialParentState) <- getInitialSubscribers initialParents $ mergeSubscriber m
2137 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
1930 let myHeightBag = heightBagFromList $ filter (/= invalidHeight) heights
2138 myHeight = if invalidHeight `elem` heights
1931 myHeight = if invalidHeight `elem` heights
2139 then invalidHeight
1932 then invalidHeight
@@ -2142,57 +1935,50 @@ mergeGCheap' getParent getInitialSubscribers updateFunc destroy d = Event $ \sub
2142 let (occ, accum) = if currentHeight >= myHeight -- If we should have fired by now
1935 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)
1936 then (if DMap.null dm then Nothing else Just dm, DMap.empty)
2144 else (Nothing, dm)
1937 else (Nothing, dm)
1938+ unless (DMap.null accum) $ do
2145− unless (DMap.null accum) $ scheduleMergeSelf m myHeight
1939+ scheduleMergeSelf m myHeight
2146 liftIO $ writeIORef accumRef $! accum
1940 liftIO $ writeIORef accumRef $! accum
2147 liftIO $ writeIORef heightRef $! myHeight
1941 liftIO $ writeIORef heightRef $! myHeight
2148 liftIO $ writeIORef heightBagRef $! myHeightBag
1942 liftIO $ writeIORef heightBagRef $! myHeightBag
1943+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2149 liftIO $ writeIORef parentsRef $! initialParentState
1944 liftIO $ writeIORef parentsRef $! initialParentState
2150 defer $ SomeMergeInit $ do
1945 defer $ SomeMergeInit $ do
2151− let changeSubscriber = Subscriber
1946+ let s = Subscriber
2152 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
1947 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2153− tracePropagate (Proxy :: Proxy x) "SubscriberMerge/Change"
1948+ tracePropagate (Proxy :: Proxy x) $ "SubscriberMerge/Change"
2154− defer $ updateMerge subscribed m updateFunc a
1949+ defer $ updateMerge m updateFunc a
2155 , subscriberInvalidateHeight = \_ -> return ()
1950 , subscriberInvalidateHeight = \_ -> return ()
2156 , subscriberRecalculateHeight = \_ -> return ()
1951 , subscriberRecalculateHeight = \_ -> return ()
2158− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
1953+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2159− forM_ change $ \c -> defer $ updateMerge subscribed m updateFunc c
1954+ forM_ change $ \c -> defer $ updateMerge m updateFunc c
2160 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
1955 -- 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
1956 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2162 -- its subscription.
1957 -- its subscription.
2163− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
1958+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2164 let unsubscribeAll = destroy =<< readIORef parentsRef
1959 let unsubscribeAll = destroy =<< readIORef parentsRef
1960+ 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)
1964+mergeInt :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2170mergeInt = cacheEvent . mergeIntCheap
1965mergeInt = cacheEvent . mergeIntCheap
2172{-# INLINABLE mergeIntCheap #-}
1967{-# INLINABLE mergeIntCheap #-}
2173−mergeIntCheap :: forall x a. (HasSpiderTimeline x) => DynamicS x (PatchIntMap (Event x a)) -> Event x (IntMap a)
1968+mergeIntCheap :: forall x a. (HasSpiderTimeline x) => Dynamic x (PatchIntMap (Event x a)) -> Event x (IntMap a)
2174mergeIntCheap d = Event $ \sub -> do
1969mergeIntCheap d = Event $ \sub -> do
2175 initialParents <- readBehaviorUntracked $ dynamicCurrent d
1970 initialParents <- readBehaviorUntracked $ dynamicCurrent d
2176 accum <- liftIO $ FastMutableIntMap.newEmpty
1971 accum <- liftIO $ FastMutableIntMap.newEmpty
2177 heightRef <- liftIO $ newIORef zeroHeight
1972 heightRef <- liftIO $ newIORef zeroHeight
2178 heightBagRef <- liftIO $ newIORef heightBagEmpty
1973 heightBagRef <- liftIO $ newIORef heightBagEmpty
2179 parents <- liftIO $ FastMutableIntMap.newEmpty
1974 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
1975 let scheduleSelf = do
2191 height <- liftIO $ readIORef $ heightRef
1976 height <- liftIO $ readIORef $ heightRef
2192 scheduleMerge' height heightRef $ do
1977 scheduleMerge' height heightRef $ do
2193 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
1978 vals <- liftIO $ FastMutableIntMap.getFrozenAndClear accum
2194 subscriberPropagate sub vals
1979 subscriberPropagate sub vals
1980+ invalidateMyHeight = do
2195− invalidateMyHeight = invalidateMergeHeight' heightRef sub
1981+ invalidateMergeHeight' heightRef sub
2196 recalculateMyHeight = do
1982 recalculateMyHeight = do
2197 currentHeight <- readIORef heightRef
1983 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?
1984 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 +1988,12 @@ mergeIntCheap d = Event $ \sub -> do
2202 LT -> return ()
1988 LT -> return ()
2203 EQ -> do
1989 EQ -> do
2204 let height = succHeight $ heightBagMax heights
1990 let height = succHeight $ heightBagMax heights
2205− traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1991+ when debugInvalidateHeight $ putStrLn $ "recalculateSubscriberHeight: height: " <> show height
2206 writeIORef heightRef $! height
1992 writeIORef heightRef $! height
2207 subscriberRecalculateHeight sub height
1993 subscriberRecalculateHeight sub height
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
1994 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2209 mySubscriber k = Subscriber
1995 mySubscriber k = Subscriber
2210 { subscriberPropagate = \a -> do
1996 { subscriberPropagate = \a -> do
2211− checkCycle subscribed
2213 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
1997 wasEmpty <- liftIO $ FastMutableIntMap.isEmpty accum
2214 liftIO $ FastMutableIntMap.insert accum k a
1998 liftIO $ FastMutableIntMap.insert accum k a
2215 when wasEmpty scheduleSelf
1999 when wasEmpty scheduleSelf
@@ -2243,6 +2027,7 @@ mergeIntCheap d = Event $ \sub -> do
2243 else liftIO $ Just <$> FastMutableIntMap.getFrozenAndClear accum
2027 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
2028 else do when (not isEmpty) scheduleSelf -- We have things accumulated, but we shouldn't have fired them yet
2245 return Nothing
2029 return Nothing
2030+ changeSubdRef <- liftIO $ newIORef $ error "getMergeSubscribed: changeSubdRef not yet initialized"
2246 defer $ SomeMergeInit $ do
2031 defer $ SomeMergeInit $ do
2247 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
2032 let updateMe a = SomeMergeUpdate u invalidateMyHeight recalculateMyHeight
@@ -2256,27 +2041,25 @@ mergeIntCheap d = Event $ \sub -> do
2256 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2041 oldParents <- liftIO $ FastMutableIntMap.applyPatch parents newSubscriptions
2257 liftIO $ for_ oldParents $ \oldParent -> do
2042 liftIO $ for_ oldParents $ \oldParent -> do
2258 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2043 oldParentHeight <- getEventSubscribedHeight $ _eventSubscription_subscribed oldParent
2260− print ("updateMe", oldParentHeight)
2261 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2044 modifyIORef' heightBagRef $ heightBagRemove oldParentHeight
2262 return $ IntMap.elems oldParents
2045 return $ IntMap.elems oldParents
2263− let changeSubscriber = Subscriber
2046+ let s = Subscriber
2264 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2047 { subscriberPropagate = \a -> {-# SCC "traverseMergeChange" #-} do
2265 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2048 tracePropagate (Proxy :: Proxy x) $ "SubscriberMergeInt/Change"
2266 defer $ updateMe a
2049 defer $ updateMe a
2267 , subscriberInvalidateHeight = \_ -> return ()
2050 , subscriberInvalidateHeight = \_ -> return ()
2268 , subscriberRecalculateHeight = \_ -> return ()
2051 , subscriberRecalculateHeight = \_ -> return ()
2270− (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) changeSubscriber
2053+ (changeSubscription, change) <- subscribeAndRead (dynamicUpdated d) s
2271 forM_ change $ \c -> defer $ updateMe c
2054 forM_ change $ \c -> defer $ updateMe c
2272 -- We explicitly hold on to the unsubscribe function from subscribing to the update event.
2055 -- 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
2056 -- If we don't do this, there are certain cases where mergeCheap will fail to properly retain
2274 -- its subscription.
2057 -- its subscription.
2275− liftIO $ writeIORef changeSubdRef (changeSubscriber, changeSubscription)
2058+ liftIO $ writeIORef changeSubdRef (s, changeSubscription)
2276 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2059 let unsubscribeAll = traverse_ unsubscribe =<< FastMutableIntMap.getFrozenAndClear parents
2279− return (EventSubscription unsubscribeAll subscribed, occ)
2060+ return ( EventSubscription unsubscribeAll $ EventSubscribed heightRef $ toAny (parents, changeSubdRef)
2281newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2064newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2282newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
2065newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
@@ -2342,7 +2125,7 @@ clearEventEnv (EventEnv toAssignRef holdInitRef dynInitRef mergeUpdateRef mergeI
2342-- | Run an event action outside of a frame
2125-- | 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
2126runFrame :: forall x a. HasSpiderTimeline x => EventM x a -> SpiderHost x a --TODO: This function also needs to hold the mutex
2344runFrame a = SpiderHost $ do
2127runFrame a = SpiderHost $ do
2345− let env = _spiderTimeline_eventEnv $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
2128+ let env = _spiderTimeline_eventEnv (spiderTimeline :: SpiderTimelineEnv x)
2346 let go = do
2129 let go = do
2347 result <- a
2130 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
2131 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 +2142,19 @@ runFrame a = SpiderHost $ do
2359 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2142 coincidenceInfos <- readIORef $ eventEnvResetCoincidences env
2360 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2143 forM_ toAssign $ \(SomeAssignment vRef iRef v) -> {-# SCC "assignment" #-} do
2361 writeIORef vRef v
2144 writeIORef vRef v
2362− traceInvalidate $ "Invalidating Hold"
2145+ when debugInvalidate $ putStrLn $ "Invalidating Hold"
2363 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2146 writeIORef iRef =<< evaluate =<< invalidate toReconnectRef =<< readIORef iRef
2364 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2147 mergeUpdates <- readIORef $ eventEnvMergeUpdates env
2365 writeIORef (eventEnvMergeUpdates env) []
2148 writeIORef (eventEnvMergeUpdates env) []
2366− tracePropagate (Proxy::Proxy x) $ "Updating merges"
2149+ when debugPropagate $ putStrLn "Updating merges"
2367 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2150 mergeSubscriptionsToKill <- runEventM $ concat <$> mapM _someMergeUpdate_update mergeUpdates
2368− tracePropagate (Proxy::Proxy x) $ "Updating merges done"
2151+ when debugPropagate $ putStrLn "Updating merges done"
2369 toReconnect <- readIORef toReconnectRef
2152 toReconnect <- readIORef toReconnectRef
2370 clearEventEnv env
2153 clearEventEnv env
2371 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2154 switchSubscriptionsToKill <- forM toReconnect $ \(SomeSwitchSubscribed subscribed) -> {-# SCC "switchSubscribed" #-} do
2372 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2155 oldSubscription <- readIORef $ switchSubscribedCurrentParent subscribed
2373 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2156 wi <- readIORef $ switchSubscribedOwnWeakInvalidator subscribed
2374− traceInvalidate $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2157+ when debugInvalidate $ putStrLn $ "Finalizing invalidator for Switch" <> showNodeId subscribed
2375 finalize wi
2158 finalize wi
2376 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2159 i <- evaluate $ switchSubscribedOwnInvalidator subscribed
2377 wi' <- mkWeakPtrWithDebug i "wi'"
2160 wi' <- mkWeakPtrWithDebug i "wi'"
@@ -2385,7 +2168,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
2168 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)
2170 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2388− liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2171+ liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2389 EventRoot _ -> "EventRoot"
2172 EventRoot _ -> "EventRoot"
2390 EventNever -> "EventNever"
2173 EventNever -> "EventNever"
2391 _ -> "something else"
2174 _ -> "something else"
@@ -2400,7 +2183,7 @@ runFrame a = SpiderHost $ do
2400 myHeight <- readIORef $ switchSubscribedHeight subscribed
2183 myHeight <- readIORef $ switchSubscribedHeight subscribed
2401 when (parentHeight /= myHeight) $ do
2184 when (parentHeight /= myHeight) $ do
2402 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2185 writeIORef (switchSubscribedHeight subscribed) $! invalidHeight
2403− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ invalidateSubscriberHeight myHeight
2186+ 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
2187 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
2188 forM_ coincidenceInfos $ \(SomeResetCoincidence subscription mcs) -> do
2406 unsubscribe subscription
2189 unsubscribe subscription
@@ -2441,7 +2224,7 @@ invalidateCoincidenceHeight subscribed = do
2441 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2224 oldHeight <- readIORef $ coincidenceSubscribedHeight subscribed
2442 when (oldHeight /= invalidHeight) $ do
2225 when (oldHeight /= invalidHeight) $ do
2443 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2226 writeIORef (coincidenceSubscribedHeight subscribed) $! invalidHeight
2444− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2227+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ invalidateSubscriberHeight oldHeight
2446updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2229updateSwitchHeight :: Height -> SwitchSubscribed x a -> IO ()
2447updateSwitchHeight new subscribed = do
2230updateSwitchHeight new subscribed = do
@@ -2449,7 +2232,7 @@ updateSwitchHeight new subscribed = do
2449 when (oldHeight == invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2232 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
2233 when (new /= invalidHeight) $ do --TODO: This 'when' should probably be an assertion
2451 writeIORef (switchSubscribedHeight subscribed) $! new
2234 writeIORef (switchSubscribedHeight subscribed) $! new
2452− WeakBag.traverse_ (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2235+ WeakBag.traverse (switchSubscribedSubscribers subscribed) $ recalculateSubscriberHeight new
2454recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2237recalculateCoincidenceHeight :: CoincidenceSubscribed x a -> IO ()
2455recalculateCoincidenceHeight subscribed = do
2238recalculateCoincidenceHeight subscribed = do
@@ -2458,7 +2241,7 @@ recalculateCoincidenceHeight subscribed = do
2458 height <- calculateCoincidenceHeight subscribed
2241 height <- calculateCoincidenceHeight subscribed
2459 when (height /= invalidHeight) $ do
2242 when (height /= invalidHeight) $ do
2460 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2243 writeIORef (coincidenceSubscribedHeight subscribed) $! height
2461− WeakBag.traverse_ (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2244+ WeakBag.traverse (coincidenceSubscribedSubscribers subscribed) $ recalculateSubscriberHeight height
2463calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2246calculateSwitchHeight :: SwitchSubscribed x a -> IO Height
2464calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
2247calculateSwitchHeight subscribed = getEventSubscribedHeight . _eventSubscription_subscribed =<< readIORef (switchSubscribedCurrentParent subscribed)
@@ -2520,8 +2303,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2520 {-# INLINABLE headE #-}
2303 {-# INLINABLE headE #-}
2521 headE = R.slowHeadE
2304 headE = R.slowHeadE
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2305-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2307instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527 {-# INLINABLE sample #-}
2308 {-# INLINABLE sample #-}
@@ -2543,9 +2324,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2543 {-# INLINABLE headE #-}
2324 {-# INLINABLE headE #-}
2544 headE = R.slowHeadE
2325 headE = R.slowHeadE
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2326-- 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
2328instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
2329 {-# INLINE return #-}
@@ -2554,13 +2332,11 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2332 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2555 {-# INLINE (>>) #-}
2333 {-# INLINE (>>) #-}
2556 (>>) = (*>)
2334 (>>) = (*>)
2557−#if !MIN_VERSION_base(4,13,0)
2558 {-# INLINE fail #-}
2335 {-# INLINE fail #-}
2559 fail _ = error "Dynamic does not support 'fail'"
2336 fail _ = error "Dynamic does not support 'fail'"
2562{-# INLINABLE newJoinDyn #-}
2338{-# INLINABLE newJoinDyn #-}
2563−newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2339+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 =
2340newJoinDyn d =
2565 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2341 let readV0 = readBehaviorTracked . dynamicCurrent =<< readBehaviorTracked (dynamicCurrent d)
2566 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
2342 eOuter = Reflex.Spider.Internal.push (fmap (Just . Identity) . readBehaviorUntracked . dynamicCurrent . runIdentity) $ dynamicUpdated d
@@ -2609,9 +2385,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2385 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610 {-# INLINABLE headE #-}
2386 {-# INLINABLE headE #-}
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2387 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
2389instance 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
2390 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2401,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2628 {-# INLINABLE headE #-}
2401 {-# INLINABLE headE #-}
2629 headE = R.slowHeadE
2402 headE = R.slowHeadE
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2403-- 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
2405instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2406 {-# INLINABLE sample #-}
@@ -2650,8 +2421,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2421 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651 {-# INLINABLE headE #-}
2422 {-# INLINABLE headE #-}
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2423 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2656--------------------------------------------------------------------------------
2425--------------------------------------------------------------------------------
2657-- Deprecated items
2426-- Deprecated items
@@ -2689,13 +2458,13 @@ instance HasSpiderTimeline x => Reflex.Host.Class.MonadReadEvent (SpiderTimeline
2690 return result
2459 return result
2692−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2461+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHost x) where
2693 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2462 newEventWithTrigger = SpiderHost . fmap SpiderEvent . newEventWithTriggerIO
2694 newFanEventWithTrigger f = SpiderHost $ do
2463 newFanEventWithTrigger f = SpiderHost $ do
2695 es <- newFanEventWithTriggerIO f
2464 es <- newFanEventWithTriggerIO f
2696 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2465 return $ Reflex.Class.EventSelector $ SpiderEvent . Reflex.Spider.Internal.select es
2698−instance HasSpiderTimeline x => Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2467+instance Reflex.Host.Class.MonadReflexCreateTrigger (SpiderTimeline x) (SpiderHostFrame x) where
2699 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2468 newEventWithTrigger = SpiderHostFrame . EventM . liftIO . fmap SpiderEvent . newEventWithTriggerIO
2700 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2469 newFanEventWithTrigger f = SpiderHostFrame $ EventM $ liftIO $ do
2701 es <- newFanEventWithTriggerIO f
2470 es <- newFanEventWithTriggerIO f
@@ -2717,7 +2486,7 @@ unsafeNewSpiderTimelineEnv = do
2717#ifdef DEBUG
2486#ifdef DEBUG
2718 depthRef <- newIORef 0
2487 depthRef <- newIORef 0
2720− return $ STE $ SpiderTimelineEnv
2489+ return $ SpiderTimelineEnv
2721 { _spiderTimeline_lock = lock
2490 { _spiderTimeline_lock = lock
2722 , _spiderTimeline_eventEnv = env
2491 , _spiderTimeline_eventEnv = env
2723#ifdef DEBUG
2492#ifdef DEBUG
@@ -2733,13 +2502,13 @@ data LocalSpiderTimeline (x :: Type) s
2734instance Reifies s (SpiderTimelineEnv x) =>
2503instance Reifies s (SpiderTimelineEnv x) =>
2735 HasSpiderTimeline (LocalSpiderTimeline x s) where
2504 HasSpiderTimeline (LocalSpiderTimeline x s) where
2736− spiderTimeline = localSpiderTimeline Proxy $ reflect (Proxy :: Proxy s)
2505+ spiderTimeline = localSpiderTimeline (Proxy :: Proxy s) $ reflect (Proxy :: Proxy s)
2738localSpiderTimeline
2507localSpiderTimeline
2739− :: proxy s
2508+ :: Proxy s
2740 -> SpiderTimelineEnv x
2509 -> SpiderTimelineEnv x
2741 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2510 -> SpiderTimelineEnv (LocalSpiderTimeline x s)
2742−localSpiderTimeline _ = coerce
2511+localSpiderTimeline _ = unsafeCoerce
2744-- | Pass a new timeline to the given function.
2513-- | Pass a new timeline to the given function.
2745withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
2514withSpiderTimeline :: (forall x. HasSpiderTimeline x => SpiderTimelineEnv x -> IO r) -> IO r
@@ -2757,8 +2526,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2757 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2526 {-# SPECIALIZE instance R.Reflex (SpiderTimeline Global) #-}
2758 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2527 newtype Behavior (SpiderTimeline x) a = SpiderBehavior { unSpiderBehavior :: Behavior x a }
2759 newtype Event (SpiderTimeline x) a = SpiderEvent { unSpiderEvent :: Event x a }
2528 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)
2529+ 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 }
2530+ newtype Incremental (SpiderTimeline x) p = SpiderIncremental { unSpiderIncremental :: Dynamic x p }
2762 type PullM (SpiderTimeline x) = SpiderPullM x
2531 type PullM (SpiderTimeline x) = SpiderPullM x
2763 type PushM (SpiderTimeline x) = SpiderPushM x
2532 type PushM (SpiderTimeline x) = SpiderPushM x
2764 {-# INLINABLE never #-}
2533 {-# INLINABLE never #-}
@@ -2775,7 +2544,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2544 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776 {-# INLINABLE mergeG #-}
2545 {-# INLINABLE mergeG #-}
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2547+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2548 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780 -> DMap k q
2549 -> DMap k q
2781 -> R.Event (SpiderTimeline x) (DMap k v)
2550 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2787,7 +2556,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2787 {-# INLINABLE current #-}
2556 {-# INLINABLE current #-}
2788 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2557 current = SpiderBehavior . dynamicCurrent . unSpiderDynamic
2789 {-# INLINABLE updated #-}
2558 {-# INLINABLE updated #-}
2790− updated = SpiderEvent #. dynamicUpdated .# fmap coerce . unSpiderDynamic
2559+ updated = coerce $ SpiderEvent . dynamicUpdated . unSpiderDynamic
2791 {-# INLINABLE unsafeBuildDynamic #-}
2560 {-# INLINABLE unsafeBuildDynamic #-}
2792 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2561 unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeBuildDynamic (coerce readV0) $ coerce $ unSpiderEvent v'
2793 {-# INLINABLE unsafeBuildIncremental #-}
2562 {-# INLINABLE unsafeBuildIncremental #-}
@@ -2806,10 +2575,9 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2806 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2575 return $ Identity <$> apply p c --TODO: Avoid the redundant 'apply'
2807 eventCoercion Coercion = Coercion
2576 eventCoercion Coercion = Coercion
2808 behaviorCoercion Coercion = Coercion
2577 behaviorCoercion Coercion = Coercion
2809− dynamicCoercion Coercion = Coercion
2578+ 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 #-}
2579 {-# INLINABLE mergeIntIncremental #-}
2812− mergeIntIncremental = SpiderEvent . mergeInt . coerce
2580+ mergeIntIncremental = SpiderEvent . mergeInt . (unsafeCoerce :: Dynamic x (PatchIntMap (R.Event (SpiderTimeline x) a)) -> Dynamic x (PatchIntMap (Event x a))) . unSpiderIncremental
2813 {-# INLINABLE fanInt #-}
2581 {-# INLINABLE fanInt #-}
2814 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
2582 fanInt e = R.EventSelectorInt $ SpiderEvent . selectInt (fanInt (unSpiderEvent e))
@@ -2843,14 +2611,8 @@ instance Monad (SpiderHost x) where
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2611 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2844 {-# INLINABLE return #-}
2612 {-# INLINABLE return #-}
2845 return x = SpiderHost $ return x
2613 return x = SpiderHost $ return x
2846−#if !MIN_VERSION_base(4,13,0)
2847 {-# INLINABLE fail #-}
2614 {-# INLINABLE fail #-}
2848− fail = MonadFail.fail
2851−instance MonadFail (SpiderHost x) where
2852− {-# INLINABLE fail #-}
2853− fail s = SpiderHost $ MonadFail.fail s
2615+ fail s = SpiderHost $ fail s
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2617-- | Run an action affecting the global Spider timeline; this will be guarded by
2856-- a mutex for that timeline
2618-- a mutex for that timeline
@@ -2872,21 +2634,19 @@ instance Monad (SpiderHostFrame x) where
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2634 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2873 {-# INLINABLE return #-}
2635 {-# INLINABLE return #-}
2874 return x = SpiderHostFrame $ return x
2636 return x = SpiderHostFrame $ return x
2875−#if !MIN_VERSION_base(4,13,0)
2876 {-# INLINABLE fail #-}
2637 {-# INLINABLE fail #-}
2877 fail s = SpiderHostFrame $ fail s
2638 fail s = SpiderHostFrame $ fail s
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2640instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2881 notReadyUntil _ = pure ()
2641 notReadyUntil _ = pure ()
2882 notReady = pure ()
2642 notReady = pure ()
2884−newEventWithTriggerIO :: forall x a. HasSpiderTimeline x => (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2644+newEventWithTriggerIO :: (RootTrigger x a -> IO (IO ())) -> IO (Event x a)
2885newEventWithTriggerIO f = do
2645newEventWithTriggerIO f = do
2886 es <- newFanEventWithTriggerIO $ \Refl -> f
2646 es <- newFanEventWithTriggerIO $ \Refl -> f
2887 return $ select es Refl
2647 return $ select es Refl
2889−newFanEventWithTriggerIO :: (HasSpiderTimeline x, GCompare k) => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2649+newFanEventWithTriggerIO :: GCompare k => (forall a. k a -> RootTrigger x a -> IO (IO ())) -> IO (EventSelector x k)
2890newFanEventWithTriggerIO f = do
2650newFanEventWithTriggerIO f = do
2891 occRef <- newIORef DMap.empty
2651 occRef <- newIORef DMap.empty
2892 subscribedRef <- newIORef DMap.empty
2652 subscribedRef <- newIORef DMap.empty
@@ -2920,11 +2680,3 @@ instance MonadAtomicRef (SpiderHostFrame x) where
2920instance PrimMonad (SpiderHostFrame x) where
2680instance PrimMonad (SpiderHostFrame x) where
2921 type PrimState (SpiderHostFrame x) = PrimState IO
2681 type PrimState (SpiderHostFrame x) = PrimState IO
2922 primitive = SpiderHostFrame . EventM . primitive
2682 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 ()