From 62a97cabd895001d4dc552823633aabe53d54358 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 30 Aug 2016 14:02:28 -0400
Subject: fix calculation of usedcores

---
 ExpensiveHash.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ExpensiveHash.hs')

diff --git a/ExpensiveHash.hs b/ExpensiveHash.hs
index 89a2f2b..8c473d3 100644
--- a/ExpensiveHash.hs
+++ b/ExpensiveHash.hs
@@ -64,7 +64,7 @@ benchmarkExpensiveHash rounds tunables@(UseArgon2 _ hashopts) expected = do
 	-- based on the number of cores, up to a maximum of the number
 	-- of threads that the hash is configred to use.
 	let maxthreads = Argon2.hashParallelism hashopts
-	let usedcores = if numcores > maxthreads then maxthreads else numcores
+	let usedcores = min maxthreads numcores
 	let adjustedexpected = mapCost (`div` fromIntegral usedcores) expected
 	return $ BenchmarkResult
 		{ expectedBenchmark = adjustedexpected
-- 
cgit v1.2.3