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

Fix formating

Browse Source
This commit is contained in:
Patrick Niklaus 2018-04-04 22:56:47 +00:00 committed by Patrick Niklaus
parent c4b90f52c0
commit 4610fd9ff1
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/engine/data_watchdog.hpp
View File

@ -46,8 +46,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
auto region_id = shared_register.Find(dataset_name + "/data"); auto region_id = shared_register.Find(dataset_name + "/data");
if (region_id == storage::SharedRegionRegister::INVALID_REGION_ID) if (region_id == storage::SharedRegionRegister::INVALID_REGION_ID)
{ {
throw util::exception( throw util::exception("Could not find shared memory region for \"" + dataset_name +
"Could not find shared memory region for \"" + dataset_name +"/data\". Did you run osrm-datastore?"); "/data\". Did you run osrm-datastore?");
} }
shared_region = &shared_register.GetRegion(region_id); shared_region = &shared_register.GetRegion(region_id);
region = *shared_region; region = *shared_region;
@ -94,8 +94,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
facade_factory = facade_factory =
DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>( DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
std::make_shared<datafacade::SharedMemoryAllocator>(region.shm_key)); std::make_shared<datafacade::SharedMemoryAllocator>(region.shm_key));
util::Log() << "updated facade to region " << (int) region.shm_key << " with timestamp " util::Log() << "updated facade to region " << (int)region.shm_key
<< region.timestamp; << " with timestamp " << region.timestamp;
} }
} }

4
include/engine/engine.hpp
View File

@ -59,8 +59,8 @@ template <typename Algorithm> class Engine final : public EngineInterface
{ {
if (config.use_shared_memory) if (config.use_shared_memory)
{ {
util::Log(logDEBUG) << "Using shared memory with name \"" << config.dataset_name << "\" with algorithm " util::Log(logDEBUG) << "Using shared memory with name \"" << config.dataset_name
<< routing_algorithms::name<Algorithm>(); << "\" with algorithm " << routing_algorithms::name<Algorithm>();
facade_provider = std::make_unique<WatchingProvider<Algorithm>>(config.dataset_name); facade_provider = std::make_unique<WatchingProvider<Algorithm>>(config.dataset_name);
} }
else if (!config.memory_file.empty()) else if (!config.memory_file.empty())

3
include/nodejs/node_osrm_support.hpp
View File

@ -142,7 +142,8 @@ inline engine_config_ptr argumentsToEngineConfig(const Nan::FunctionCallbackInfo
{ {
if (dataset_name->IsString()) if (dataset_name->IsString())
{ {
engine_config->dataset_name = *v8::String::Utf8Value(Nan::To<v8::String>(dataset_name).ToLocalChecked()); engine_config->dataset_name =
*v8::String::Utf8Value(Nan::To<v8::String>(dataset_name).ToLocalChecked());
} }
else else
{ {

3
include/storage/shared_datatype.hpp
View File

@ -221,8 +221,7 @@ struct SharedRegionRegister
} }
} }
template<typename OutIter> template <typename OutIter> void List(OutIter out) const
void List(OutIter out) const
{ {
for (const auto &region : regions) for (const auto &region : regions)
{ {

7
src/tools/store.cpp
View File

@ -37,8 +37,7 @@ void listRegions()
{ {
auto id = shared_register.Find(name); auto id = shared_register.Find(name);
auto region = shared_register.GetRegion(id); auto region = shared_register.GetRegion(id);
osrm::util::Log() << name << "\t" osrm::util::Log() << name << "\t" << (int)region.shm_key << "\t" << region.timestamp;
<< (int) region.shm_key << "\t" << region.timestamp;
} }
} }
@ -98,7 +97,9 @@ bool generateDataStoreOptions(const int argc,
"Name of the dataset to load into memory. This allows having multiple datasets in memory " "Name of the dataset to load into memory. This allows having multiple datasets in memory "
"at the same time.") // "at the same time.") //
("list", ("list",
boost::program_options::value<bool>(&list_datasets)->default_value(false)->implicit_value(true), boost::program_options::value<bool>(&list_datasets)
->default_value(false)
->implicit_value(true),
"Name of the dataset to load into memory. This allows having multiple datasets in memory " "Name of the dataset to load into memory. This allows having multiple datasets in memory "
"at the same time."); "at the same time.");