From: Frederik Ramm <frederik@remote.org>
Date: Wed, 20 Jun 2018 12:17:07 +0000 (+0200)
Subject: limit default threads to 15
X-Git-Tag: v3.2.0~66^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8139a079f80bdd78b5135d536b88b632c9eb51f3

limit default threads to 15

When no explicit number of threads is given, don't simply use getProcessorCount()-1, but limit to max. 15
---

diff --git a/utils/setup.php b/utils/setup.php
index 259ddf2d..a7f77e55 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -61,8 +61,8 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 }
 
 
-// This is a pretty hard core default - the number of processors in the box - 1
-$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
+// by default, use all but one processor, but never more than 15.
+$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(min(16,getProcessorCount())-1);
 if ($iInstances < 1) {
     $iInstances = 1;
     warn("resetting threads to $iInstances");