fix bench nohash timeout

Quake4 · Dec 21, 2017 · 976a83c · 976a83c
1 parent ef1bedc
commit 976a83c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Code/Config.ps1 b/Code/Config.ps1
@@ -38,7 +38,7 @@ class Config : BaseConfig {
 	static [int] $Processors = 0
 	static [int] $Cores = 0
 	static [int] $Threads = 0
-	static [string] $Version = "v0.7"
+	static [string] $Version = "v0.8"
 	static [string] $BinLocation = "Bin"
 	static [eMinerType[]] $ActiveTypes = @([eMinerType]::CPU)
 	static [string[]] $CPUFeatures

diff --git a/MindMiner.ps1 b/MindMiner.ps1
@@ -314,8 +314,13 @@ while ($true)
 				$FastLoop = $true
 			}
 			# benchmark time reached - exit from loop
-			elseif ($_.Action -eq [eAction]::Benchmark -and $_.CurrentTime.Elapsed.TotalSeconds -ge $_.Miner.BenchmarkSeconds -and $_.GetSpeed() -gt 0) {
-				$FastLoop = $true
+			elseif ($_.Action -eq [eAction]::Benchmark) {
+				$speed = $_.GetSpeed()
+				if (($_.CurrentTime.Elapsed.TotalSeconds -ge $_.Miner.BenchmarkSeconds -and $speed -gt 0) -or
+					($_.CurrentTime.Elapsed.TotalSeconds -ge ($_.Miner.BenchmarkSeconds * 2) -and $speed -eq 0)) {
+					$FastLoop = $true
+				}
+				Remove-Variable speed
 			}
 		}
 	} while ($Config.LoopTimeout -gt $Summary.LoopTime.Elapsed.TotalSeconds -and !$FastLoop)