Browse Source

Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks

Patrick Falls 12 years ago
parent
commit
8a51a8fba6
2 changed files with 1 additions and 3 deletions
  1. 0 1
      yesod/bench/bench.cabal
  2. 1 2
      yesod/bench/src/yesod.hs

+ 0 - 1
yesod/bench/bench.cabal

@@ -30,6 +30,5 @@ executable         bench
                  , mwc-random                    >= 0.12
                  , pool-conduit                  >= 0.1
                  , network
-                 , lifted-async                  >= 0.1
                  , mongoDB
                  , aeson

+ 1 - 2
yesod/bench/src/yesod.hs

@@ -20,7 +20,6 @@ import Data.Conduit.Network (bindPort)
 import System.Posix.Process (forkProcess)
 import Control.Monad (replicateM_)
 import Network (PortID (PortNumber))
-import Control.Concurrent.Async.Lifted (mapConcurrently)
 import Data.Int (Int64)
 import Data.Aeson (ToJSON(..))
 
@@ -124,7 +123,7 @@ multiRandomHandler :: ToJSON a
 multiRandomHandler operation cnt = do
     App {..} <- getYesod
     nums <- liftIO $ replicateM cnt (randomNumber appGen)
-    jsonToRepJson . array =<< mapConcurrently operation nums
+    jsonToRepJson . array =<< mapM operation nums
 
 documentToJson :: [Field] -> Value
 documentToJson = object . map toAssoc