From 4890244c9ec2d28953bafaef014edba04e9290c0 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 14 Sep 2011 21:01:17 +0200 Subject: [PATCH] World files are built before all other to save time --- tools/unix/planet.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/unix/planet.sh b/tools/unix/planet.sh index 3fff1c64b5..3be533e42a 100755 --- a/tools/unix/planet.sh +++ b/tools/unix/planet.sh @@ -27,7 +27,6 @@ function forky() { else num_par_procs=$1 fi - while [[ $(jobs | wc -l) -ge $num_par_procs ]] ; do sleep 1 done @@ -112,14 +111,21 @@ $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL -intermediate_data_path=$TMPDIR \ -data_path=$DATA_PATH # 3rd pass - do in parallel +# but separate exceptions for wolrd files +$GENERATOR_TOOL -data_path=$DATA_PATH -generate_geometry -generate_index -output=World & +$GENERATOR_TOOL -data_path=$DATA_PATH -generate_geometry -generate_index -output=WorldCoasts & for file in $DATA_PATH/*.mwm; do - if [ "$file" != "minsk-pass" ]; then - filename=$(basename "$file") - extension="${filename##*.}" - filename="${filename%.*}" - $GENERATOR_TOOL -data_path=$DATA_PATH -generate_geometry -generate_index -generate_search_index -output="$filename" & - forky $PROCESSORS + if [[ "$file" == *minsk-pass* ]]; then + continue fi + if [[ "$file" == *World* ]]; then + continue + fi + filename=$(basename "$file") + extension="${filename##*.}" + filename="${filename%.*}" + $GENERATOR_TOOL -data_path=$DATA_PATH -generate_geometry -generate_index -output="$filename" & + forky $PROCESSORS done wait