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

Always safe the absolute path to .fileIndex

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-23 22:18:11 +01:00
parent 59163cb2fc
commit ec1a84c57a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/storage.cpp
View File

@ -124,9 +124,10 @@ int Storage::Run()
// Allocate a memory layout in shared memory, deallocate previous // Allocate a memory layout in shared memory, deallocate previous
auto *layout_memory = makeSharedMemory(layout_region, sizeof(SharedDataLayout)); auto *layout_memory = makeSharedMemory(layout_region, sizeof(SharedDataLayout));
auto shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout(); auto shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout();
auto absolute_file_index_path = boost::filesystem::absolute(config.file_index_path);
shared_layout_ptr->SetBlockSize<char>(SharedDataLayout::FILE_INDEX_PATH, shared_layout_ptr->SetBlockSize<char>(SharedDataLayout::FILE_INDEX_PATH,
config.file_index_path.string().length() + 1); absolute_file_index_path.string().length() + 1);
// collect number of elements to store in shared memory object // collect number of elements to store in shared memory object
util::SimpleLogger().Write() << "load names from: " << config.names_data_path; util::SimpleLogger().Write() << "load names from: " << config.names_data_path;
@ -329,7 +330,7 @@ int Storage::Run()
file_index_path_ptr + file_index_path_ptr +
shared_layout_ptr->GetBlockSize(SharedDataLayout::FILE_INDEX_PATH), shared_layout_ptr->GetBlockSize(SharedDataLayout::FILE_INDEX_PATH),
0); 0);
std::copy(config.file_index_path.string().begin(), config.file_index_path.string().end(), file_index_path_ptr); std::copy(absolute_file_index_path.string().begin(), absolute_file_index_path.string().end(), file_index_path_ptr);
// Loading street names // Loading street names
unsigned *name_offsets_ptr = shared_layout_ptr->GetBlockPtr<unsigned, true>( unsigned *name_offsets_ptr = shared_layout_ptr->GetBlockPtr<unsigned, true>(