disable multithreading in osm2pgsql

not really useful for gazetteer plugin and producing too much overhead

diff --git a/utils/setup.php b/utils/setup.php
index 14fe675e9c2173b79a6298fc673b44c53739a4df..782665d7f61f9fbc096804e44c5a8d19ad7d265c 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -200,7 +200,7 @@
                        $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
                if (CONST_Tablespace_Place_Index)
                        $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
-               $osm2pgsql .= ' -lsc -O gazetteer --hstore';
+               $osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
                $osm2pgsql .= ' -C '.$iCacheMemory;
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];

diff --git a/utils/update.php b/utils/update.php
index c5fc14a672fa1dbc6f7e8f87066b023a70ce6947..1379045068ec6b2b614af28713c6387c2803bc3a 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -83,7 +83,7 @@
                $iCacheMemory = getCacheMemoryMB();
                echo "WARNING: resetting cache memory to $iCacheMemory\n";
        }
-       $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+       $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
        {
                $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;