Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix parameter name for maximum number of location in distance table plugin

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-08 17:27:36 +01:00
parent 0e5a448d04
commit b1a12768e1
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Util/ProgramOptions.h
View File

@ -197,12 +197,12 @@ inline unsigned GenerateServerProgramOptions(const int argc,
"threads,t",
boost::program_options::value<int>(&requested_num_threads)->default_value(8),
"Number of threads to use")(
"sharedmemory,s",
"shared-memory,s",
boost::program_options::value<bool>(&use_shared_memory)->implicit_value(true),
"Load data from shared memory")(
"max_locations_distance_table",
"max-table-size,m",
boost::program_options::value<int>(&max_locations_distance_table)->default_value(100),
"Max locations supported in distance table query");
"Max. locations supported in distance table query");
// hidden options, will be allowed both on command line and in config
// file, but will not be shown to the user

18
features/options/routed/help.feature
View File

@ -24,9 +24,9 @@ Feature: osrm-routed command line options: help
And stdout should contain "--ip"
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain "--max_locations_distance_table"
And stdout should contain 25 lines
And stdout should contain "--shared-memory"
And stdout should contain "--max-table-size"
And stdout should contain 24 lines
And it should exit with code 0
Scenario: osrm-routed - Help, short
@ -49,9 +49,9 @@ Feature: osrm-routed command line options: help
And stdout should contain "--ip"
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain "--max_locations_distance_table"
And stdout should contain 25 lines
And stdout should contain "--shared-memory"
And stdout should contain "--max-table-size"
And stdout should contain 24 lines
And it should exit with code 0
Scenario: osrm-routed - Help, long
@ -74,7 +74,7 @@ Feature: osrm-routed command line options: help
And stdout should contain "--ip"
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain "--max_locations_distance_table"
And stdout should contain 25 lines
And stdout should contain "--shared-memory"
And stdout should contain "--max-table-size"
And stdout should contain 24 lines
And it should exit with code 0

4
features/support/launch.rb
View File

@ -4,7 +4,7 @@ require 'json'
# Only one isntance of osrm-routed is ever launched, to avoid collisions.
# The default is to keep osrm-routed running and load data with datastore.
# however, osrm-routed it shut down and relaunched for each scenario thats
# however, osrm-routed it shut down and relaunched for each scenario thats
# loads data directly.
class OSRMLoader
@ -118,7 +118,7 @@ class OSRMLoader
def osrm_up
return if osrm_up?
@@pid = Process.spawn("#{BIN_PATH}/osrm-routed --sharedmemory=1 --port #{OSRM_PORT}",:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE)
@@pid = Process.spawn("#{BIN_PATH}/osrm-routed --shared-memory=1 --port #{OSRM_PORT}",:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE)
Process.detach(@@pid) # avoid zombie processes
end
end