From c6bb7c5993fcd3c525f29b1d8b0689c2e5997212 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 8 Jan 2015 15:05:54 +0100 Subject: [PATCH] renamed: Include/osrm/ServerConfig.h -> Include/osrm/libosrm_config.hpp pass lib config object by reference --- .../osrm/{ServerConfig.h => libosrm_config.hpp} | 7 ++++--- Library/OSRM.h | 4 ++-- Library/OSRM_impl.cpp | 14 +++++++------- Library/OSRM_impl.h | 4 ++-- routed.cpp | 17 ++++++++--------- tools/simpleclient.cpp | 12 ++++++------ 6 files changed, 29 insertions(+), 29 deletions(-) rename Include/osrm/{ServerConfig.h => libosrm_config.hpp} (90%) diff --git a/Include/osrm/ServerConfig.h b/Include/osrm/libosrm_config.hpp similarity index 90% rename from Include/osrm/ServerConfig.h rename to Include/osrm/libosrm_config.hpp index bcd561d69..078c28f8f 100644 --- a/Include/osrm/ServerConfig.h +++ b/Include/osrm/libosrm_config.hpp @@ -30,14 +30,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -struct ServerConfig +struct libosrm_config { - ServerConfig() + libosrm_config(const libosrm_config&) = delete; + libosrm_config() : max_locations_distance_table(100) , use_shared_memory(false) {} - ServerConfig(const ServerPaths &paths, const bool flag, const int max) + libosrm_config(const ServerPaths &paths, const bool flag, const int max) : server_paths(paths) , max_locations_distance_table(max) , use_shared_memory(flag) diff --git a/Library/OSRM.h b/Library/OSRM.h index 1f35ec272..d51f8dcee 100644 --- a/Library/OSRM.h +++ b/Library/OSRM.h @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef OSRM_H #define OSRM_H -#include +#include #include @@ -46,7 +46,7 @@ class OSRM std::unique_ptr OSRM_pimpl_; public: - explicit OSRM(ServerConfig serverConfig); + explicit OSRM(libosrm_config &lib_config); ~OSRM(); int RunQuery(RouteParameters &route_parameters, JSON::Object &json_result); }; diff --git a/Library/OSRM_impl.cpp b/Library/OSRM_impl.cpp index a557aa66a..38f5fd1d9 100644 --- a/Library/OSRM_impl.cpp +++ b/Library/OSRM_impl.cpp @@ -55,9 +55,9 @@ namespace boost { namespace interprocess { class named_mutex; } } #include #include -OSRM_impl::OSRM_impl(ServerConfig &serverConfig) +OSRM_impl::OSRM_impl(libosrm_config &lib_config) { - if (serverConfig.use_shared_memory) + if (lib_config.use_shared_memory) { barrier = osrm::make_unique(); query_data_facade = new SharedDataFacade(); @@ -65,13 +65,13 @@ OSRM_impl::OSRM_impl(ServerConfig &serverConfig) else { // populate base path - populate_base_path(serverConfig.server_paths); - query_data_facade = new InternalDataFacade(serverConfig.server_paths); + populate_base_path(lib_config.server_paths); + query_data_facade = new InternalDataFacade(lib_config.server_paths); } // The following plugins handle all requests. RegisterPlugin(new DistanceTablePlugin>(query_data_facade, - serverConfig.max_locations_distance_table)); + lib_config.max_locations_distance_table)); RegisterPlugin(new HelloWorldPlugin()); RegisterPlugin(new LocatePlugin>(query_data_facade)); RegisterPlugin(new NearestPlugin>(query_data_facade)); @@ -151,8 +151,8 @@ int OSRM_impl::RunQuery(RouteParameters &route_parameters, JSON::Object &json_re // proxy code for compilation firewall -OSRM::OSRM(ServerConfig server_config) - : OSRM_pimpl_(osrm::make_unique(server_config)) +OSRM::OSRM(libosrm_config &lib_config) + : OSRM_pimpl_(osrm::make_unique(lib_config)) { } diff --git a/Library/OSRM_impl.h b/Library/OSRM_impl.h index 519686277..176ede688 100644 --- a/Library/OSRM_impl.h +++ b/Library/OSRM_impl.h @@ -35,7 +35,7 @@ struct RouteParameters; #include "../data_structures/query_edge.hpp" #include -#include +#include #include #include @@ -50,7 +50,7 @@ class OSRM_impl using PluginMap = std::unordered_map; public: - OSRM_impl(ServerConfig &serverConfig); + OSRM_impl(libosrm_config &lib_config); OSRM_impl(const OSRM_impl &) = delete; virtual ~OSRM_impl(); int RunQuery(RouteParameters &route_parameters, JSON::Object &json_result); diff --git a/routed.cpp b/routed.cpp index 8224c2e7b..a0caac1f4 100644 --- a/routed.cpp +++ b/routed.cpp @@ -69,21 +69,21 @@ int main(int argc, const char *argv[]) { LogPolicy::GetInstance().Unmute(); - bool use_shared_memory = false, trial_run = false; + bool trial_run = false; std::string ip_address; - int ip_port, requested_thread_num, max_locations_distance_table; + int ip_port, requested_thread_num; - ServerPaths server_paths; + libosrm_config lib_config; const unsigned init_result = GenerateServerProgramOptions(argc, argv, - server_paths, + lib_config.server_paths, ip_address, ip_port, requested_thread_num, - use_shared_memory, + lib_config.use_shared_memory, trial_run, - max_locations_distance_table); + lib_config.max_locations_distance_table); if (init_result == INIT_OK_DO_NOT_START_ENGINE) { return 0; @@ -102,7 +102,7 @@ int main(int argc, const char *argv[]) #endif SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION; - if (use_shared_memory) + if (lib_config.use_shared_memory) { SimpleLogger().Write(logDEBUG) << "Loading from shared memory"; } @@ -118,8 +118,7 @@ int main(int argc, const char *argv[]) pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask); #endif - ServerConfig server_config(server_paths, use_shared_memory, max_locations_distance_table); - OSRM osrm_lib(server_config); + OSRM osrm_lib(lib_config); auto routing_server = Server::CreateServer(ip_address, ip_port, requested_thread_num); diff --git a/tools/simpleclient.cpp b/tools/simpleclient.cpp index 0a736d8b7..0bb47599b 100644 --- a/tools/simpleclient.cpp +++ b/tools/simpleclient.cpp @@ -32,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/simple_logger.hpp" #include +#include #include -#include #include @@ -45,16 +45,16 @@ int main(int argc, const char *argv[]) std::string ip_address; int ip_port, requested_thread_num; bool trial_run = false; - ServerConfig server_config; + libosrm_config lib_config; const unsigned init_result = GenerateServerProgramOptions(argc, argv, - server_config.server_paths, + lib_config.server_paths, ip_address, ip_port, requested_thread_num, - server_config.use_shared_memory, + lib_config.use_shared_memory, trial_run, - server_config.max_locations_distance_table); + lib_config.max_locations_distance_table); if (init_result == INIT_OK_DO_NOT_START_ENGINE) { @@ -66,7 +66,7 @@ int main(int argc, const char *argv[]) } SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION; - OSRM routing_machine(server_config); + OSRM routing_machine(lib_config); RouteParameters route_parameters; route_parameters.zoom_level = 18; // no generalization