@@ -1,7 +1,6 @@
11-- | This module provides 'RequesterT', the standard implementation of
22-- 'Requester'.
33{-# LANGUAGE AllowAmbiguousTypes #-}
4−{-# LANGUAGE ApplicativeDo #-}
54{-# LANGUAGE CPP #-}
65{-# LANGUAGE EmptyDataDecls #-}
76{-# LANGUAGE ExistentialQuantification #-}
@@ -33,7 +32,6 @@ module Reflex.Requester.Base
3332 , requesterDataToList
3433 , singletonRequesterData
3534 , matchResponsesWithRequests
36− , matchResponseMapWithRequests
3735 , multiEntry
3836 , unMultiEntry
3937 , requesting'
@@ -58,7 +56,6 @@ import Control.Monad.Ref
5856import Control.Monad.State.Strict
5957import Data.Bits
6058import Data.Coerce
61−import Data.Constraint
6259import Data.Dependent.Map (DMap)
6360import qualified Data.Dependent.Map as DMap
6461import Data.Dependent.Sum (DSum (..))
@@ -84,51 +81,19 @@ newtype TagMap (f :: * -> *) = TagMap (IntMap Any)
8481
8582newtype RequesterData f = RequesterData (TagMap (Entry f))
8683
87−emptyRequesterData :: RequesterData f
88−emptyRequesterData = RequesterData $ TagMap IntMap.empty
89−
9084data RequesterDataKey a where
9185 RequesterDataKey_Single :: {-# UNPACK #-} !(MyTag (Single a)) -> RequesterDataKey a
9286 RequesterDataKey_Multi :: {-# UNPACK #-} !(MyTag Multi) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a --TODO: Don't put a second Int here (or in the other Multis); use a single Int instead
93− RequesterDataKey_Multi2 :: GCompare k => {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
87+ RequesterDataKey_Multi2 :: {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
9488 RequesterDataKey_Multi3 :: {-# UNPACK #-} !(MyTag Multi3) -> {-# UNPACK #-} !Int -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
9589
9690singletonRequesterData :: RequesterDataKey a -> f a -> RequesterData f
9791singletonRequesterData rdk v = case rdk of
9892 RequesterDataKey_Single k -> RequesterData $ singletonTagMap k $ Entry v
9993 RequesterDataKey_Multi k k' k'' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ singletonRequesterData k'' v
100− RequesterDataKey_Multi2 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ Multi2Contents
101− { _multi2Contents_values = Map.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
102− , _multi2Contents_dict = Dict
103− }
94+ RequesterDataKey_Multi2 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ Map.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
10495 RequesterDataKey_Multi3 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
10596
106−mergeRequesterData :: RequesterData f -> RequesterData f -> RequesterData f
107−mergeRequesterData (RequesterData a) (RequesterData b) = RequesterData $ mergeTagMap a b
108−
109−mergeTagMap :: forall f. TagMap (Entry f) -> TagMap (Entry f) -> TagMap (Entry f)
110−mergeTagMap (TagMap m) (TagMap n) =
111− TagMap $ IntMap.unionWithKey (g' combiner) m n
112− where
113− combiner :: forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a
114− combiner k (Entry a) (Entry b) = Entry $ case myKeyType k of
115− MyTagType_Single -> a
116− MyTagType_Multi -> IntMap.unionWith mergeRequesterData a b
117− MyTagType_Multi2 -> case _multi2Contents_dict a of
118− Dict -> Multi2Contents
119− { _multi2Contents_values = Map.unionWith (IntMap.unionWith mergeRequesterData) (_multi2Contents_values a) (_multi2Contents_values b)
120− , _multi2Contents_dict = Dict
121− }
122− MyTagType_Multi3 -> IntMap.unionWith (IntMap.unionWith mergeRequesterData) a b
123− g' :: (forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a) -> Int -> Any -> Any -> Any
124− g' f rawKey a b =
125− let k = MyTag rawKey :: MyTag a
126− fromAny :: Any -> Entry f a
127− fromAny = unsafeCoerce
128− toAny :: Entry f a -> Any
129− toAny = unsafeCoerce
130− in toAny $ f k (fromAny a) (fromAny b)
131−
13297requesterDataToList :: RequesterData f -> [DSum RequesterDataKey f]
13398requesterDataToList (RequesterData m) = do
13499 k :=> Entry e <- tagMapToList m
@@ -138,12 +103,11 @@ requesterDataToList (RequesterData m) = do
138103 (k', e') <- IntMap.toList e
139104 k'' :=> e'' <- requesterDataToList e'
140105 return $ RequesterDataKey_Multi k k' k'' :=> e''
141− MyTagType_Multi2 -> case _multi2Contents_dict e of
142− Dict -> do
143− (k', e') <- Map.toList $ _multi2Contents_values e
144− (k'', e'') <- IntMap.toList e'
145− k''' :=> e''' <- requesterDataToList e''
146− return $ RequesterDataKey_Multi2 k k' k'' k''' :=> e'''
106+ MyTagType_Multi2 -> do
107+ (k', e') <- Map.toList e
108+ (k'', e'') <- IntMap.toList e'
109+ k''' :=> e''' <- requesterDataToList e''
110+ return $ RequesterDataKey_Multi2 k k' k'' k''' :=> e'''
147111 MyTagType_Multi3 -> do
148112 (k', e') <- IntMap.toList e
149113 (k'', e'') <- IntMap.toList e'
@@ -171,13 +135,7 @@ traverseRequesterData f (RequesterData m) = RequesterData <$> traverseTagMapWith
171135 go k (Entry request) = Entry <$> case myKeyType k of
172136 MyTagType_Single -> f request
173137 MyTagType_Multi -> traverse (traverseRequesterData f) request
174− MyTagType_Multi2 -> case request of
175− Multi2Contents { _multi2Contents_values = request', _multi2Contents_dict = Dict } -> do
176− v <- traverse (traverse (traverseRequesterData f)) request'
177− pure $ Multi2Contents
178− { _multi2Contents_values = v
179− , _multi2Contents_dict = Dict
180− }
138+ MyTagType_Multi2 -> traverse (traverse (traverseRequesterData f)) request
181139 MyTagType_Multi3 -> traverse (traverse (traverseRequesterData f)) request
182140
183141-- | 'traverseRequesterData' with its arguments flipped
@@ -221,14 +179,9 @@ instance MyTagTypeOffset Multi3 where
221179type family EntryContents request a where
222180 EntryContents request (Single a) = request a
223181 EntryContents request Multi = IntMap (RequesterData request)
224− EntryContents request (Multi2 k) = Multi2Contents k request
182+ EntryContents request (Multi2 k) = Map (Some k) (IntMap (RequesterData request))
225183 EntryContents request Multi3 = IntMap (IntMap (RequesterData request))
226184
227−data Multi2Contents k request = Multi2Contents
228− { _multi2Contents_dict :: {-# UNPACK #-} !(Dict (GCompare k)) -- This is a Dict instead of an existential context because we only want to use it in certain circumstances
229− , _multi2Contents_values :: {-# UNPACK #-} !(Map (Some k) (IntMap (RequesterData request)))
230− }
231−
232185newtype Entry request x = Entry { unEntry :: EntryContents request x }
233186
234187{-# INLINE singleEntry #-}
@@ -357,7 +310,7 @@ tagRequest req = do
357310 return t
358311
359312{-# INLINE responseFromTag #-}
360−responseFromTag :: forall m t request response x. Monad m => MyTagWrap response (Entry response x) -> RequesterT t request response m (Event t (Entry response x))
313+responseFromTag :: Monad m => MyTagWrap response (Entry response x) -> RequesterT t request response m (Event t (Entry response x))
361314responseFromTag (MyTagWrap t) = do
362315 responses :: EventSelectorInt t Any <- RequesterT ask
363316 return $ (unsafeCoerce :: Event t Any -> Event t (Entry response x)) $ selectInt responses t
@@ -487,9 +440,9 @@ traverseDMapWithKeyWithAdjustRequesterTWith base mapPatch weakenPatchWith patchN
487440 let responses :: EventSelector t (Const2 (Some k) (IntMap (RequesterData response)))
488441 responses = fanMap $ fmapCheap unpack response
489442 unpack :: Entry response (Multi2 k) -> Map (Some k) (IntMap (RequesterData response))
490− unpack = _multi2Contents_values . unEntry
443+ unpack = unEntry
491444 pack :: Map (Some k) (IntMap (RequesterData request)) -> Entry request (Multi2 k)
492− pack m = Entry $ Multi2Contents { _multi2Contents_values = m, _multi2Contents_dict = Dict }
445+ pack = Entry
493446 f' :: forall a. k a -> Compose ((,) Int) v a -> m (Compose ((,) (Event t (IntMap (RequesterData request)))) v' a)
494447 f' k (Compose (n, v)) = do
495448 (result, myRequests) <- runRequesterT (f k v) $ mapMaybeCheap (IntMap.lookup n) $ select responses (Const2 (Some k))
@@ -510,30 +463,10 @@ traverseDMapWithKeyWithAdjustRequesterTWith base mapPatch weakenPatchWith patchN
510463data Decoder rawResponse response =
511464 forall a. Decoder (RequesterDataKey a) (rawResponse -> response a)
512465
513−matchResponsesWithRequests
514− :: forall t rawRequest rawResponse request response m.
515− ( MonadFix m
516− , MonadHold t m
517− , Reflex t
518− )
519− => (forall a. request a -> (rawRequest, rawResponse -> response a))
520− -- ^ Given a request (from 'Requester'), produces the wire format of the
521− -- request and a function used to process the associated response
522− -> Event t (RequesterData request)
523− -- ^ The outgoing requests
524− -> Event t (Int, rawResponse)
525− -- ^ The incoming responses, tagged by an identifying key
526− -> m ( Event t (Map Int rawRequest)
527− , Event t (RequesterData response)
528− )
529− -- ^ A map of outgoing wire-format requests and an event of responses keyed
530− -- by the 'RequesterData' key of the associated outgoing request
531−matchResponsesWithRequests f send recv = matchResponseMapWithRequests f send $ uncurry Map.singleton <$> recv
532−
533466-- | Matches incoming responses with previously-sent requests
534467-- and uses the provided request "decoder" function to process
535468-- incoming responses.
536−matchResponseMapWithRequests
469+matchResponsesWithRequests
537470 :: forall t rawRequest rawResponse request response m.
538471 ( MonadFix m
539472 , MonadHold t m
@@ -544,14 +477,14 @@ matchResponseMapWithRequests
544477 -- request and a function used to process the associated response
545478 -> Event t (RequesterData request)
546479 -- ^ The outgoing requests
547− -> Event t (Map Int rawResponse)
548− -- ^ A map of incoming responses, tagged by an identifying key
480+ -> Event t (Int, rawResponse)
481+ -- ^ The incoming responses, tagged by an identifying key
549482 -> m ( Event t (Map Int rawRequest)
550483 , Event t (RequesterData response)
551484 )
552485 -- ^ A map of outgoing wire-format requests and an event of responses keyed
553486 -- by the 'RequesterData' key of the associated outgoing request
554−matchResponseMapWithRequests f send recv = do
487+matchResponsesWithRequests f send recv = do
555488 rec nextId <- hold 1 $ fmap (\(next, _, _) -> next) outgoing
556489 waitingFor :: Incremental t (PatchMap Int (Decoder rawResponse response)) <-
557490 holdIncremental mempty $ leftmost
@@ -593,15 +526,17 @@ matchResponseMapWithRequests f send recv = do
593526 processIncoming
594527 :: Incremental t (PatchMap Int (Decoder rawResponse response))
595528 -- A map of outstanding expected responses
596− -> Event t (Map Int rawResponse)
529+ -> Event t (Int, rawResponse)
597530 -- A incoming response paired with its identifying key
598531 -> Event t (RequesterData response, PatchMap Int v)
599532 -- The decoded response and a patch that clears the outstanding responses queue
600− processIncoming waitingFor inc = flip push inc $ \rspMap -> do
533+ processIncoming waitingFor inc = flip push inc $ \(n, rawRsp) -> do
601534 wf <- sample $ currentIncremental waitingFor
602− let match rawRsp (Decoder k rspF) =
603− let rsp = rspF rawRsp
604− in singletonRequesterData k rsp
605− matches = Map.intersectionWith match rspMap wf
606− pure $ if Map.null matches then Nothing else Just
607− (Map.foldl' mergeRequesterData emptyRequesterData matches, PatchMap $ Nothing <$ matches)
535+ case Map.lookup n wf of
536+ Nothing -> return Nothing -- TODO How should lookup failures be handled here? They shouldn't ever happen..
537+ Just (Decoder k rspF) -> do
538+ let rsp = rspF rawRsp
539+ return $ Just
540+ ( singletonRequesterData k rsp
541+ , PatchMap $ Map.singleton n Nothing
542+ )