on develop help sign in
Eliminate some more traces
commit06337b75911712b2a76ada378b842ad0a158eec5 authorRyan Trinkle <ryan.trinkle@gmail.com> dateFri 20 Sep 2019, 09:48 (7 years ago) parent3c419d9
3 files changed+6−18
src/Reflex/PerformEvent/Base.hs+4−13 src/Reflex/Requester/Base/Internal.hs+1−1 src/Reflex/Spider/Internal.hs+1−4
src/Reflex/PerformEvent/Base.hs+4−13
@@ -53,8 +53,6 @@ import Data.Sequence (Seq)
5353import Data.Tuple
5454import qualified Data.TagMap as TagMap
5555
56−import Debug.Trace
57−
5856-- | A function that fires events for the given 'EventTrigger's and then runs
5957-- any followup actions provided via 'PerformEvent'. The given 'ReadPhase'
6058-- action will be run once for the initial trigger execution as well as once for
@@ -185,8 +183,8 @@ hostPerformEventT :: forall t m a.
185183 -> m (a, FireCommand t m)
186184hostPerformEventT a = do
187185 (response, responseTrigger) <- newEventWithTriggerRef
188− (result, eventToPerform) <- runHostFrame $ runRequesterT (unPerformEventT a) $ traceEventWith (const "response") response
189− eventToPerformHandle <- subscribeEvent $ traceEventWith (const "eventToPerform") eventToPerform
186+ (result, eventToPerform) <- runHostFrame $ runRequesterT (unPerformEventT a) response
187+ eventToPerformHandle <- subscribeEvent eventToPerform
190188 return $ (,) result $ FireCommand $ \triggers (readPhase :: ReadPhase m a') -> do
191189 let go :: [DSum (EventTrigger t) Identity] -> m [a']
192190 go ts = do
@@ -197,20 +195,13 @@ hostPerformEventT a = do
197195 case mToPerform of
198196 Nothing -> return [result']
199197 Just toPerform -> do
200− traceM $ "toPerform: " <> case toPerform of
201− RequestData _ reqs -> show (length reqs)
202198 responses <- runHostFrame $ traverseRequesterData (Identity <$>) toPerform
203199 let responseLength = case responses of
204200 ResponseData _ m -> TagMap.size m
205− traceM $ "responses: " <> show responseLength
206201 mrt <- readRef responseTrigger
207202 let followupEventTriggers = case mrt of
208− Just rt -> do
209− traceM "a"
210− [rt :=> Identity responses]
211− Nothing -> do
212− traceM "b"
213− []
203+ Just rt -> [rt :=> Identity responses]
204+ Nothing -> []
214205 (result':) <$> go followupEventTriggers
215206 go triggers
216207
src/Reflex/Requester/Base/Internal.hs+1−1
@@ -93,7 +93,7 @@ runRequesterT (RequesterT a) wrappedResponses = withRequesterInternalT $ \(reque
9393 result <- a
9494 let responses = fforMaybe wrappedResponses $ \(ResponseData tg' m) -> case tg `geq` tg' of
9595 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
9797 pure (responses, (result, fmapCheap (RequestData tg) requests))
9898
9999instance 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
106106import System.IO (stderr)
107107#endif
108108
109−import Debug.Trace
110−
111109#ifdef DEBUG_TRACE_EVENTS
112110
113111withStackOneLine :: (BS8.ByteString -> a) -> a
@@ -1515,14 +1513,13 @@ newFanInt = do
15151513fanInt :: HasSpiderTimeline x => Event x (IntMap a) -> EventSelectorInt x a
15161514fanInt p = unsafePerformIO $ do
15171515 self <- newFanInt
1518− pure $ EventSelectorInt $ \k -> trace ("select " <> show k) $ Event $ \sub -> do
1516+ pure $ EventSelectorInt $ \k -> Event $ \sub -> do
15191517 isEmpty <- liftIO $ FastMutableIntMap.isEmpty (_fanInt_subscribers self)
15201518 when isEmpty $ do -- This is the first subscriber, so we need to subscribe to our input
15211519 (subscription, parentOcc) <- subscribeAndRead p $ Subscriber
15221520 { subscriberPropagate = \m -> do
15231521 liftIO $ writeIORef (_fanInt_occRef self) m
15241522 scheduleIntClear $ _fanInt_occRef self
1525− liftIO $ putStrLn $ "Pushing " <> show (IntMap.size m) <> " occurrences"
15261523 FastMutableIntMap.forIntersectionWithImmutable_ (_fanInt_subscribers self) m $ \b v -> do --TODO: Do we need to know that no subscribers are being added as we traverse?
15271524 FastWeakBag.traverse b $ \s -> do
15281525 subscriberPropagate s v