git.iko.soy/reflex
on develop help sign in
Eliminate some more traces
06337b7Ryan Trinkle
src/Reflex/PerformEvent/Base.hs+4−13
compare with develop
unifiedsplit
@@ -53,8 +53,6 @@ import Data.Sequence (Seq)
53import Data.Tuple
53import Data.Tuple
54import qualified Data.TagMap as TagMap
54import qualified Data.TagMap as TagMap
55
55
56−import Debug.Trace
57−
58-- | A function that fires events for the given 'EventTrigger's and then runs
56-- | A function that fires events for the given 'EventTrigger's and then runs
59-- any followup actions provided via 'PerformEvent'. The given 'ReadPhase'
57-- any followup actions provided via 'PerformEvent'. The given 'ReadPhase'
60-- action will be run once for the initial trigger execution as well as once for
58-- action will be run once for the initial trigger execution as well as once for
@@ -185,8 +183,8 @@ hostPerformEventT :: forall t m a.
185 -> m (a, FireCommand t m)
183 -> m (a, FireCommand t m)
186hostPerformEventT a = do
184hostPerformEventT a = do
187 (response, responseTrigger) <- newEventWithTriggerRef
185 (response, responseTrigger) <- newEventWithTriggerRef
188− (result, eventToPerform) <- runHostFrame $ runRequesterT (unPerformEventT a) $ traceEventWith (const "response") response
186+ (result, eventToPerform) <- runHostFrame $ runRequesterT (unPerformEventT a) response
189− eventToPerformHandle <- subscribeEvent $ traceEventWith (const "eventToPerform") eventToPerform
187+ eventToPerformHandle <- subscribeEvent eventToPerform
190 return $ (,) result $ FireCommand $ \triggers (readPhase :: ReadPhase m a') -> do
188 return $ (,) result $ FireCommand $ \triggers (readPhase :: ReadPhase m a') -> do
191 let go :: [DSum (EventTrigger t) Identity] -> m [a']
189 let go :: [DSum (EventTrigger t) Identity] -> m [a']
192 go ts = do
190 go ts = do
@@ -197,20 +195,13 @@ hostPerformEventT a = do
197 case mToPerform of
195 case mToPerform of
198 Nothing -> return [result']
196 Nothing -> return [result']
199 Just toPerform -> do
197 Just toPerform -> do
200− traceM $ "toPerform: " <> case toPerform of
201− RequestData _ reqs -> show (length reqs)
202 responses <- runHostFrame $ traverseRequesterData (Identity <$>) toPerform
198 responses <- runHostFrame $ traverseRequesterData (Identity <$>) toPerform
203 let responseLength = case responses of
199 let responseLength = case responses of
204 ResponseData _ m -> TagMap.size m
200 ResponseData _ m -> TagMap.size m
205− traceM $ "responses: " <> show responseLength
206 mrt <- readRef responseTrigger
201 mrt <- readRef responseTrigger
207 let followupEventTriggers = case mrt of
202 let followupEventTriggers = case mrt of
208− Just rt -> do
209− traceM "a"
210− [rt :=> Identity responses]
203+ Just rt -> [rt :=> Identity responses]
211− Nothing -> do
204+ Nothing -> []
212− traceM "b"
213− []
214 (result':) <$> go followupEventTriggers
205 (result':) <$> go followupEventTriggers
215 go triggers
206 go triggers
216
207
src/Reflex/Requester/Base/Internal.hs+1−1
@@ -93,7 +93,7 @@ runRequesterT (RequesterT a) wrappedResponses = withRequesterInternalT $ \(reque
93 result <- a
93 result <- a
94 let responses = fforMaybe wrappedResponses $ \(ResponseData tg' m) -> case tg `geq` tg' of
94 let responses = fforMaybe wrappedResponses $ \(ResponseData tg' m) -> case tg `geq` tg' of
95 Nothing -> trace ("runRequesterT: bad TagGen: expected " <> show tg <> " but got " <> show tg') Nothing --TODO: Warn somehow
95 Nothing -> trace ("runRequesterT: bad TagGen: expected " <> show tg <> " but got " <> show tg') Nothing --TODO: Warn somehow
96− Just Refl -> trace "runRequesterT: good TagGen" $ Just m
96+ Just Refl -> Just m
97 pure (responses, (result, fmapCheap (RequestData tg) requests))
97 pure (responses, (result, fmapCheap (RequestData tg) requests))
98
98
99instance MonadTrans (RequesterInternalT s t request response) where
99instance MonadTrans (RequesterInternalT s t request response) where
src/Reflex/Spider/Internal.hs+1−4
@@ -106,8 +106,6 @@ import qualified Data.ByteString.Char8 as BS8
106import System.IO (stderr)
106import System.IO (stderr)
107#endif
107#endif
108
108
109−import Debug.Trace
110−
111#ifdef DEBUG_TRACE_EVENTS
109#ifdef DEBUG_TRACE_EVENTS
112
110
113withStackOneLine :: (BS8.ByteString -> a) -> a
111withStackOneLine :: (BS8.ByteString -> a) -> a
@@ -1515,14 +1513,13 @@ newFanInt = do
1515fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1513fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
1516fanInt p = unsafePerformIO $ do
1514fanInt p = unsafePerformIO $ do
1517 self <- newFanInt
1515 self <- newFanInt
1518− pure $ EventSelectorInt $ \k -> trace ("select " <> show k) $ Event $ \sub -> do
1516+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
1519 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1517 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
1520 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1518 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
1521 (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1519 (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
1522 { subscriberPropagate = \m -> do
1520 { subscriberPropagate = \m -> do
1523 liftIO $ writeIORef (_fanInt_occRef self) m
1521 liftIO $ writeIORef (_fanInt_occRef self) m
1524 scheduleIntClear $ _fanInt_occRef self
1522 scheduleIntClear $ _fanInt_occRef self
1525− liftIO $ putStrLn $ "Pushing " <> show (IntMap.size m) <> " occurrences"
1526 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1523 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
1527 FastWeakBag.traverse b $ \s -> do
1524 FastWeakBag.traverse b $ \s -> do
1528 subscriberPropagate s v
1525 subscriberPropagate s v