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

Remove setters from structures server_config

Browse Source
This commit is contained in:
Frédéric Rodrigo 2015-01-05 15:48:24 +01:00 committed by Frederic Rodrigo
parent ced64d7a09
commit 598f5519d1
4 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Include/osrm/ServerConfig.h
View File

@ -32,13 +32,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct ServerConfig
{
ServerConfig();
ServerConfig()
: use_shared_memory(false)
, max_locations_distance_table(100)
{}
void setServerPaths(const ServerPaths paths);
void setUseSharedMemory(const bool use_shared_memory);
void setMaxLocationsDistanceTable(const int max_locations_distance_table);
ServerConfig(const ServerPaths paths, const bool flag, const int max)
: server_paths(paths)
, use_shared_memory(flag)
, max_locations_distance_table(max)
{}
ServerPaths server_paths;
bool use_shared_memory;

1
Library/OSRM_impl.h
View File

@ -34,7 +34,6 @@ struct RouteParameters;
#include <osrm/ServerConfig.h>
#include "../data_structures/server_config.hpp"
#include "../data_structures/query_edge.hpp"
#include <memory>

39
data_structures/server_config.hpp
View File

@ -1,39 +0,0 @@
/*
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <osrm/ServerConfig.h>
ServerConfig::ServerConfig()
: use_shared_memory(false), max_locations_distance_table(100)
{
}
void ServerConfig::setServerPaths(const ServerPaths object) { server_paths = object; }
void ServerConfig::setUseSharedMemory(const bool flag) { use_shared_memory = flag; }
void ServerConfig::setMaxLocationsDistanceTable(const int max) { max_locations_distance_table = max; }

5
routed.cpp
View File

@ -118,10 +118,7 @@ int main(int argc, const char *argv[])
pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask);
#endif
ServerConfig server_config;
server_config.setServerPaths(server_paths);
server_config.setUseSharedMemory(use_shared_memory);
server_config.setMaxLocationsDistanceTable(max_locations_distance_table);
ServerConfig server_config(server_paths, use_shared_memory, max_locations_distance_table);
OSRM osrm_lib(server_config);
auto routing_server =
Server::CreateServer(ip_address, ip_port, requested_thread_num);