fall back to debugInfo() for printing objects

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 4925a4e5b0bef4a30d5a859b17d25535fa487be2..501ad3f25227ab822beec5b173cab844515524c9 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -61,8 +61,11 @@ 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");
 if ($iInstances < 1) {
     $iInstances = 1;
     warn("resetting threads to $iInstances");