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

More refactor

Browse Source
This commit is contained in:
Patrick Niklaus
2018-03-26 10:46:07 +00:00
committed by Patrick Niklaus
parent 9e97748700
commit b3ef2a0383
2 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/storage/shared_datatype.hpp
+35 -22
View File
@@ -39,24 +39,12 @@ class DataLayout
inline uint64_t GetBlockEntries(const std::string &name) const
{
auto iter = blocks.find(name);
if (iter == blocks.end())
{
throw util::exception("Could not find block " + name);
}
return iter->second.num_entries;
return GetBlock(name).num_entries;
}
inline uint64_t GetBlockSize(const std::string &name) const
{
auto iter = blocks.find(name);
if (iter == blocks.end())
{
throw util::exception("Could not find block " + name);
}
return iter->second.byte_size;
return GetBlock(name).byte_size;
}
inline uint64_t GetSizeOfLayout() const
@@ -80,6 +68,7 @@ class DataLayout
{
char *start_canary_ptr = ptr - sizeof(CANARY);
char *end_canary_ptr = ptr + GetBlockSize(name);
std::cout << name << ": " << (long) (start_canary_ptr-shared_memory) << " -> " << (long) (end_canary_ptr-shared_memory) << std::endl;
std::copy(CANARY, CANARY + sizeof(CANARY), start_canary_ptr);
std::copy(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
}
@@ -103,10 +92,34 @@ class DataLayout
return (T *)ptr;
}
template<typename OutIter>
void List(const std::string& name_prefix, OutIter out) const
{
for (const auto& pair : blocks)
{
// check if string begins with the name prefix
if (pair.first.find(name_prefix) == 0)
{
*out++ = pair.first;
}
}
}
private:
friend void serialization::read(io::BufferReader &reader, DataLayout &layout);
friend void serialization::write(io::BufferWriter &writer, const DataLayout &layout);
const Block& GetBlock(const std::string& name) const
{
auto iter = blocks.find(name);
if (iter == blocks.end())
{
throw util::exception("Could not find block " + name);
}
return iter->second;
}
// Fit aligned storage in buffer to 64 bytes to conform with AVX 512 types
inline void *align(void *&ptr) const noexcept
{
@@ -117,11 +130,17 @@ class DataLayout
inline void *GetAlignedBlockPtr(void *ptr, const std::string &name) const
{
for (auto iter = blocks.begin(); iter != blocks.end() && iter->first != name; ++iter)
auto block_iter = blocks.find(name);
if (block_iter == blocks.end())
{
throw util::exception("Could not find block " + name);
}
for (auto iter = blocks.begin(); iter != block_iter; ++iter)
{
ptr = static_cast<char *>(ptr) + sizeof(CANARY);
ptr = align(ptr);
ptr = static_cast<char *>(ptr) + GetBlockSize(name);
ptr = static_cast<char *>(ptr) + iter->second.byte_size;
ptr = static_cast<char *>(ptr) + sizeof(CANARY);
}
@@ -130,12 +149,6 @@ class DataLayout
return ptr;
}
template <typename T> inline T *GetBlockEnd(char *shared_memory, const std::string &name) const
{
auto begin = GetBlockPtr<T>(shared_memory, name);
return begin + GetBlockEntries(name);
}
static constexpr std::size_t BLOCK_ALIGNMENT = 64;
std::map<std::string, Block> blocks;
};