[osm-tile-server] 113/117: Add option for setting --number-processes

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 380b6b2946d8fff57e99360f2391656a463bec40
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Nov 3 21:46:18 2015 +0100

    Add option for setting --number-processes
---
 debian/man/osm-tile-server.conf.txt | 3 +++
 etc/osm-tile-server.conf            | 1 +
 src/osm-tile-server-import-raw.c    | 2 +-
 src/parse-settings.c                | 3 +++
 src/parse-settings.h                | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/man/osm-tile-server.conf.txt b/debian/man/osm-tile-server.conf.txt
index bb06a7f..53a5c59 100644
--- a/debian/man/osm-tile-server.conf.txt
+++ b/debian/man/osm-tile-server.conf.txt
@@ -19,6 +19,9 @@ DESCRIPTION
 
     Sets the cache strategy to use. (The "--cache-strategy %s" argument for osm2pgsql). See osm2pgsql(1) for details.
 
+  IMPORT_PROCESSES=       
+    Selects how many CPU cores to use while importing.
+
   SRC_URL=    
     URL for downloading OSM data for regions. The default is "http://download.geofabrik.de"
 
diff --git a/etc/osm-tile-server.conf b/etc/osm-tile-server.conf
index a94c817..06fc526 100644
--- a/etc/osm-tile-server.conf
+++ b/etc/osm-tile-server.conf
@@ -3,4 +3,5 @@ DBNAME=""
 IMPORT_SLIM=true
 IMPORT_CACHE_STRATEGY=sparse
 IMPORT_MEMORY=100
+IMPORT_PROCESSES=1
 SRC_URL="http://download.geofabrik.de"
diff --git a/src/osm-tile-server-import-raw.c b/src/osm-tile-server-import-raw.c
index 6a4bd2c..4b03ebb 100644
--- a/src/osm-tile-server-import-raw.c
+++ b/src/osm-tile-server-import-raw.c
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
 	else {
 		cfg_slim[0] = 0;
 	}
-	snprintf(command,255,"osm2pgsql %s -d %s --cache-strategy %s -C %s --hstore -S /usr/share/osm2pgsql/default.style %s",cfg_slim,cfg_dbname,cfg_cache_strategy,cfg_memory,pbffile);
+	snprintf(command,255,"osm2pgsql %s -d %s --cache-strategy %s -C %s --number-processes %s --hstore -S /usr/share/osm2pgsql/default.style %s",cfg_slim,cfg_dbname,cfg_cache_strategy,cfg_memory,cfg_processes,pbffile);
 	printf("Importing to database with this command:\n\n");
 	printf(" %s\n\n",command);
 
diff --git a/src/parse-settings.c b/src/parse-settings.c
index 0d98325..789fb3d 100644
--- a/src/parse-settings.c
+++ b/src/parse-settings.c
@@ -6,6 +6,7 @@ char cfg_dbname[64];
 char cfg_slim[64];
 char cfg_cache_strategy[64];
 char cfg_memory[64];
+char cfg_processes[64];
 
 int parse_one(const char *l, const char *cmp, char *var){
 	int len;
@@ -57,6 +58,8 @@ void parse_settings()
 		}
 		else if(parse_one(l,"IMPORT_MEMORY=",cfg_memory) == 0){
 		}
+		else if(parse_one(l,"IMPORT_PROCESSES=",cfg_processes) == 0){
+		}
 	}
 	fclose(infile);
 
diff --git a/src/parse-settings.h b/src/parse-settings.h
index 90f609c..c30ab44 100644
--- a/src/parse-settings.h
+++ b/src/parse-settings.h
@@ -5,6 +5,7 @@ extern char cfg_dbname[64];
 extern char cfg_cache_strategy[64];
 extern char cfg_memory[64];
 extern char cfg_slim[64];
+extern char cfg_processes[64];
 
 void parse_settings();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git