mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve benchmark

Browse source 
addAssociatedFileNewBench would sometimes pick a random number that a
previous call had already added. Using a MVar, make it always advance,
so the same behavior is benchmarked each time.
This commit is contained in:
Joey Hess 2019-11-22 13:20:22 -04:00
parent 7263aafd2b
commit 70a8716324
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Database/Benchmark.hs
View file

@ -25,6 +25,7 @@ import Criterion.Main
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import qualified Data.ByteString.Char8 as B8 import qualified Data.ByteString.Char8 as B8
import System.Random import System.Random
import Control.Concurrent
#endif #endif
benchmarkDbs :: CriterionMode -> Integer -> Annex () benchmarkDbs :: CriterionMode -> Integer -> Annex ()
@ -48,32 +49,33 @@ benchmarkDbs _ = error "not built with criterion, cannot benchmark"
#ifdef WITH_BENCHMARK #ifdef WITH_BENCHMARK
getAssociatedFilesHitBench :: BenchDb -> Benchmark getAssociatedFilesHitBench :: BenchDb -> Benchmark
getAssociatedFilesHitBench (BenchDb h num) = bench ("getAssociatedFiles (hit)") $ nfIO $ do getAssociatedFilesHitBench (BenchDb h num _) = bench ("getAssociatedFiles (hit)") $ nfIO $ do
n <- getStdRandom (randomR (1,num)) n <- getStdRandom (randomR (1,num))
SQL.getAssociatedFiles (keyN n) (SQL.ReadHandle h) SQL.getAssociatedFiles (keyN n) (SQL.ReadHandle h)
getAssociatedFilesMissBench :: BenchDb -> Benchmark getAssociatedFilesMissBench :: BenchDb -> Benchmark
getAssociatedFilesMissBench (BenchDb h _num) = bench ("getAssociatedFiles (miss)") $ nfIO $ getAssociatedFilesMissBench (BenchDb h _ _) = bench ("getAssociatedFiles (miss)") $ nfIO $
SQL.getAssociatedFiles keyMiss (SQL.ReadHandle h) SQL.getAssociatedFiles keyMiss (SQL.ReadHandle h)
getAssociatedKeyHitBench :: BenchDb -> Benchmark getAssociatedKeyHitBench :: BenchDb -> Benchmark
getAssociatedKeyHitBench (BenchDb h num) = bench ("getAssociatedKey (hit)") $ nfIO $ do getAssociatedKeyHitBench (BenchDb h num _) = bench ("getAssociatedKey (hit)") $ nfIO $ do
n <- getStdRandom (randomR (1,num)) n <- getStdRandom (randomR (1,num))
SQL.getAssociatedKey (fileN n) (SQL.ReadHandle h) SQL.getAssociatedKey (fileN n) (SQL.ReadHandle h)
getAssociatedKeyMissBench :: BenchDb -> Benchmark getAssociatedKeyMissBench :: BenchDb -> Benchmark
getAssociatedKeyMissBench (BenchDb h num) = bench ("getAssociatedKey (miss)") $ nfIO $ getAssociatedKeyMissBench (BenchDb h _ _) = bench ("getAssociatedKey (miss)") $ nfIO $
SQL.getAssociatedKey fileMiss (SQL.ReadHandle h) SQL.getAssociatedKey fileMiss (SQL.ReadHandle h)
addAssociatedFileOldBench :: BenchDb -> Benchmark addAssociatedFileOldBench :: BenchDb -> Benchmark
addAssociatedFileOldBench (BenchDb h num) = bench ("addAssociatedFile to (old)") $ nfIO $ do addAssociatedFileOldBench (BenchDb h num _) = bench ("addAssociatedFile to (old)") $ nfIO $ do
n <- getStdRandom (randomR (1,num)) n <- getStdRandom (randomR (1,num))
SQL.addAssociatedFile (keyN n) (fileN n) (SQL.WriteHandle h) SQL.addAssociatedFile (keyN n) (fileN n) (SQL.WriteHandle h)
H.flushDbQueue h H.flushDbQueue h
addAssociatedFileNewBench :: BenchDb -> Benchmark addAssociatedFileNewBench :: BenchDb -> Benchmark
addAssociatedFileNewBench (BenchDb h num) = bench ("addAssociatedFile to (new)") $ nfIO $ do addAssociatedFileNewBench (BenchDb h num mv) = bench ("addAssociatedFile to (new)") $ nfIO $ do
n <- getStdRandom (randomR (1,num)) n <- takeMVar mv
putMVar mv (n+1)
SQL.addAssociatedFile (keyN n) (fileN (num+n)) (SQL.WriteHandle h) SQL.addAssociatedFile (keyN n) (fileN (num+n)) (SQL.WriteHandle h)
H.flushDbQueue h H.flushDbQueue h
@ -98,7 +100,7 @@ keyMiss = keyN 0 -- 0 is never stored
fileMiss :: TopFilePath fileMiss :: TopFilePath
fileMiss = fileN 0 -- 0 is never stored fileMiss = fileN 0 -- 0 is never stored
data BenchDb = BenchDb H.DbQueue Integer data BenchDb = BenchDb H.DbQueue Integer (MVar Integer)
benchDb :: FilePath -> Integer -> Annex BenchDb benchDb :: FilePath -> Integer -> Annex BenchDb
benchDb tmpdir num = do benchDb tmpdir num = do
@ -109,7 +111,8 @@ benchDb tmpdir num = do
sz <- liftIO $ getFileSize db sz <- liftIO $ getFileSize db
liftIO $ putStrLn $ "size of database on disk: " ++ liftIO $ putStrLn $ "size of database on disk: " ++
roughSize storageUnits False sz roughSize storageUnits False sz
return (BenchDb h num) mv <- liftIO $ newMVar 1
return (BenchDb h num mv)
where where
db = tmpdir </> show num </> "db" db = tmpdir </> show num </> "db"